@supertokens-plugins/rownd-nodejs 0.3.0-beta.7 → 0.3.0-beta.8

package/dist/index.js

@@ -289,6 +289,10 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/plugin.ts
+var import_emailverification2 = require("supertokens-node/recipe/emailverification");
+var import_session3 = __toESM(require("supertokens-node/recipe/session"));
+
 // ../../shared/js/src/createPluginInit.ts
 var import_supertokens_js_override = __toESM(require_build());
 var createPluginInitFunction = (init2, getImplementation, getNormalisedConfig = (config2) => config2) => {
@@ -1870,12 +1874,12 @@ function hasVerifiedRealLoginMethod(user) {
   });
 }
 function getEffectiveAuthLevel(user, originalAuthLevel, verifiedData) {
-  if (originalAuthLevel === INSTANT_AUTH_METHOD_ID) {
-    return INSTANT_AUTH_METHOD_ID;
-  }
   if (hasVerifiedRealLoginMethod(user)) {
     return "verified";
   }
+  if (originalAuthLevel === INSTANT_AUTH_METHOD_ID) {
+    return INSTANT_AUTH_METHOD_ID;
+  }
   return getGuestAuthLevel(user) || originalAuthLevel || (verifiedData && Object.keys(verifiedData).length > 0 ? "verified" : "unverified");
 }
 function canUpdateUserDataField(field) {
@@ -2304,6 +2308,7 @@ async function completePendingEmailVerification(input) {
     return;
   }
   let metadataUserId = userId;
+  let verifiedRecipeUserId = input.recipeUserId;
   const passwordlessEmailMethod = getPasswordlessEmailLoginMethod(user);
   if (passwordlessEmailMethod) {
     const updateResult = await import_passwordless.default.updateUser({
@@ -2316,6 +2321,7 @@ async function completePendingEmailVerification(input) {
         `Failed to update verified email method: ${updateResult.status}`
       );
     }
+    verifiedRecipeUserId = passwordlessEmailMethod.recipeUserId;
   } else if (hasOnlyGuestLoginMethods(user)) {
     const isPasswordlessSignUpAllowed = await import_accountlinking.default.isSignUpAllowed(
       PUBLIC_TENANT_ID,
@@ -2335,6 +2341,7 @@ async function completePendingEmailVerification(input) {
       tenantId: PUBLIC_TENANT_ID,
       userContext: input.userContext
     });
+    verifiedRecipeUserId = passwordlessUser.recipeUserId;
     const primaryUserResult = await import_accountlinking.default.createPrimaryUser(
       passwordlessUser.recipeUserId,
       input.userContext
@@ -2380,6 +2387,10 @@ async function completePendingEmailVerification(input) {
     )
   };
   await import_usermetadata3.default.updateUserMetadata(metadataUserId, updatedMetadata);
+  return {
+    userId: metadataUserId,
+    recipeUserId: verifiedRecipeUserId
+  };
 }
 function isMatchingPendingEmailVerification(verification, email) {
   return verification.field === "email" && verification.value === email;
@@ -2808,6 +2819,12 @@ function validateWritableFields(fields) {
 }
 
 // src/plugin.ts
+var verifyRowndUserSessionOptions = {
+  sessionRequired: true,
+  overrideGlobalClaimValidators: (validators) => validators.filter((validator) => {
+    return !("claim" in validator) || validator.claim.key !== import_emailverification2.EmailVerificationClaim.key;
+  })
+};
 var init = createPluginInitFunction(
   (pluginConfig2) => {
     const rowndClient2 = (0, import_node.createInstance)({
@@ -2923,13 +2940,13 @@ var init = createPluginInitFunction(
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user`,
               method: "get",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleGetUser())
             },
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user`,
               method: "put",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleUpdateUser())
             },
             {
@@ -2953,13 +2970,13 @@ var init = createPluginInitFunction(
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user/field`,
               method: "get",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleGetUserField())
             },
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user/field`,
               method: "put",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleUpdateUserField())
             }
           ]
@@ -3254,11 +3271,25 @@ var init = createPluginInitFunction(
               }
               const response = await originalImplementation.verifyEmailPOST(input);
               if (response.status === "OK") {
-                await completePendingEmailVerification({
+                const verificationResult = await completePendingEmailVerification({
                   recipeUserId: response.user.recipeUserId,
                   email: response.user.email,
                   userContext: input.userContext
                 });
+                const session = input.session;
+                const shouldReplaceSession = session && verificationResult && (session.getUserId(input.userContext) !== verificationResult.userId || session.getRecipeUserId(input.userContext).getAsString() !== verificationResult.recipeUserId.getAsString());
+                if (shouldReplaceSession) {
+                  await session.revokeSession(input.userContext);
+                  response.newSession = await import_session3.default.createNewSession(
+                    input.options.req,
+                    input.options.res,
+                    session.getTenantId(input.userContext),
+                    verificationResult.recipeUserId,
+                    {},
+                    {},
+                    input.userContext
+                  );
+                }
               }
               return response;
             }

package/dist/index.mjs

@@ -264,6 +264,12 @@ var require_supports_color = __commonJS({
   }
 });
 
+// src/plugin.ts
+import {
+  EmailVerificationClaim
+} from "supertokens-node/recipe/emailverification";
+import Session3 from "supertokens-node/recipe/session";
+
 // ../../shared/js/src/createPluginInit.ts
 var import_supertokens_js_override = __toESM(require_build());
 var createPluginInitFunction = (init2, getImplementation, getNormalisedConfig = (config2) => config2) => {
@@ -1845,12 +1851,12 @@ function hasVerifiedRealLoginMethod(user) {
   });
 }
 function getEffectiveAuthLevel(user, originalAuthLevel, verifiedData) {
-  if (originalAuthLevel === INSTANT_AUTH_METHOD_ID) {
-    return INSTANT_AUTH_METHOD_ID;
-  }
   if (hasVerifiedRealLoginMethod(user)) {
     return "verified";
   }
+  if (originalAuthLevel === INSTANT_AUTH_METHOD_ID) {
+    return INSTANT_AUTH_METHOD_ID;
+  }
   return getGuestAuthLevel(user) || originalAuthLevel || (verifiedData && Object.keys(verifiedData).length > 0 ? "verified" : "unverified");
 }
 function canUpdateUserDataField(field) {
@@ -2279,6 +2285,7 @@ async function completePendingEmailVerification(input) {
     return;
   }
   let metadataUserId = userId;
+  let verifiedRecipeUserId = input.recipeUserId;
   const passwordlessEmailMethod = getPasswordlessEmailLoginMethod(user);
   if (passwordlessEmailMethod) {
     const updateResult = await Passwordless.updateUser({
@@ -2291,6 +2298,7 @@ async function completePendingEmailVerification(input) {
         `Failed to update verified email method: ${updateResult.status}`
       );
     }
+    verifiedRecipeUserId = passwordlessEmailMethod.recipeUserId;
   } else if (hasOnlyGuestLoginMethods(user)) {
     const isPasswordlessSignUpAllowed = await AccountLinking.isSignUpAllowed(
       PUBLIC_TENANT_ID,
@@ -2310,6 +2318,7 @@ async function completePendingEmailVerification(input) {
       tenantId: PUBLIC_TENANT_ID,
       userContext: input.userContext
     });
+    verifiedRecipeUserId = passwordlessUser.recipeUserId;
     const primaryUserResult = await AccountLinking.createPrimaryUser(
       passwordlessUser.recipeUserId,
       input.userContext
@@ -2355,6 +2364,10 @@ async function completePendingEmailVerification(input) {
     )
   };
   await UserMetadata3.updateUserMetadata(metadataUserId, updatedMetadata);
+  return {
+    userId: metadataUserId,
+    recipeUserId: verifiedRecipeUserId
+  };
 }
 function isMatchingPendingEmailVerification(verification, email) {
   return verification.field === "email" && verification.value === email;
@@ -2783,6 +2796,12 @@ function validateWritableFields(fields) {
 }
 
 // src/plugin.ts
+var verifyRowndUserSessionOptions = {
+  sessionRequired: true,
+  overrideGlobalClaimValidators: (validators) => validators.filter((validator) => {
+    return !("claim" in validator) || validator.claim.key !== EmailVerificationClaim.key;
+  })
+};
 var init = createPluginInitFunction(
   (pluginConfig2) => {
     const rowndClient2 = createInstance({
@@ -2898,13 +2917,13 @@ var init = createPluginInitFunction(
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user`,
               method: "get",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleGetUser())
             },
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user`,
               method: "put",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleUpdateUser())
             },
             {
@@ -2928,13 +2947,13 @@ var init = createPluginInitFunction(
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user/field`,
               method: "get",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleGetUserField())
             },
             {
               path: `${apiBasePath}${HANDLE_BASE_PATH}/user/field`,
               method: "put",
-              verifySessionOptions: { sessionRequired: true },
+              verifySessionOptions: verifyRowndUserSessionOptions,
               handler: withRequestHandler(handleUpdateUserField())
             }
           ]
@@ -3229,11 +3248,25 @@ var init = createPluginInitFunction(
               }
               const response = await originalImplementation.verifyEmailPOST(input);
               if (response.status === "OK") {
-                await completePendingEmailVerification({
+                const verificationResult = await completePendingEmailVerification({
                   recipeUserId: response.user.recipeUserId,
                   email: response.user.email,
                   userContext: input.userContext
                 });
+                const session = input.session;
+                const shouldReplaceSession = session && verificationResult && (session.getUserId(input.userContext) !== verificationResult.userId || session.getRecipeUserId(input.userContext).getAsString() !== verificationResult.recipeUserId.getAsString());
+                if (shouldReplaceSession) {
+                  await session.revokeSession(input.userContext);
+                  response.newSession = await Session3.createNewSession(
+                    input.options.req,
+                    input.options.res,
+                    session.getTenantId(input.userContext),
+                    verificationResult.recipeUserId,
+                    {},
+                    {},
+                    input.userContext
+                  );
+                }
               }
               return response;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supertokens-plugins/rownd-nodejs",
-  "version": "0.3.0-beta.7",
+  "version": "0.3.0-beta.8",
   "description": "Rownd User Migration Plugin for SuperTokens",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",