mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-09-22 13:39:35 +00:00
Fix incorrect field in validateProviderAuthToken
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { Request, Response } from "express";
|
||||
import { User } from "../../models";
|
||||
import { AuthMethod, User } from "../../models";
|
||||
import { checkEmailVerification, sendEmailVerification } from "../../helpers/signup";
|
||||
import { createToken } from "../../helpers/auth";
|
||||
import { BadRequestError } from "../../utils/errors";
|
||||
@@ -81,7 +81,8 @@ export const verifyEmailSignup = async (req: Request, res: Response) => {
|
||||
|
||||
if (!user) {
|
||||
user = await new User({
|
||||
email
|
||||
email,
|
||||
authMethods: [AuthMethod.EMAIL]
|
||||
}).save();
|
||||
}
|
||||
|
||||
|
||||
@@ -117,7 +117,17 @@ export const completeAccountSignup = async (req: Request, res: Response) => {
|
||||
if (!user)
|
||||
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
|
||||
await initializeDefaultOrg({
|
||||
organizationName,
|
||||
|
||||
@@ -408,7 +408,7 @@ export const validateProviderAuthToken = async ({
|
||||
);
|
||||
|
||||
if (
|
||||
!user.authMethods.includes(decodedToken.authProvider) ||
|
||||
!user.authMethods.includes(decodedToken.authMethod) ||
|
||||
decodedToken.email !== email
|
||||
) {
|
||||
throw new Error("Invalid authentication credentials.")
|
||||
|
||||
Reference in New Issue
Block a user