strapi-custom-auth 1.2.30 → 1.2.32

package/dist/server/index.js

@@ -2980,7 +2980,7 @@ async function cognitoSignIn(ctx) {
 async function cognitoSignInCallback(ctx) {
   const config2 = configValidation$2();
   const userService = strapi.service("admin::user");
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const roleService = strapi.plugin("strapi-custom-auth").service("role");
   if (!ctx.query.code) {
@@ -3019,7 +3019,7 @@ async function cognitoSignInCallback(ctx) {
     let jwtToken;
     if (dbUser) {
       activateUser = dbUser;
-      jwtToken = await tokenService.createToken(dbUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
     } else {
       const cognitoRoles = await roleService.cognitoRoles();
       const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
@@ -3033,7 +3033,7 @@ async function cognitoSignInCallback(ctx) {
         defaultLocale,
         roles2
       );
-      jwtToken = await tokenService.createToken(activateUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
       await oauthService.triggerWebHook(activateUser);
     }
     oauthService.triggerSignInSuccess(activateUser);
@@ -3096,7 +3096,7 @@ async function customSignIn(ctx) {
 }
 async function customSignInCallback(ctx) {
   const userService = strapi.service("admin::user");
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const nonce = v4$1();
   try {
@@ -3108,7 +3108,7 @@ async function customSignInCallback(ctx) {
     }
     if (dbUser) {
       activateUser = dbUser;
-      jwtToken = await tokenService.createToken(dbUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
     }
     oauthService.triggerSignInSuccess(activateUser);
     const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
@@ -3177,7 +3177,7 @@ async function customSignInMfa(ctx) {
   }
 }
 async function customConfirmMfa(ctx) {
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const nonce = v4$1();
   const { code, id, uid } = ctx.query;
@@ -3199,7 +3199,7 @@ async function customConfirmMfa(ctx) {
     if (!otp2) {
       throw new Error("Invalid code");
     }
-    jwtToken = await tokenService.createToken(otp2.user);
+    jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(otp2.user);
     await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
       where: {
         id
@@ -3282,7 +3282,7 @@ async function microsoftSignInCallback(ctx) {
   console.log("[STRAPI-CUSTOM-AUTH] Enter");
   const config2 = configValidation();
   const userService = strapi.service("admin::user");
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const roleService = strapi.plugin("strapi-custom-auth").service("role");
   console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback query code:", ctx?.query?.code);
@@ -3357,14 +3357,14 @@ async function microsoftSignInCallback(ctx) {
       } else {
         activateUser = dbUser;
       }
-      jwtToken = await tokenService.createToken(activateUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
     } else {
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
       const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
       const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
       activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
-      jwtToken = await tokenService.createToken(activateUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
     }
     oauthService.triggerSignInSuccess(activateUser);
     const nonce = v4();
@@ -3416,9 +3416,7 @@ async function microsoftTokenRenewal(ctx) {
     });
     const { mail } = userResponse?.data;
     const dbUser = await userService.findOneByEmail(mail);
-    const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
-      id: dbUser.id
-    });
+    const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
     return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
   } catch (e2) {
     console.error(e2.message);

package/dist/server/index.mjs

@@ -2965,7 +2965,7 @@ async function cognitoSignIn(ctx) {
 async function cognitoSignInCallback(ctx) {
   const config2 = configValidation$2();
   const userService = strapi.service("admin::user");
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const roleService = strapi.plugin("strapi-custom-auth").service("role");
   if (!ctx.query.code) {
@@ -3004,7 +3004,7 @@ async function cognitoSignInCallback(ctx) {
     let jwtToken;
     if (dbUser) {
       activateUser = dbUser;
-      jwtToken = await tokenService.createToken(dbUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
     } else {
       const cognitoRoles = await roleService.cognitoRoles();
       const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
@@ -3018,7 +3018,7 @@ async function cognitoSignInCallback(ctx) {
         defaultLocale,
         roles2
       );
-      jwtToken = await tokenService.createToken(activateUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
       await oauthService.triggerWebHook(activateUser);
     }
     oauthService.triggerSignInSuccess(activateUser);
@@ -3081,7 +3081,7 @@ async function customSignIn(ctx) {
 }
 async function customSignInCallback(ctx) {
   const userService = strapi.service("admin::user");
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const nonce = v4$1();
   try {
@@ -3093,7 +3093,7 @@ async function customSignInCallback(ctx) {
     }
     if (dbUser) {
       activateUser = dbUser;
-      jwtToken = await tokenService.createToken(dbUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
     }
     oauthService.triggerSignInSuccess(activateUser);
     const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
@@ -3162,7 +3162,7 @@ async function customSignInMfa(ctx) {
   }
 }
 async function customConfirmMfa(ctx) {
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const nonce = v4$1();
   const { code, id, uid } = ctx.query;
@@ -3184,7 +3184,7 @@ async function customConfirmMfa(ctx) {
     if (!otp2) {
       throw new Error("Invalid code");
     }
-    jwtToken = await tokenService.createToken(otp2.user);
+    jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(otp2.user);
     await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
       where: {
         id
@@ -3267,7 +3267,7 @@ async function microsoftSignInCallback(ctx) {
   console.log("[STRAPI-CUSTOM-AUTH] Enter");
   const config2 = configValidation();
   const userService = strapi.service("admin::user");
-  const tokenService = strapi.service("admin::token");
+  strapi.service("admin::token");
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
   const roleService = strapi.plugin("strapi-custom-auth").service("role");
   console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback query code:", ctx?.query?.code);
@@ -3342,14 +3342,14 @@ async function microsoftSignInCallback(ctx) {
       } else {
         activateUser = dbUser;
       }
-      jwtToken = await tokenService.createToken(activateUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
     } else {
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
       const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
       const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
       activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
-      jwtToken = await tokenService.createToken(activateUser);
+      jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
     }
     oauthService.triggerSignInSuccess(activateUser);
     const nonce = v4();
@@ -3401,9 +3401,7 @@ async function microsoftTokenRenewal(ctx) {
     });
     const { mail } = userResponse?.data;
     const dbUser = await userService.findOneByEmail(mail);
-    const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
-      id: dbUser.id
-    });
+    const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
     return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
   } catch (e2) {
     console.error(e2.message);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.30",
+  "version": "1.2.32",
   "keywords": [],
   "type": "commonjs",
   "exports": {