Split ST V3 modal into option tabs, re-modularized authn methods

backend/src/helpers/secrets.ts

@@ -49,7 +49,7 @@ import {
 import { TelemetryService } from "../services";
 import { client, getEncryptionKey, getRootEncryptionKey } from "../config";
 import { EEAuditLogService, EELogService, EESecretService } from "../ee/services";
-import { getAuthDataPayloadIdObj, getAuthDataPayloadUserObj } from "../utils/authn/authDataExtractors";
+import { getAuthDataPayloadIdObj, getAuthDataPayloadUserObj } from "../utils/authn/helpers";
 import { getFolderByPath, getFolderIdFromServiceToken } from "../services/FolderService";
 import picomatch from "picomatch";
 import path from "path";

backend/src/middleware/requireAuth.ts

@@ -2,7 +2,7 @@ import jwt from "jsonwebtoken";
 import { NextFunction, Request, Response } from "express";
 import { AuthMode } from "../variables";
 import { AuthData } from "../interfaces/middleware";
-import { extractAuthMode, getAuthData } from "../utils/authn/authMode";
+import { extractAuthMode, getAuthData } from "../utils/authn/helpers";
 import { UnauthorizedRequestError } from "../utils/errors";
 
 declare module "jsonwebtoken" {

backend/src/utils/authn/authDataExtractors/index.ts

@@ -1,53 +0,0 @@
-import { AuthData } from "../../../interfaces/middleware";
-import {
-  ServiceAccount,
-  ServiceTokenData,
-  ServiceTokenDataV3,
-  User
-} from "../../../models";
-
-/**
- * Returns an object containing the id of the authentication data payload
- * @param {AuthData} authData - authentication data object
- * @returns 
- */
-export const getAuthDataPayloadIdObj = (authData: AuthData) => {
-  if (authData.authPayload instanceof User) {
-    return { userId: authData.authPayload._id };
-  }
-
-  if (authData.authPayload instanceof ServiceAccount) {
-    return { serviceAccountId: authData.authPayload._id };
-  }
-
-  if (authData.authPayload instanceof ServiceTokenData) {
-    return { serviceTokenDataId: authData.authPayload._id };
-  }
-
-  if (authData.authPayload instanceof ServiceTokenDataV3) {
-    return { serviceTokenDataId: authData.authPayload._id };
-  }
-};
-
-/**
- * Returns an object containing the user associated with the authentication data payload
- * @param {AuthData} authData - authentication data object
- * @returns 
- */
-export const getAuthDataPayloadUserObj = (authData: AuthData) => {
-  if (authData.authPayload instanceof User) {
-    return { user: authData.authPayload._id };
-  }
-
-  if (authData.authPayload instanceof ServiceAccount) {
-    return { user: authData.authPayload.user };
-  }
-
-  if (authData.authPayload instanceof ServiceTokenData) {
-    return { user: authData.authPayload.user };
-  }
-  
-  if (authData.authPayload instanceof ServiceTokenDataV3) {
-    return { user: authData.authPayload.user };
-  }
-}

backend/src/utils/authn/authMode/index.ts

@@ -1,4 +0,0 @@
-export { 
-    extractAuthMode, 
-    getAuthData
-} from "./helpers";

backend/src/utils/authn/authModeValidators/index.ts

@@ -0,0 +1,5 @@
+export * from "./apiKey";
+export * from "./apiKeyV2";
+export * from "./jwt";
+export * from "./serviceTokenV2";
+export * from "./serviceTokenV3";

backend/src/utils/authn/helpers/authDataExtractors.ts

@@ -0,0 +1,53 @@
+import { AuthData } from "../../../interfaces/middleware";
+import {
+  ServiceAccount,
+  ServiceTokenData,
+  ServiceTokenDataV3,
+  User
+} from "../../../models";
+
+/**
+ * Returns an object containing the id of the authentication data payload
+ * @param {AuthData} authData - authentication data object
+ * @returns 
+ */
+ export const getAuthDataPayloadIdObj = (authData: AuthData) => {
+    if (authData.authPayload instanceof User) {
+        return { userId: authData.authPayload._id };
+    }
+  
+    if (authData.authPayload instanceof ServiceAccount) {
+        return { serviceAccountId: authData.authPayload._id };
+    }
+  
+    if (authData.authPayload instanceof ServiceTokenData) {
+        return { serviceTokenDataId: authData.authPayload._id };
+    }
+  
+    if (authData.authPayload instanceof ServiceTokenDataV3) {
+        return { serviceTokenDataId: authData.authPayload._id };
+    }
+};
+  
+/**
+ * Returns an object containing the user associated with the authentication data payload
+ * @param {AuthData} authData - authentication data object
+ * @returns 
+ */
+export const getAuthDataPayloadUserObj = (authData: AuthData) => {
+    if (authData.authPayload instanceof User) {
+        return { user: authData.authPayload._id };
+    }
+
+    if (authData.authPayload instanceof ServiceAccount) {
+        return { user: authData.authPayload.user };
+    }
+
+    if (authData.authPayload instanceof ServiceTokenData) {
+        return { user: authData.authPayload.user };
+    }
+
+    if (authData.authPayload instanceof ServiceTokenDataV3) {
+        return { user: authData.authPayload.user };
+    }
+}

backend/src/utils/authn/helpers/index.ts

@@ -1,15 +1,19 @@
+import { AuthData } from "../../../interfaces/middleware";
 import jwt from "jsonwebtoken";
 import { getAuthSecret } from "../../../config";
 import { ActorType } from "../../../ee/models";
 import { AuthMode, AuthTokenType } from "../../../variables";
 import { UnauthorizedRequestError } from "../../errors";
-import { validateAPIKey } from "./apiKey";
-import { validateAPIKeyV2 } from "./apiKeyV2";
-import { validateServiceTokenV2 } from "./serviceTokenV2";
-import { validateServiceTokenV3 } from "./serviceTokenV3";
-import { validateJWT } from "./jwt";
+import {
+  validateAPIKey,
+  validateAPIKeyV2,
+  validateJWT,
+  validateServiceTokenV2,
+  validateServiceTokenV3
+} from "../authModeValidators";
 import { getUserAgentType } from "../../posthog";
-import { AuthData } from "../../../interfaces/middleware";
+
+export * from "./authDataExtractors";
 
 interface ExtractAuthModeParams {
     headers: { [key: string]: string | string[] | undefined }