strapi-custom-auth 1.2.32 → 1.2.34

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 (5) hide show
  1. package/dist/admin/index.js +10 -1
  2. package/dist/admin/index.mjs +10 -1
  3. package/dist/server/index.js +7 -7
  4. package/dist/server/index.mjs +7 -7
  5. package/package.json +1 -1
package/dist/admin/index.js CHANGED
@@ -75,7 +75,16 @@ const fetchInterceptor = (storage) => {
75
75
  const byPass = init.headers ? await init.headers.get("x-by-pass") : false;
76
76
  if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest") || url.includes("/admin/init") || init.body instanceof FormData || byPass == true) {
77
77
  console.log("---skip renewal---");
78
- return originalFetch(input, init);
78
+ try {
79
+ const response = await originalFetch(input, init);
80
+ console.log("---response--", JSON.stringify(response));
81
+ console.log("---response, json--", await response.json());
82
+ console.log("---response, text--", await response.text());
83
+ return response;
84
+ } catch (e) {
85
+ console.log("----fetch---, e", e);
86
+ console.log("----fetch---, e", JSON.stringify(e));
87
+ }
79
88
  }
80
89
  console.log("---renewal---");
81
90
  let token = storage.getItem("jwtToken").replace(/"/g, "");
package/dist/admin/index.mjs CHANGED
@@ -74,7 +74,16 @@ const fetchInterceptor = (storage) => {
74
74
  const byPass = init.headers ? await init.headers.get("x-by-pass") : false;
75
75
  if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest") || url.includes("/admin/init") || init.body instanceof FormData || byPass == true) {
76
76
  console.log("---skip renewal---");
77
- return originalFetch(input, init);
77
+ try {
78
+ const response = await originalFetch(input, init);
79
+ console.log("---response--", JSON.stringify(response));
80
+ console.log("---response, json--", await response.json());
81
+ console.log("---response, text--", await response.text());
82
+ return response;
83
+ } catch (e) {
84
+ console.log("----fetch---, e", e);
85
+ console.log("----fetch---, e", JSON.stringify(e));
86
+ }
78
87
  }
79
88
  console.log("---renewal---");
80
89
  let token = storage.getItem("jwtToken").replace(/"/g, "");
package/dist/server/index.js CHANGED
@@ -3019,7 +3019,7 @@ async function cognitoSignInCallback(ctx) {
3019
3019
  let jwtToken;
3020
3020
  if (dbUser) {
3021
3021
  activateUser = dbUser;
3022
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
3022
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
3023
3023
  } else {
3024
3024
  const cognitoRoles = await roleService.cognitoRoles();
3025
3025
  const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
@@ -3033,7 +3033,7 @@ async function cognitoSignInCallback(ctx) {
3033
3033
  defaultLocale,
3034
3034
  roles2
3035
3035
  );
3036
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
3036
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
3037
3037
  await oauthService.triggerWebHook(activateUser);
3038
3038
  }
3039
3039
  oauthService.triggerSignInSuccess(activateUser);
@@ -3108,7 +3108,7 @@ async function customSignInCallback(ctx) {
3108
3108
  }
3109
3109
  if (dbUser) {
3110
3110
  activateUser = dbUser;
3111
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
3111
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
3112
3112
  }
3113
3113
  oauthService.triggerSignInSuccess(activateUser);
3114
3114
  const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
@@ -3199,7 +3199,7 @@ async function customConfirmMfa(ctx) {
3199
3199
  if (!otp2) {
3200
3200
  throw new Error("Invalid code");
3201
3201
  }
3202
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(otp2.user);
3202
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: otp2.user.id });
3203
3203
  await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
3204
3204
  where: {
3205
3205
  id
@@ -3357,14 +3357,14 @@ async function microsoftSignInCallback(ctx) {
3357
3357
  } else {
3358
3358
  activateUser = dbUser;
3359
3359
  }
3360
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
3360
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
3361
3361
  } else {
3362
3362
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
3363
3363
  const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
3364
3364
  const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
3365
3365
  activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
3366
3366
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
3367
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
3367
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
3368
3368
  }
3369
3369
  oauthService.triggerSignInSuccess(activateUser);
3370
3370
  const nonce = v4();
@@ -3416,7 +3416,7 @@ async function microsoftTokenRenewal(ctx) {
3416
3416
  });
3417
3417
  const { mail } = userResponse?.data;
3418
3418
  const dbUser = await userService.findOneByEmail(mail);
3419
- const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
3419
+ const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
3420
3420
  return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
3421
3421
  } catch (e2) {
3422
3422
  console.error(e2.message);
package/dist/server/index.mjs CHANGED
@@ -3004,7 +3004,7 @@ async function cognitoSignInCallback(ctx) {
3004
3004
  let jwtToken;
3005
3005
  if (dbUser) {
3006
3006
  activateUser = dbUser;
3007
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
3007
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
3008
3008
  } else {
3009
3009
  const cognitoRoles = await roleService.cognitoRoles();
3010
3010
  const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
@@ -3018,7 +3018,7 @@ async function cognitoSignInCallback(ctx) {
3018
3018
  defaultLocale,
3019
3019
  roles2
3020
3020
  );
3021
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
3021
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
3022
3022
  await oauthService.triggerWebHook(activateUser);
3023
3023
  }
3024
3024
  oauthService.triggerSignInSuccess(activateUser);
@@ -3093,7 +3093,7 @@ async function customSignInCallback(ctx) {
3093
3093
  }
3094
3094
  if (dbUser) {
3095
3095
  activateUser = dbUser;
3096
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
3096
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
3097
3097
  }
3098
3098
  oauthService.triggerSignInSuccess(activateUser);
3099
3099
  const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
@@ -3184,7 +3184,7 @@ async function customConfirmMfa(ctx) {
3184
3184
  if (!otp2) {
3185
3185
  throw new Error("Invalid code");
3186
3186
  }
3187
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(otp2.user);
3187
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: otp2.user.id });
3188
3188
  await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
3189
3189
  where: {
3190
3190
  id
@@ -3342,14 +3342,14 @@ async function microsoftSignInCallback(ctx) {
3342
3342
  } else {
3343
3343
  activateUser = dbUser;
3344
3344
  }
3345
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
3345
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
3346
3346
  } else {
3347
3347
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
3348
3348
  const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
3349
3349
  const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
3350
3350
  activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
3351
3351
  console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
3352
- jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(activateUser);
3352
+ jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
3353
3353
  }
3354
3354
  oauthService.triggerSignInSuccess(activateUser);
3355
3355
  const nonce = v4();
@@ -3401,7 +3401,7 @@ async function microsoftTokenRenewal(ctx) {
3401
3401
  });
3402
3402
  const { mail } = userResponse?.data;
3403
3403
  const dbUser = await userService.findOneByEmail(mail);
3404
- const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue(dbUser);
3404
+ const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
3405
3405
  return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
3406
3406
  } catch (e2) {
3407
3407
  console.error(e2.message);
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.2.32",
2
+ "version": "1.2.34",
3
3
  "keywords": [],
4
4
  "type": "commonjs",
5
5
  "exports": {