fix(core,schemas): fix email and sms verification for continue route (#2349)

packages/core/src/routes/session/continue.test.ts

@@ -1,3 +1,4 @@
+import { PasscodeType } from '@logto/schemas';
 import dayjs from 'dayjs';
 import { Provider } from 'oidc-provider';
 
@@ -137,6 +138,7 @@ describe('session -> continueRoutes', () => {
           continueSignIn: {
             userId: mockUser.id,
             expiresAt: dayjs().add(1, 'day').toISOString(),
+            type: PasscodeType.Continue,
           },
         },
       });
@@ -168,6 +170,7 @@ describe('session -> continueRoutes', () => {
           continueSignIn: {
             userId: mockUser.id,
             expiresAt: dayjs().add(1, 'day').toISOString(),
+            type: PasscodeType.Continue,
           },
         },
       });

packages/core/src/routes/session/continue.ts

@@ -17,7 +17,7 @@ import {
 import assertThat from '@/utils/assert-that';
 
 import type { AnonymousRouter } from '../types';
-import { emailSessionResultGuard, smsSessionResultGuard } from './types';
+import { continueEmailSessionResultGuard, continueSmsSessionResultGuard } from './types';
 import {
   checkRequiredProfile,
   getContinueSignInResult,
@@ -104,7 +104,7 @@ export default function continueRoutes<T extends AnonymousRouter>(router: T, pro
     const { email } = await getVerificationStorageFromInteraction(
       ctx,
       provider,
-      emailSessionResultGuard
+      continueEmailSessionResultGuard
     );
     const user = await findUserById(userId);
 
@@ -138,7 +138,7 @@ export default function continueRoutes<T extends AnonymousRouter>(router: T, pro
     const { phone } = await getVerificationStorageFromInteraction(
       ctx,
       provider,
-      smsSessionResultGuard
+      continueSmsSessionResultGuard
     );
     const user = await findUserById(userId);
 

packages/core/src/routes/session/passwordless.ts

@@ -117,13 +117,21 @@ export default function passwordlessRoutes<T extends AnonymousRouter>(
         return next();
       }
 
-      await assignVerificationResult(ctx, provider, { flow, phone });
-
       if (flow === PasscodeType.SignIn) {
+        await assignVerificationResult(ctx, provider, { flow, phone });
+
         return smsSignInAction(provider)(ctx, next);
       }
 
-      return smsRegisterAction(provider)(ctx, next);
+      if (flow === PasscodeType.Register) {
+        await assignVerificationResult(ctx, provider, { flow, phone });
+
+        return smsRegisterAction(provider)(ctx, next);
+      }
+
+      await assignVerificationResult(ctx, provider, { flow, phone });
+
+      return next();
     }
   );
 
@@ -161,13 +169,21 @@ export default function passwordlessRoutes<T extends AnonymousRouter>(
         return next();
       }
 
-      await assignVerificationResult(ctx, provider, { flow, email });
-
       if (flow === PasscodeType.SignIn) {
+        await assignVerificationResult(ctx, provider, { flow, email });
+
         return emailSignInAction(provider)(ctx, next);
       }
 
-      return emailRegisterAction(provider)(ctx, next);
+      if (flow === PasscodeType.Register) {
+        await assignVerificationResult(ctx, provider, { flow, email });
+
+        return emailRegisterAction(provider)(ctx, next);
+      }
+
+      await assignVerificationResult(ctx, provider, { flow, email });
+
+      return next();
     }
   );
 

packages/core/src/routes/session/types.ts

@@ -45,10 +45,36 @@ export const forgotPasswordSessionResultGuard = z.object({
   verification: forgotPasswordSessionStorageGuard,
 });
 
+const continueEmailSessionStorageGuard = z.object({
+  flow: z.literal(PasscodeType.Continue),
+  expiresAt: z.string(),
+  email: z.string(),
+});
+
+export type ContinueEmailSessionStorage = z.infer<typeof continueEmailSessionStorageGuard>;
+
+export const continueEmailSessionResultGuard = z.object({
+  verification: continueEmailSessionStorageGuard,
+});
+
+const continueSmsSessionStorageGuard = z.object({
+  flow: z.literal(PasscodeType.Continue),
+  expiresAt: z.string(),
+  phone: z.string(),
+});
+
+export type ContinueSmsSessionStorage = z.infer<typeof continueSmsSessionStorageGuard>;
+
+export const continueSmsSessionResultGuard = z.object({
+  verification: continueSmsSessionStorageGuard,
+});
+
 export type VerificationStorage =
   | SmsSessionStorage
   | EmailSessionStorage
-  | ForgotPasswordSessionStorage;
+  | ForgotPasswordSessionStorage
+  | ContinueEmailSessionStorage
+  | ContinueSmsSessionStorage;
 
 export type VerificationResult<T = VerificationStorage> = { verification: T };
 

packages/schemas/alterations/next-1667900481-add-passcode-type-continue.ts

@@ -0,0 +1,19 @@
+import { sql } from 'slonik';
+
+import type { AlterationScript } from '../lib/types/alteration';
+
+const alteration: AlterationScript = {
+  up: async (pool) => {
+    await pool.query(sql`
+      alter type passcode_type add value 'Continue'
+    `);
+  },
+  down: async (pool) => {
+    await pool.query(sql`
+      drop type passcode_type
+      create type passcode_type as enum ('SignIn', 'Register', 'ForgotPassword');
+    `);
+  },
+};
+
+export default alteration;

packages/schemas/tables/passcodes.sql

@@ -1,4 +1,4 @@
-create type passcode_type as enum ('SignIn', 'Register', 'ForgotPassword');
+create type passcode_type as enum ('SignIn', 'Register', 'ForgotPassword', 'Continue');
 
 create table passcodes (
   id varchar(21) not null,