feat: return verification flow ID after registration flow (#3144)

Closes #2975

.github/workflows/ci.yaml

@@ -171,6 +171,7 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: "1.19"
+
       - name: Install selfservice-ui-react-native
         uses: actions/checkout@v3
         with:
@@ -179,6 +180,7 @@ jobs:
       - run: |
           cd react-native-ui
           npm install
+
       - name: Install selfservice-ui-node
         uses: actions/checkout@v3
         with:
@@ -187,14 +189,26 @@ jobs:
       - run: |
           cd node-ui
           npm install
+
+      - name: Install selfservice-ui-react-nextjs
+        uses: actions/checkout@v3
+        with:
+          repository: ory/kratos-selfservice-ui-react-nextjs
+          path: react-ui
+      - run: |
+          cd react-ui
+          npm ci
+
       - run: |
           echo 'RN_UI_PATH='"$(realpath react-native-ui)" >> $GITHUB_ENV
           echo 'NODE_UI_PATH='"$(realpath node-ui)" >> $GITHUB_ENV
+          echo 'REACT_UI_PATH='"$(realpath react-ui)" >> $GITHUB_ENV
       - run: |
           ./test/e2e/run.sh ${{ matrix.database }}
         env:
           RN_UI_PATH: react-native-ui
           NODE_UI_PATH: node-ui
+          REACT_UI_PATH: react-ui
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
       - if: failure()
         uses: actions/upload-artifact@v2

.schema/openapi/patches/schema.yaml

@@ -33,3 +33,17 @@
 
 - op: remove
   path: "#/components/schemas/identityTraits/type"
+
+- op: add
+  path: /components/schemas/continueWith/discriminator
+  value:
+    propertyName: action
+    mapping:
+      show_verification_ui: "#/components/schemas/continueWithVerificationUi"
+      set_ory_session_token: "#/components/schemas/continueWithSetOrySessionToken"
+
+- op: add
+  path: /components/schemas/continueWith/oneOf
+  value:
+    - "$ref": "#/components/schemas/continueWithVerificationUi"
+    - "$ref": "#/components/schemas/continueWithSetOrySessionToken"

contrib/quickstart/kratos/email-password/kratos.yml

@@ -65,6 +65,7 @@ selfservice:
         password:
           hooks:
             - hook: session
+            - hook: show_verification_ui
 
 log:
   level: debug

driver/config/stub/.kratos.yaml

@@ -109,7 +109,7 @@ selfservice:
               body: /path/to/template.jsonnet
 
     settings:
-      ui_url:  http://test.kratos.ory.sh/settings
+      ui_url: http://test.kratos.ory.sh/settings
       lifespan: 99m
       privileged_session_max_age: 5m
       after:

driver/registry_default.go

@@ -96,10 +96,11 @@ type RegistryDefault struct {
 	persister       persistence.Persister
 	migrationStatus popx.MigrationStatuses
 
-	hookVerifier         *hook.Verifier
-	hookSessionIssuer    *hook.SessionIssuer
-	hookSessionDestroyer *hook.SessionDestroyer
-	hookAddressVerifier  *hook.AddressVerifier
+	hookVerifier           *hook.Verifier
+	hookSessionIssuer      *hook.SessionIssuer
+	hookSessionDestroyer   *hook.SessionDestroyer
+	hookAddressVerifier    *hook.AddressVerifier
+	hookShowVerificationUI *hook.ShowVerificationUIHook
 
 	identityHandler   *identity.Handler
 	identityValidator *identity.Validator

driver/registry_default_hooks.go

@@ -36,6 +36,13 @@ func (m *RegistryDefault) HookAddressVerifier() *hook.AddressVerifier {
 	return m.hookAddressVerifier
 }
 
+func (m *RegistryDefault) HookShowVerificationUI() *hook.ShowVerificationUIHook {
+	if m.hookShowVerificationUI == nil {
+		m.hookShowVerificationUI = hook.NewShowVerificationUIHook(m)
+	}
+	return m.hookShowVerificationUI
+}
+
 func (m *RegistryDefault) WithHooks(hooks map[string]func(config.SelfServiceHook) interface{}) {
 	m.injectedSelfserviceHooks = hooks
 }
@@ -51,6 +58,8 @@ func (m *RegistryDefault) getHooks(credentialsType string, configs []config.Self
 			i = append(i, hook.NewWebHook(m, h.Config))
 		case hook.KeyAddressVerifier:
 			i = append(i, m.HookAddressVerifier())
+		case hook.KeyVerificationUI:
+			i = append(i, m.HookShowVerificationUI())
 		default:
 			var found bool
 			for name, m := range m.injectedSelfserviceHooks {

driver/registry_default_test.go

@@ -315,6 +315,19 @@ func TestDriverDefault_Hooks(t *testing.T) {
 					}
 				},
 			},
+			{
+				uc: "show_verification_ui is configured",
+				prep: func(conf *config.Config) {
+					conf.MustSet(ctx, config.ViperKeySelfServiceRegistrationAfter+".hooks", []map[string]interface{}{
+						{"hook": "show_verification_ui"},
+					})
+				},
+				expect: func(reg *driver.RegistryDefault) []registration.PostHookPostPersistExecutor {
+					return []registration.PostHookPostPersistExecutor{
+						hook.NewShowVerificationUIHook(reg),
+					}
+				},
+			},
 		} {
 			t.Run(fmt.Sprintf("after/uc=%s", tc.uc), func(t *testing.T) {
 				conf, reg := internal.NewVeryFastRegistryWithoutDB(t)

embedx/config.schema.json

@@ -84,6 +84,18 @@
         "hook"
       ]
     },
+    "selfServiceShowVerificationUIHook": {
+      "type": "object",
+      "properties": {
+        "hook": {
+          "const": "show_verification_ui"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "hook"
+      ]
+    },
     "webHookAuthBasicAuthProperties": {
       "properties": {
         "type": {
@@ -744,6 +756,9 @@
               },
               {
                 "$ref": "#/definitions/selfServiceWebHook"
+              },
+              {
+                "$ref": "#/definitions/selfServiceShowVerificationUIHook"
               }
             ]
           },
@@ -2647,4 +2662,4 @@
     "selfservice"
   ],
   "additionalProperties": false
-}
+}

identity/identity_verification.go

@@ -84,8 +84,7 @@ type VerifiableAddress struct {
 
 	// IdentityID is a helper struct field for gobuffalo.pop.
 	IdentityID uuid.UUID `json:"-" faker:"-" db:"identity_id"`
-	// CreatedAt is a helper struct field for gobuffalo.pop.
-	NID uuid.UUID `json:"-"  faker:"-" db:"nid"`
+	NID        uuid.UUID `json:"-"  faker:"-" db:"nid"`
 }
 
 func (v VerifiableAddressType) HTMLFormInputType() string {

internal/client-go/.openapi-generator/FILES

@@ -9,6 +9,10 @@ api_metadata.go
 client.go
 configuration.go
 docs/AuthenticatorAssuranceLevel.md
+docs/ContinueWith.md
+docs/ContinueWithSetOrySessionToken.md
+docs/ContinueWithVerificationUi.md
+docs/ContinueWithVerificationUiFlow.md
 docs/CourierApi.md
 docs/CourierMessageStatus.md
 docs/CourierMessageType.md
@@ -113,6 +117,10 @@ git_push.sh
 go.mod
 go.sum
 model_authenticator_assurance_level.go
+model_continue_with.go
+model_continue_with_set_ory_session_token.go
+model_continue_with_verification_ui.go
+model_continue_with_verification_ui_flow.go
 model_courier_message_status.go
 model_courier_message_type.go
 model_create_identity_body.go

internal/client-go/README.md

@@ -135,6 +135,10 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [AuthenticatorAssuranceLevel](docs/AuthenticatorAssuranceLevel.md)
+ - [ContinueWith](docs/ContinueWith.md)
+ - [ContinueWithSetOrySessionToken](docs/ContinueWithSetOrySessionToken.md)
+ - [ContinueWithVerificationUi](docs/ContinueWithVerificationUi.md)
+ - [ContinueWithVerificationUiFlow](docs/ContinueWithVerificationUiFlow.md)
  - [CourierMessageStatus](docs/CourierMessageStatus.md)
  - [CourierMessageType](docs/CourierMessageType.md)
  - [CreateIdentityBody](docs/CreateIdentityBody.md)