Merge pull request #266 from skyflowapi/SK-2422-allow-context-as-object-in-bearer-token-options-in-node-sdk

SK-2422 allow context as object in vault creds

Author: skyflow-bharti

src/utils/validations/index.ts

@@ -169,7 +169,7 @@ export const validateCredentialsWithId = (credentials: Credentials, type: string
         if (pathCred.roles !== undefined && !Array.isArray(pathCred.roles)) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_ROLES_KEY_TYPE, [type, typeId, id]);
         }
-        if (pathCred.context !== undefined && typeof pathCred.context !== 'string') {
+        if (pathCred.context !== undefined && (typeof pathCred.context !== 'string' && typeof pathCred.context !== 'object')) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_CONTEXT, [type, typeId, id]);
         }
     }
@@ -184,7 +184,7 @@ export const validateCredentialsWithId = (credentials: Credentials, type: string
         if (stringCred.roles !== undefined && !Array.isArray(stringCred.roles)) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_ROLES_KEY_TYPE, [type, typeId, id]);
         }
-        if (stringCred.context !== undefined && typeof stringCred.context !== 'string') {
+        if (stringCred.context !== undefined && (typeof stringCred.context !== 'string' && typeof stringCred.context !== 'object')) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_CONTEXT, [type, typeId, id]);
         }
     }
@@ -295,7 +295,7 @@ export const validateSkyflowCredentials = (credentials: Credentials, logLevel: L
         if (pathCred.roles !== undefined && !Array.isArray(pathCred.roles)) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_ROLES_KEY_TYPE);
         }
-        if (pathCred.context !== undefined && typeof pathCred.context !== 'string') {
+        if (pathCred.context !== undefined && (typeof pathCred.context !== 'string' && typeof pathCred.context !== 'object')) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_CONTEXT);
         }
     }
@@ -310,7 +310,8 @@ export const validateSkyflowCredentials = (credentials: Credentials, logLevel: L
         if (stringCred.roles !== undefined && !Array.isArray(stringCred.roles)) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_ROLES_KEY_TYPE);
         }
-        if (stringCred.context !== undefined && typeof stringCred.context !== 'string') {
+        // validate both string | Record<string, any>
+        if (stringCred.context !== undefined && (typeof stringCred.context !== 'string' && typeof stringCred.context !== 'object')) {
             throw new SkyflowError(SKYFLOW_ERROR_CODE.INVALID_CONTEXT);
         }
     }

src/vault/config/credentials/index.ts

@@ -11,13 +11,13 @@ export interface TokenCredentials {
 export interface PathCredentials {
   path: string;
   roles?: Array<string>;
-  context?: string;
+  context?: string | Record<string, any>;
 }
 
 export interface StringCredentials {
   credentialsString: string;
   roles?: Array<string>;
-  context?: string;
+  context?: string | Record<string, any>
 }
 
 export interface ApiKeyCredentials {

test/utils/validations.test.js

@@ -691,6 +691,15 @@ describe('validateSkyflowCredentials', () => {
       jest.spyOn(require('fs'), 'existsSync').mockReturnValue(true);
       expect(() => validateSkyflowCredentials(credentials)).toThrow(SKYFLOW_ERROR_CODE.INVALID_CONTEXT);
     });
+    // validate string | Record<string, any>;
+    test('should accept valid context as object', () => {
+      const credentials = {
+        path: '/valid/path',
+        context: { env: 'production' } // valid object
+      };
+      jest.spyOn(require('fs'), 'existsSync').mockReturnValue(true);
+      expect(() => validateSkyflowCredentials(credentials)).not.toThrow();
+    });
   });
 
   // Test StringCredentials validation
@@ -3930,6 +3939,7 @@ describe('validateCredentialsWithId', () => {
       };
       expect(() => validateCredentialsWithId(credentials, type, typeId, id)).not.toThrow();
     });
+    // validate 
   });
 
   // Test TokenCredentials validation