@optimizely-opal/opal-tool-ocp-sdk 0.0.0-OCP-1487.6 → 0.0.0-OCP-1487.8

package/dist/utils/ImportUtils.js

@@ -0,0 +1,77 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importAsGlobal = importAsGlobal;
+exports.importAsRegular = importAsRegular;
+const Service_1 = require("../service/Service");
+/**
+ * Import a module as global tools
+ * @param modulePath The path to the module to import
+ * @param baseUrl The base URL for resolving relative imports (optional)
+ * @returns The imported module
+ */
+async function importAsGlobal(modulePath, baseUrl) {
+    try {
+        Service_1.toolsService.setImportContext('global');
+        // If baseUrl is provided, resolve the module path relative to it
+        // Otherwise, use the modulePath as-is
+        const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
+        const module = await Promise.resolve(`${resolvedPath}`).then(s => __importStar(require(s)));
+        return module;
+    }
+    finally {
+        Service_1.toolsService.clearImportContext();
+    }
+}
+/**
+ * Import a module as regular tools
+ * @param modulePath The path to the module to import
+ * @param baseUrl The base URL for resolving relative imports (optional)
+ * @returns The imported module
+ */
+async function importAsRegular(modulePath, baseUrl) {
+    try {
+        Service_1.toolsService.setImportContext('regular');
+        // If baseUrl is provided, resolve the module path relative to it
+        // Otherwise, use the modulePath as-is
+        const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
+        const module = await Promise.resolve(`${resolvedPath}`).then(s => __importStar(require(s)));
+        return module;
+    }
+    finally {
+        Service_1.toolsService.clearImportContext();
+    }
+}
+//# sourceMappingURL=ImportUtils.js.map

package/dist/utils/ImportUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportUtils.js","sourceRoot":"","sources":["../../src/utils/ImportUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,wCAcC;AAQD,0CAcC;AA5CD,gDAAkD;AAElD;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAClC,UAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,sBAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,iEAAiE;QACjE,sCAAsC;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAC9E,MAAM,MAAM,GAAG,yBAAa,YAAY,uCAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,sBAAY,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,sBAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACzC,iEAAiE;QACjE,sCAAsC;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAC9E,MAAM,MAAM,GAAG,yBAAa,YAAY,uCAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,sBAAY,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimizely-opal/opal-tool-ocp-sdk",
-  "version": "0.0.0-OCP-1487.6",
+  "version": "0.0.0-OCP-1487.8",
   "description": "OCP SDK for Opal tool",
   "scripts": {
     "validate-deps": "node scripts/validate-deps.js",

package/src/auth/AuthUtils.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 import { getAppContext, logger } from '@zaiusinc/app-sdk';
 import { getTokenVerifier } from './TokenVerifier';
-import { authorizeRegularRequest, authorizeGlobalRequest } from './AuthUtils';
+import { authenticateRegularRequest, authenticateGlobalRequest } from './AuthUtils';
 
 // Mock the dependencies
 jest.mock('./TokenVerifier', () => ({
@@ -43,7 +43,7 @@ describe('AuthUtils', () => {
     } as any);
   });
 
-  describe('authorizeRegularRequest', () => {
+  describe('authenticateRegularRequest', () => {
     beforeEach(() => {
       // Default to successful token verification
       mockTokenVerifier.verify.mockResolvedValue(true);
@@ -53,7 +53,7 @@ describe('AuthUtils', () => {
       it('should return true without authentication', async () => {
         const request = { path: '/discovery' };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(true);
         expect(mockGetTokenVerifier).not.toHaveBeenCalled();
@@ -65,7 +65,7 @@ describe('AuthUtils', () => {
       it('should return true without authentication', async () => {
         const request = { path: '/ready' };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(true);
         expect(mockGetTokenVerifier).not.toHaveBeenCalled();
@@ -88,7 +88,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(true);
         expect(mockGetTokenVerifier).toHaveBeenCalled();
@@ -109,7 +109,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(true);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
@@ -129,7 +129,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(true);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
@@ -143,7 +143,7 @@ describe('AuthUtils', () => {
           bodyJSON: {}
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -155,7 +155,7 @@ describe('AuthUtils', () => {
           path: '/some-tool'
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -175,7 +175,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -195,7 +195,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -215,7 +215,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -235,7 +235,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -257,7 +257,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith(
@@ -280,7 +280,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('Organisation ID is required but not provided');
@@ -300,7 +300,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('Organisation ID is required but not provided');
@@ -322,7 +322,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith(
@@ -346,7 +346,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith(
@@ -372,7 +372,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('invalid-token');
@@ -395,7 +395,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verificationError);
@@ -418,7 +418,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeRegularRequest(request);
+        const result = await authenticateRegularRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verifierError);
@@ -426,7 +426,7 @@ describe('AuthUtils', () => {
     });
   });
 
-  describe('authorizeGlobalRequest', () => {
+  describe('authenticateGlobalRequest', () => {
     beforeEach(() => {
       // Default to successful token verification
       mockTokenVerifier.verify.mockResolvedValue(true);
@@ -436,7 +436,7 @@ describe('AuthUtils', () => {
       it('should return true without authentication', async () => {
         const request = { path: '/discovery' };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(true);
         expect(mockGetTokenVerifier).not.toHaveBeenCalled();
@@ -448,7 +448,7 @@ describe('AuthUtils', () => {
       it('should return true without authentication', async () => {
         const request = { path: '/ready' };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(true);
         expect(mockGetTokenVerifier).not.toHaveBeenCalled();
@@ -471,7 +471,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(true);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
@@ -495,7 +495,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(true);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
@@ -515,7 +515,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(true);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
@@ -529,7 +529,7 @@ describe('AuthUtils', () => {
           bodyJSON: {}
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -549,7 +549,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -569,7 +569,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -589,7 +589,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
@@ -613,7 +613,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(false);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('invalid-token');
@@ -636,14 +636,14 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(false);
         expect(logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verificationError);
       });
     });
 
-    describe('organization validation differences from authorizeRegularRequest', () => {
+    describe('organization validation differences from authenticateRegularRequest', () => {
       it('should NOT validate organization ID and allow any customer_id', async () => {
         const request = {
           path: '/global-tool',
@@ -658,7 +658,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(true);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
@@ -687,7 +687,7 @@ describe('AuthUtils', () => {
           }
         };
 
-        const result = await authorizeGlobalRequest(request);
+        const result = await authenticateGlobalRequest(request);
 
         expect(result).toBe(true);
         expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
@@ -702,8 +702,8 @@ describe('AuthUtils', () => {
         bodyJSON: null
       };
 
-      const result1 = await authorizeRegularRequest(request);
-      const result2 = await authorizeGlobalRequest(request);
+      const result1 = await authenticateRegularRequest(request);
+      const result2 = await authenticateGlobalRequest(request);
 
       expect(result1).toBe(false);
       expect(result2).toBe(false);
@@ -718,8 +718,8 @@ describe('AuthUtils', () => {
         }
       };
 
-      const result1 = await authorizeRegularRequest(request);
-      const result2 = await authorizeGlobalRequest(request);
+      const result1 = await authenticateRegularRequest(request);
+      const result2 = await authenticateGlobalRequest(request);
 
       expect(result1).toBe(false);
       expect(result2).toBe(false);

package/src/auth/AuthUtils.ts

@@ -27,7 +27,7 @@ async function validateAccessToken(accessToken: string | undefined): Promise<boo
  * @param request - The incoming request
  * @returns object with authData and accessToken, or null if invalid
  */
-function extractAuthData(request: any): { authData: OptiIdAuthData; accessToken: string } | null {
+export function extractAuthData(request: any): { authData: OptiIdAuthData; accessToken: string } | null {
   const authData = request?.bodyJSON?.auth as OptiIdAuthData;
   const accessToken = authData?.credentials?.access_token;
   if (!accessToken || authData?.provider?.toLowerCase() !== 'optiid') {
@@ -76,7 +76,7 @@ function shouldSkipAuth(request: any): boolean {
  * @param validateOrg - Whether to validate organization ID
  * @returns true if authentication succeeds
  */
-async function authenticateRequest(request: any, validateOrg: boolean = false): Promise<boolean> {
+async function authenticateRequest(request: any, validateOrg: boolean): Promise<boolean> {
   if (shouldSkipAuth(request)) {
     return true;
   }
@@ -97,21 +97,21 @@ async function authenticateRequest(request: any, validateOrg: boolean = false):
 }
 
 /**
- * Authorize a request for regular functions (with organization validation)
+ * Authenticate a request for regular functions (with organization validation)
  *
  * @param request - The incoming request
  * @returns true if authentication and authorization succeed
  */
-export async function authorizeRegularRequest(request: any): Promise<boolean> {
+export async function authenticateRegularRequest(request: any): Promise<boolean> {
   return await authenticateRequest(request, true);
 }
 
 /**
- * Authorize a request for global functions (without organization validation)
+ * Authenticate a request for global functions (without organization validation)
  *
  * @param request - The incoming request
  * @returns true if authentication succeeds
  */
-export async function authorizeGlobalRequest(request: any): Promise<boolean> {
+export async function authenticateGlobalRequest(request: any): Promise<boolean> {
   return await authenticateRequest(request, false);
 }