strapi-custom-auth 1.2.21 → 1.2.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/server/index.js +7 -8
  2. package/dist/server/index.mjs +7 -8
  3. package/package.json +1 -1
package/dist/server/index.js CHANGED
@@ -2981,7 +2981,6 @@ async function cognitoSignInCallback(ctx) {
2981
2981
  const config2 = configValidation$2();
2982
2982
  const userService = strapi.service("admin::user");
2983
2983
  const tokenService = strapi.service("admin::token");
2984
- console.log("---tokenService---", tokenService);
2985
2984
  const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
2986
2985
  const roleService = strapi.plugin("strapi-custom-auth").service("role");
2987
2986
  if (!ctx.query.code) {
@@ -3020,7 +3019,7 @@ async function cognitoSignInCallback(ctx) {
3020
3019
  let jwtToken;
3021
3020
  if (dbUser) {
3022
3021
  activateUser = dbUser;
3023
- jwtToken = await tokenService.createJwtToken(dbUser);
3022
+ jwtToken = await tokenService.createToken(dbUser);
3024
3023
  } else {
3025
3024
  const cognitoRoles = await roleService.cognitoRoles();
3026
3025
  const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
@@ -3034,7 +3033,7 @@ async function cognitoSignInCallback(ctx) {
3034
3033
  defaultLocale,
3035
3034
  roles2
3036
3035
  );
3037
- jwtToken = await tokenService.createJwtToken(activateUser);
3036
+ jwtToken = await tokenService.createToken(activateUser);
3038
3037
  await oauthService.triggerWebHook(activateUser);
3039
3038
  }
3040
3039
  oauthService.triggerSignInSuccess(activateUser);
@@ -3109,7 +3108,7 @@ async function customSignInCallback(ctx) {
3109
3108
  }
3110
3109
  if (dbUser) {
3111
3110
  activateUser = dbUser;
3112
- jwtToken = await tokenService.createJwtToken(dbUser);
3111
+ jwtToken = await tokenService.createToken(dbUser);
3113
3112
  }
3114
3113
  oauthService.triggerSignInSuccess(activateUser);
3115
3114
  const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
@@ -3200,7 +3199,7 @@ async function customConfirmMfa(ctx) {
3200
3199
  if (!otp2) {
3201
3200
  throw new Error("Invalid code");
3202
3201
  }
3203
- jwtToken = await tokenService.createJwtToken(otp2.user);
3202
+ jwtToken = await tokenService.createToken(otp2.user);
3204
3203
  await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
3205
3204
  where: {
3206
3205
  id
@@ -3357,14 +3356,14 @@ async function microsoftSignInCallback(ctx) {
3357
3356
  } else {
3358
3357
  activateUser = dbUser;
3359
3358
  }
3360
- jwtToken = await tokenService.createJwtToken(activateUser);
3359
+ jwtToken = await tokenService.createToken(activateUser);
3361
3360
  } else {
3362
3361
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
3363
3362
  const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
3364
3363
  const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
3365
3364
  activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
3366
3365
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
3367
- jwtToken = await tokenService.createJwtToken(activateUser);
3366
+ jwtToken = await tokenService.createToken(activateUser);
3368
3367
  }
3369
3368
  oauthService.triggerSignInSuccess(activateUser);
3370
3369
  const nonce = v4();
@@ -3416,7 +3415,7 @@ async function microsoftTokenRenewal(ctx) {
3416
3415
  });
3417
3416
  const { mail } = userResponse?.data;
3418
3417
  const dbUser = await userService.findOneByEmail(mail);
3419
- const jwtToken = await tokenService.createJwtToken(dbUser);
3418
+ const jwtToken = await tokenService.createToken(dbUser);
3420
3419
  return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
3421
3420
  } catch (e2) {
3422
3421
  console.error(e2.message);
package/dist/server/index.mjs CHANGED
@@ -2966,7 +2966,6 @@ async function cognitoSignInCallback(ctx) {
2966
2966
  const config2 = configValidation$2();
2967
2967
  const userService = strapi.service("admin::user");
2968
2968
  const tokenService = strapi.service("admin::token");
2969
- console.log("---tokenService---", tokenService);
2970
2969
  const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
2971
2970
  const roleService = strapi.plugin("strapi-custom-auth").service("role");
2972
2971
  if (!ctx.query.code) {
@@ -3005,7 +3004,7 @@ async function cognitoSignInCallback(ctx) {
3005
3004
  let jwtToken;
3006
3005
  if (dbUser) {
3007
3006
  activateUser = dbUser;
3008
- jwtToken = await tokenService.createJwtToken(dbUser);
3007
+ jwtToken = await tokenService.createToken(dbUser);
3009
3008
  } else {
3010
3009
  const cognitoRoles = await roleService.cognitoRoles();
3011
3010
  const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
@@ -3019,7 +3018,7 @@ async function cognitoSignInCallback(ctx) {
3019
3018
  defaultLocale,
3020
3019
  roles2
3021
3020
  );
3022
- jwtToken = await tokenService.createJwtToken(activateUser);
3021
+ jwtToken = await tokenService.createToken(activateUser);
3023
3022
  await oauthService.triggerWebHook(activateUser);
3024
3023
  }
3025
3024
  oauthService.triggerSignInSuccess(activateUser);
@@ -3094,7 +3093,7 @@ async function customSignInCallback(ctx) {
3094
3093
  }
3095
3094
  if (dbUser) {
3096
3095
  activateUser = dbUser;
3097
- jwtToken = await tokenService.createJwtToken(dbUser);
3096
+ jwtToken = await tokenService.createToken(dbUser);
3098
3097
  }
3099
3098
  oauthService.triggerSignInSuccess(activateUser);
3100
3099
  const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
@@ -3185,7 +3184,7 @@ async function customConfirmMfa(ctx) {
3185
3184
  if (!otp2) {
3186
3185
  throw new Error("Invalid code");
3187
3186
  }
3188
- jwtToken = await tokenService.createJwtToken(otp2.user);
3187
+ jwtToken = await tokenService.createToken(otp2.user);
3189
3188
  await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
3190
3189
  where: {
3191
3190
  id
@@ -3342,14 +3341,14 @@ async function microsoftSignInCallback(ctx) {
3342
3341
  } else {
3343
3342
  activateUser = dbUser;
3344
3343
  }
3345
- jwtToken = await tokenService.createJwtToken(activateUser);
3344
+ jwtToken = await tokenService.createToken(activateUser);
3346
3345
  } else {
3347
3346
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
3348
3347
  const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
3349
3348
  const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
3350
3349
  activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
3351
3350
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
3352
- jwtToken = await tokenService.createJwtToken(activateUser);
3351
+ jwtToken = await tokenService.createToken(activateUser);
3353
3352
  }
3354
3353
  oauthService.triggerSignInSuccess(activateUser);
3355
3354
  const nonce = v4();
@@ -3401,7 +3400,7 @@ async function microsoftTokenRenewal(ctx) {
3401
3400
  });
3402
3401
  const { mail } = userResponse?.data;
3403
3402
  const dbUser = await userService.findOneByEmail(mail);
3404
- const jwtToken = await tokenService.createJwtToken(dbUser);
3403
+ const jwtToken = await tokenService.createToken(dbUser);
3405
3404
  return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
3406
3405
  } catch (e2) {
3407
3406
  console.error(e2.message);
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.2.21",
2
+ "version": "1.2.23",
3
3
  "keywords": [],
4
4
  "type": "commonjs",
5
5
  "exports": {