Fix incorrect field in validateProviderAuthToken

This commit is contained in:
Tuan Dang
2023-08-13 14:08:26 +07:00
parent c0f3aecad3
commit 95d25b114e
3 changed files with 15 additions and 4 deletions
@@ -1,5 +1,5 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import { User } from "../../models"; import { AuthMethod, User } from "../../models";
import { checkEmailVerification, sendEmailVerification } from "../../helpers/signup"; import { checkEmailVerification, sendEmailVerification } from "../../helpers/signup";
import { createToken } from "../../helpers/auth"; import { createToken } from "../../helpers/auth";
import { BadRequestError } from "../../utils/errors"; import { BadRequestError } from "../../utils/errors";
@@ -81,7 +81,8 @@ export const verifyEmailSignup = async (req: Request, res: Response) => {
if (!user) { if (!user) {
user = await new User({ user = await new User({
email email,
authMethods: [AuthMethod.EMAIL]
}).save(); }).save();
} }
+11 -1
View File
@@ -117,7 +117,17 @@ export const completeAccountSignup = async (req: Request, res: Response) => {
if (!user) if (!user)
throw new Error("Failed to complete account for non-existent user"); // ensure user is non-null throw new Error("Failed to complete account for non-existent user"); // ensure user is non-null
if (!user.authMethods?.includes(AuthMethod.OKTA_SAML)) { const hasSamlEnabled = user.authMethods
.some(
(authMethod: AuthMethod) =>
[
AuthMethod.OKTA_SAML,
AuthMethod.AZURE_SAML,
AuthMethod.JUMPCLOUD_SAML
].includes(authMethod)
);
if (!hasSamlEnabled) { // TODO: modify this part
// initialize default organization and workspace // initialize default organization and workspace
await initializeDefaultOrg({ await initializeDefaultOrg({
organizationName, organizationName,
+1 -1
View File
@@ -408,7 +408,7 @@ export const validateProviderAuthToken = async ({
); );
if ( if (
!user.authMethods.includes(decodedToken.authProvider) || !user.authMethods.includes(decodedToken.authMethod) ||
decodedToken.email !== email decodedToken.email !== email
) { ) {
throw new Error("Invalid authentication credentials.") throw new Error("Invalid authentication credentials.")