strapi-custom-auth 1.2.31 → 1.2.33
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.
- package/dist/server/index.js +7 -21
- package/dist/server/index.mjs +7 -21
- package/package.json +1 -1
package/dist/server/index.js
CHANGED
|
@@ -3019,9 +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({
|
|
3023
|
-
id: activateUser.id
|
|
3024
|
-
});
|
|
3022
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
|
|
3025
3023
|
} else {
|
|
3026
3024
|
const cognitoRoles = await roleService.cognitoRoles();
|
|
3027
3025
|
const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
|
|
@@ -3035,9 +3033,7 @@ async function cognitoSignInCallback(ctx) {
|
|
|
3035
3033
|
defaultLocale,
|
|
3036
3034
|
roles2
|
|
3037
3035
|
);
|
|
3038
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3039
|
-
id: activateUser.id
|
|
3040
|
-
});
|
|
3036
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
|
|
3041
3037
|
await oauthService.triggerWebHook(activateUser);
|
|
3042
3038
|
}
|
|
3043
3039
|
oauthService.triggerSignInSuccess(activateUser);
|
|
@@ -3112,9 +3108,7 @@ async function customSignInCallback(ctx) {
|
|
|
3112
3108
|
}
|
|
3113
3109
|
if (dbUser) {
|
|
3114
3110
|
activateUser = dbUser;
|
|
3115
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3116
|
-
id: activateUser.id
|
|
3117
|
-
});
|
|
3111
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
|
|
3118
3112
|
}
|
|
3119
3113
|
oauthService.triggerSignInSuccess(activateUser);
|
|
3120
3114
|
const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
|
|
@@ -3205,9 +3199,7 @@ async function customConfirmMfa(ctx) {
|
|
|
3205
3199
|
if (!otp2) {
|
|
3206
3200
|
throw new Error("Invalid code");
|
|
3207
3201
|
}
|
|
3208
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3209
|
-
id: otp2.user.id
|
|
3210
|
-
});
|
|
3202
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: otp2.user.id });
|
|
3211
3203
|
await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
|
|
3212
3204
|
where: {
|
|
3213
3205
|
id
|
|
@@ -3365,18 +3357,14 @@ async function microsoftSignInCallback(ctx) {
|
|
|
3365
3357
|
} else {
|
|
3366
3358
|
activateUser = dbUser;
|
|
3367
3359
|
}
|
|
3368
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3369
|
-
id: activateUser.id
|
|
3370
|
-
});
|
|
3360
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
|
|
3371
3361
|
} else {
|
|
3372
3362
|
console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
|
|
3373
3363
|
const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
|
|
3374
3364
|
const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
|
|
3375
3365
|
activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
|
|
3376
3366
|
console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
|
|
3377
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3378
|
-
id: activateUser.id
|
|
3379
|
-
});
|
|
3367
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
|
|
3380
3368
|
}
|
|
3381
3369
|
oauthService.triggerSignInSuccess(activateUser);
|
|
3382
3370
|
const nonce = v4();
|
|
@@ -3428,9 +3416,7 @@ async function microsoftTokenRenewal(ctx) {
|
|
|
3428
3416
|
});
|
|
3429
3417
|
const { mail } = userResponse?.data;
|
|
3430
3418
|
const dbUser = await userService.findOneByEmail(mail);
|
|
3431
|
-
const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3432
|
-
id: dbUser.id
|
|
3433
|
-
});
|
|
3419
|
+
const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
|
|
3434
3420
|
return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
|
|
3435
3421
|
} catch (e2) {
|
|
3436
3422
|
console.error(e2.message);
|
package/dist/server/index.mjs
CHANGED
|
@@ -3004,9 +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({
|
|
3008
|
-
id: activateUser.id
|
|
3009
|
-
});
|
|
3007
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
|
|
3010
3008
|
} else {
|
|
3011
3009
|
const cognitoRoles = await roleService.cognitoRoles();
|
|
3012
3010
|
const roles2 = cognitoRoles && cognitoRoles["roles"] ? cognitoRoles["roles"].map((role2) => ({
|
|
@@ -3020,9 +3018,7 @@ async function cognitoSignInCallback(ctx) {
|
|
|
3020
3018
|
defaultLocale,
|
|
3021
3019
|
roles2
|
|
3022
3020
|
);
|
|
3023
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3024
|
-
id: activateUser.id
|
|
3025
|
-
});
|
|
3021
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
|
|
3026
3022
|
await oauthService.triggerWebHook(activateUser);
|
|
3027
3023
|
}
|
|
3028
3024
|
oauthService.triggerSignInSuccess(activateUser);
|
|
@@ -3097,9 +3093,7 @@ async function customSignInCallback(ctx) {
|
|
|
3097
3093
|
}
|
|
3098
3094
|
if (dbUser) {
|
|
3099
3095
|
activateUser = dbUser;
|
|
3100
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3101
|
-
id: activateUser.id
|
|
3102
|
-
});
|
|
3096
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
|
|
3103
3097
|
}
|
|
3104
3098
|
oauthService.triggerSignInSuccess(activateUser);
|
|
3105
3099
|
const html = oauthService.renderSignUpSuccess(jwtToken, activateUser, nonce);
|
|
@@ -3190,9 +3184,7 @@ async function customConfirmMfa(ctx) {
|
|
|
3190
3184
|
if (!otp2) {
|
|
3191
3185
|
throw new Error("Invalid code");
|
|
3192
3186
|
}
|
|
3193
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3194
|
-
id: otp2.user.id
|
|
3195
|
-
});
|
|
3187
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: otp2.user.id });
|
|
3196
3188
|
await strapi.query("plugin::strapi-custom-auth.mfaotp").delete({
|
|
3197
3189
|
where: {
|
|
3198
3190
|
id
|
|
@@ -3350,18 +3342,14 @@ async function microsoftSignInCallback(ctx) {
|
|
|
3350
3342
|
} else {
|
|
3351
3343
|
activateUser = dbUser;
|
|
3352
3344
|
}
|
|
3353
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3354
|
-
id: activateUser.id
|
|
3355
|
-
});
|
|
3345
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
|
|
3356
3346
|
} else {
|
|
3357
3347
|
console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
|
|
3358
3348
|
const roles2 = await roleService.retrieveMicrosoftUserRoles(groupResponse, config2);
|
|
3359
3349
|
const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
|
|
3360
3350
|
activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
|
|
3361
3351
|
console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
|
|
3362
|
-
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3363
|
-
id: activateUser.id
|
|
3364
|
-
});
|
|
3352
|
+
jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: activateUser.id });
|
|
3365
3353
|
}
|
|
3366
3354
|
oauthService.triggerSignInSuccess(activateUser);
|
|
3367
3355
|
const nonce = v4();
|
|
@@ -3413,9 +3401,7 @@ async function microsoftTokenRenewal(ctx) {
|
|
|
3413
3401
|
});
|
|
3414
3402
|
const { mail } = userResponse?.data;
|
|
3415
3403
|
const dbUser = await userService.findOneByEmail(mail);
|
|
3416
|
-
const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({
|
|
3417
|
-
id: dbUser.id
|
|
3418
|
-
});
|
|
3404
|
+
const jwtToken = strapi.plugins["users-permissions"].services.jwt.issue({ id: dbUser.id });
|
|
3419
3405
|
return ctx.send({ accessToken: jwtToken, refreshToken: tokenResponse.data.refresh_token });
|
|
3420
3406
|
} catch (e2) {
|
|
3421
3407
|
console.error(e2.message);
|
package/package.json
CHANGED