@optimizely-opal/opal-tool-ocp-sdk 0.0.0-OCP-1487.6 → 0.0.0-OCP-1487.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/AuthUtils.d.ts +4 -4
- package/dist/auth/AuthUtils.d.ts.map +1 -1
- package/dist/auth/AuthUtils.js +6 -6
- package/dist/auth/AuthUtils.js.map +1 -1
- package/dist/auth/AuthUtils.test.js +39 -39
- package/dist/auth/AuthUtils.test.js.map +1 -1
- package/dist/function/GlobalToolFunction.js +1 -1
- package/dist/function/GlobalToolFunction.js.map +1 -1
- package/dist/function/ToolFunction.js +1 -1
- package/dist/function/ToolFunction.js.map +1 -1
- package/package.json +1 -1
- package/src/auth/AuthUtils.test.ts +40 -40
- package/src/auth/AuthUtils.ts +4 -4
- package/src/function/GlobalToolFunction.ts +2 -2
- package/src/function/ToolFunction.ts +2 -2
package/dist/auth/AuthUtils.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Authenticate a request for regular functions (with organization validation)
|
|
3
3
|
*
|
|
4
4
|
* @param request - The incoming request
|
|
5
5
|
* @returns true if authentication and authorization succeed
|
|
6
6
|
*/
|
|
7
|
-
export declare function
|
|
7
|
+
export declare function authenticateRegularRequest(request: any): Promise<boolean>;
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
9
|
+
* Authenticate a request for global functions (without organization validation)
|
|
10
10
|
*
|
|
11
11
|
* @param request - The incoming request
|
|
12
12
|
* @returns true if authentication succeeds
|
|
13
13
|
*/
|
|
14
|
-
export declare function
|
|
14
|
+
export declare function authenticateGlobalRequest(request: any): Promise<boolean>;
|
|
15
15
|
//# sourceMappingURL=AuthUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthUtils.d.ts","sourceRoot":"","sources":["../../src/auth/AuthUtils.ts"],"names":[],"mappings":"AAkGA;;;;;GAKG;AACH,wBAAsB,
|
|
1
|
+
{"version":3,"file":"AuthUtils.d.ts","sourceRoot":"","sources":["../../src/auth/AuthUtils.ts"],"names":[],"mappings":"AAkGA;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/E;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAE9E"}
|
package/dist/auth/AuthUtils.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
3
|
+
exports.authenticateRegularRequest = authenticateRegularRequest;
|
|
4
|
+
exports.authenticateGlobalRequest = authenticateGlobalRequest;
|
|
5
5
|
const app_sdk_1 = require("@zaiusinc/app-sdk");
|
|
6
6
|
const TokenVerifier_1 = require("./TokenVerifier");
|
|
7
7
|
/**
|
|
@@ -88,21 +88,21 @@ async function authenticateRequest(request, validateOrg = false) {
|
|
|
88
88
|
return await validateAccessToken(accessToken);
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
91
|
-
*
|
|
91
|
+
* Authenticate a request for regular functions (with organization validation)
|
|
92
92
|
*
|
|
93
93
|
* @param request - The incoming request
|
|
94
94
|
* @returns true if authentication and authorization succeed
|
|
95
95
|
*/
|
|
96
|
-
async function
|
|
96
|
+
async function authenticateRegularRequest(request) {
|
|
97
97
|
return await authenticateRequest(request, true);
|
|
98
98
|
}
|
|
99
99
|
/**
|
|
100
|
-
*
|
|
100
|
+
* Authenticate a request for global functions (without organization validation)
|
|
101
101
|
*
|
|
102
102
|
* @param request - The incoming request
|
|
103
103
|
* @returns true if authentication succeeds
|
|
104
104
|
*/
|
|
105
|
-
async function
|
|
105
|
+
async function authenticateGlobalRequest(request) {
|
|
106
106
|
return await authenticateRequest(request, false);
|
|
107
107
|
}
|
|
108
108
|
//# sourceMappingURL=AuthUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthUtils.js","sourceRoot":"","sources":["../../src/auth/AuthUtils.ts"],"names":[],"mappings":";;AAwGA,
|
|
1
|
+
{"version":3,"file":"AuthUtils.js","sourceRoot":"","sources":["../../src/auth/AuthUtils.ts"],"names":[],"mappings":";;AAwGA,gEAEC;AAQD,8DAEC;AApHD,+CAA0D;AAC1D,mDAAmD;AAGnD;;;;;GAKG;AACH,KAAK,UAAU,mBAAmB,CAAC,WAA+B;IAChE,IAAI,CAAC;QACH,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAgB,GAAE,CAAC;QAC/C,OAAO,MAAM,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gBAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CAAC,OAAY;IACnC,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,EAAE,IAAsB,CAAC;IAC3D,MAAM,WAAW,GAAG,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC;IACxD,IAAI,CAAC,WAAW,IAAI,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,QAAQ,EAAE,CAAC;QACnE,gBAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;AACnC,CAAC;AAED;;;;;GAKG;AACH,SAAS,sBAAsB,CAAC,UAA8B;IAC5D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,gBAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAA,uBAAa,GAAE,EAAE,OAAO,EAAE,cAAc,CAAC;IACnE,IAAI,UAAU,KAAK,iBAAiB,EAAE,CAAC;QACrC,gBAAM,CAAC,KAAK,CAAC,qCAAqC,iBAAiB,cAAc,UAAU,EAAE,CAAC,CAAC;QAC/F,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,OAAY;IAClC,OAAO,OAAO,CAAC,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;AACpE,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,mBAAmB,CAAC,OAAY,EAAE,cAAuB,KAAK;IAC3E,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;IAE3C,uCAAuC;IACvC,IAAI,WAAW,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,0BAA0B,CAAC,OAAY;IAC3D,OAAO,MAAM,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,yBAAyB,CAAC,OAAY;IAC1D,OAAO,MAAM,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -37,7 +37,7 @@ describe('AuthUtils', () => {
|
|
|
37
37
|
}
|
|
38
38
|
});
|
|
39
39
|
});
|
|
40
|
-
describe('
|
|
40
|
+
describe('authenticateRegularRequest', () => {
|
|
41
41
|
beforeEach(() => {
|
|
42
42
|
// Default to successful token verification
|
|
43
43
|
mockTokenVerifier.verify.mockResolvedValue(true);
|
|
@@ -45,7 +45,7 @@ describe('AuthUtils', () => {
|
|
|
45
45
|
describe('when request is for discovery endpoint', () => {
|
|
46
46
|
it('should return true without authentication', async () => {
|
|
47
47
|
const request = { path: '/discovery' };
|
|
48
|
-
const result = await (0, AuthUtils_1.
|
|
48
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
49
49
|
expect(result).toBe(true);
|
|
50
50
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
51
51
|
expect(mockTokenVerifier.verify).not.toHaveBeenCalled();
|
|
@@ -54,7 +54,7 @@ describe('AuthUtils', () => {
|
|
|
54
54
|
describe('when request is for ready endpoint', () => {
|
|
55
55
|
it('should return true without authentication', async () => {
|
|
56
56
|
const request = { path: '/ready' };
|
|
57
|
-
const result = await (0, AuthUtils_1.
|
|
57
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
58
58
|
expect(result).toBe(true);
|
|
59
59
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
60
60
|
expect(mockTokenVerifier.verify).not.toHaveBeenCalled();
|
|
@@ -74,7 +74,7 @@ describe('AuthUtils', () => {
|
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
};
|
|
77
|
-
const result = await (0, AuthUtils_1.
|
|
77
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
78
78
|
expect(result).toBe(true);
|
|
79
79
|
expect(mockGetTokenVerifier).toHaveBeenCalled();
|
|
80
80
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -92,7 +92,7 @@ describe('AuthUtils', () => {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
};
|
|
95
|
-
const result = await (0, AuthUtils_1.
|
|
95
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
96
96
|
expect(result).toBe(true);
|
|
97
97
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
98
98
|
});
|
|
@@ -109,7 +109,7 @@ describe('AuthUtils', () => {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
};
|
|
112
|
-
const result = await (0, AuthUtils_1.
|
|
112
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
113
113
|
expect(result).toBe(true);
|
|
114
114
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
115
115
|
});
|
|
@@ -120,7 +120,7 @@ describe('AuthUtils', () => {
|
|
|
120
120
|
path: '/some-tool',
|
|
121
121
|
bodyJSON: {}
|
|
122
122
|
};
|
|
123
|
-
const result = await (0, AuthUtils_1.
|
|
123
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
124
124
|
expect(result).toBe(false);
|
|
125
125
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
126
126
|
expect(mockTokenVerifier.verify).not.toHaveBeenCalled();
|
|
@@ -129,7 +129,7 @@ describe('AuthUtils', () => {
|
|
|
129
129
|
const request = {
|
|
130
130
|
path: '/some-tool'
|
|
131
131
|
};
|
|
132
|
-
const result = await (0, AuthUtils_1.
|
|
132
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
133
133
|
expect(result).toBe(false);
|
|
134
134
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
135
135
|
});
|
|
@@ -146,7 +146,7 @@ describe('AuthUtils', () => {
|
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
148
|
};
|
|
149
|
-
const result = await (0, AuthUtils_1.
|
|
149
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
150
150
|
expect(result).toBe(false);
|
|
151
151
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
152
152
|
});
|
|
@@ -163,7 +163,7 @@ describe('AuthUtils', () => {
|
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
165
|
};
|
|
166
|
-
const result = await (0, AuthUtils_1.
|
|
166
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
167
167
|
expect(result).toBe(false);
|
|
168
168
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
169
169
|
});
|
|
@@ -180,7 +180,7 @@ describe('AuthUtils', () => {
|
|
|
180
180
|
}
|
|
181
181
|
}
|
|
182
182
|
};
|
|
183
|
-
const result = await (0, AuthUtils_1.
|
|
183
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
184
184
|
expect(result).toBe(false);
|
|
185
185
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
186
186
|
});
|
|
@@ -197,7 +197,7 @@ describe('AuthUtils', () => {
|
|
|
197
197
|
}
|
|
198
198
|
}
|
|
199
199
|
};
|
|
200
|
-
const result = await (0, AuthUtils_1.
|
|
200
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
201
201
|
expect(result).toBe(false);
|
|
202
202
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
203
203
|
});
|
|
@@ -216,7 +216,7 @@ describe('AuthUtils', () => {
|
|
|
216
216
|
}
|
|
217
217
|
}
|
|
218
218
|
};
|
|
219
|
-
const result = await (0, AuthUtils_1.
|
|
219
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
220
220
|
expect(result).toBe(false);
|
|
221
221
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('Invalid organisation ID: expected test-org-123, received different-org-456');
|
|
222
222
|
expect(mockTokenVerifier.verify).not.toHaveBeenCalled();
|
|
@@ -234,7 +234,7 @@ describe('AuthUtils', () => {
|
|
|
234
234
|
}
|
|
235
235
|
}
|
|
236
236
|
};
|
|
237
|
-
const result = await (0, AuthUtils_1.
|
|
237
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
238
238
|
expect(result).toBe(false);
|
|
239
239
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('Organisation ID is required but not provided');
|
|
240
240
|
});
|
|
@@ -251,7 +251,7 @@ describe('AuthUtils', () => {
|
|
|
251
251
|
}
|
|
252
252
|
}
|
|
253
253
|
};
|
|
254
|
-
const result = await (0, AuthUtils_1.
|
|
254
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
255
255
|
expect(result).toBe(false);
|
|
256
256
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('Organisation ID is required but not provided');
|
|
257
257
|
});
|
|
@@ -269,7 +269,7 @@ describe('AuthUtils', () => {
|
|
|
269
269
|
}
|
|
270
270
|
}
|
|
271
271
|
};
|
|
272
|
-
const result = await (0, AuthUtils_1.
|
|
272
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
273
273
|
expect(result).toBe(false);
|
|
274
274
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('Invalid organisation ID: expected undefined, received some-org-123');
|
|
275
275
|
});
|
|
@@ -287,7 +287,7 @@ describe('AuthUtils', () => {
|
|
|
287
287
|
}
|
|
288
288
|
}
|
|
289
289
|
};
|
|
290
|
-
const result = await (0, AuthUtils_1.
|
|
290
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
291
291
|
expect(result).toBe(false);
|
|
292
292
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('Invalid organisation ID: expected undefined, received some-org-123');
|
|
293
293
|
});
|
|
@@ -307,7 +307,7 @@ describe('AuthUtils', () => {
|
|
|
307
307
|
}
|
|
308
308
|
}
|
|
309
309
|
};
|
|
310
|
-
const result = await (0, AuthUtils_1.
|
|
310
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
311
311
|
expect(result).toBe(false);
|
|
312
312
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('invalid-token');
|
|
313
313
|
});
|
|
@@ -326,7 +326,7 @@ describe('AuthUtils', () => {
|
|
|
326
326
|
}
|
|
327
327
|
}
|
|
328
328
|
};
|
|
329
|
-
const result = await (0, AuthUtils_1.
|
|
329
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
330
330
|
expect(result).toBe(false);
|
|
331
331
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verificationError);
|
|
332
332
|
});
|
|
@@ -345,13 +345,13 @@ describe('AuthUtils', () => {
|
|
|
345
345
|
}
|
|
346
346
|
}
|
|
347
347
|
};
|
|
348
|
-
const result = await (0, AuthUtils_1.
|
|
348
|
+
const result = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
349
349
|
expect(result).toBe(false);
|
|
350
350
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verifierError);
|
|
351
351
|
});
|
|
352
352
|
});
|
|
353
353
|
});
|
|
354
|
-
describe('
|
|
354
|
+
describe('authenticateGlobalRequest', () => {
|
|
355
355
|
beforeEach(() => {
|
|
356
356
|
// Default to successful token verification
|
|
357
357
|
mockTokenVerifier.verify.mockResolvedValue(true);
|
|
@@ -359,7 +359,7 @@ describe('AuthUtils', () => {
|
|
|
359
359
|
describe('when request is for discovery endpoint', () => {
|
|
360
360
|
it('should return true without authentication', async () => {
|
|
361
361
|
const request = { path: '/discovery' };
|
|
362
|
-
const result = await (0, AuthUtils_1.
|
|
362
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
363
363
|
expect(result).toBe(true);
|
|
364
364
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
365
365
|
expect(mockTokenVerifier.verify).not.toHaveBeenCalled();
|
|
@@ -368,7 +368,7 @@ describe('AuthUtils', () => {
|
|
|
368
368
|
describe('when request is for ready endpoint', () => {
|
|
369
369
|
it('should return true without authentication', async () => {
|
|
370
370
|
const request = { path: '/ready' };
|
|
371
|
-
const result = await (0, AuthUtils_1.
|
|
371
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
372
372
|
expect(result).toBe(true);
|
|
373
373
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
374
374
|
expect(mockTokenVerifier.verify).not.toHaveBeenCalled();
|
|
@@ -388,7 +388,7 @@ describe('AuthUtils', () => {
|
|
|
388
388
|
}
|
|
389
389
|
}
|
|
390
390
|
};
|
|
391
|
-
const result = await (0, AuthUtils_1.
|
|
391
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
392
392
|
expect(result).toBe(true);
|
|
393
393
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
394
394
|
// Should not log organization validation errors for global requests
|
|
@@ -407,7 +407,7 @@ describe('AuthUtils', () => {
|
|
|
407
407
|
}
|
|
408
408
|
}
|
|
409
409
|
};
|
|
410
|
-
const result = await (0, AuthUtils_1.
|
|
410
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
411
411
|
expect(result).toBe(true);
|
|
412
412
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
413
413
|
});
|
|
@@ -424,7 +424,7 @@ describe('AuthUtils', () => {
|
|
|
424
424
|
}
|
|
425
425
|
}
|
|
426
426
|
};
|
|
427
|
-
const result = await (0, AuthUtils_1.
|
|
427
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
428
428
|
expect(result).toBe(true);
|
|
429
429
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
430
430
|
});
|
|
@@ -435,7 +435,7 @@ describe('AuthUtils', () => {
|
|
|
435
435
|
path: '/global-tool',
|
|
436
436
|
bodyJSON: {}
|
|
437
437
|
};
|
|
438
|
-
const result = await (0, AuthUtils_1.
|
|
438
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
439
439
|
expect(result).toBe(false);
|
|
440
440
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
441
441
|
});
|
|
@@ -452,7 +452,7 @@ describe('AuthUtils', () => {
|
|
|
452
452
|
}
|
|
453
453
|
}
|
|
454
454
|
};
|
|
455
|
-
const result = await (0, AuthUtils_1.
|
|
455
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
456
456
|
expect(result).toBe(false);
|
|
457
457
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
458
458
|
});
|
|
@@ -469,7 +469,7 @@ describe('AuthUtils', () => {
|
|
|
469
469
|
}
|
|
470
470
|
}
|
|
471
471
|
};
|
|
472
|
-
const result = await (0, AuthUtils_1.
|
|
472
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
473
473
|
expect(result).toBe(false);
|
|
474
474
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
475
475
|
});
|
|
@@ -486,7 +486,7 @@ describe('AuthUtils', () => {
|
|
|
486
486
|
}
|
|
487
487
|
}
|
|
488
488
|
};
|
|
489
|
-
const result = await (0, AuthUtils_1.
|
|
489
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
490
490
|
expect(result).toBe(false);
|
|
491
491
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
492
492
|
});
|
|
@@ -506,7 +506,7 @@ describe('AuthUtils', () => {
|
|
|
506
506
|
}
|
|
507
507
|
}
|
|
508
508
|
};
|
|
509
|
-
const result = await (0, AuthUtils_1.
|
|
509
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
510
510
|
expect(result).toBe(false);
|
|
511
511
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('invalid-token');
|
|
512
512
|
});
|
|
@@ -525,12 +525,12 @@ describe('AuthUtils', () => {
|
|
|
525
525
|
}
|
|
526
526
|
}
|
|
527
527
|
};
|
|
528
|
-
const result = await (0, AuthUtils_1.
|
|
528
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
529
529
|
expect(result).toBe(false);
|
|
530
530
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verificationError);
|
|
531
531
|
});
|
|
532
532
|
});
|
|
533
|
-
describe('organization validation differences from
|
|
533
|
+
describe('organization validation differences from authenticateRegularRequest', () => {
|
|
534
534
|
it('should NOT validate organization ID and allow any customer_id', async () => {
|
|
535
535
|
const request = {
|
|
536
536
|
path: '/global-tool',
|
|
@@ -544,7 +544,7 @@ describe('AuthUtils', () => {
|
|
|
544
544
|
}
|
|
545
545
|
}
|
|
546
546
|
};
|
|
547
|
-
const result = await (0, AuthUtils_1.
|
|
547
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
548
548
|
expect(result).toBe(true);
|
|
549
549
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
550
550
|
// Should NOT log organization validation errors
|
|
@@ -565,7 +565,7 @@ describe('AuthUtils', () => {
|
|
|
565
565
|
}
|
|
566
566
|
}
|
|
567
567
|
};
|
|
568
|
-
const result = await (0, AuthUtils_1.
|
|
568
|
+
const result = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
569
569
|
expect(result).toBe(true);
|
|
570
570
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
571
571
|
});
|
|
@@ -577,8 +577,8 @@ describe('AuthUtils', () => {
|
|
|
577
577
|
path: '/some-tool',
|
|
578
578
|
bodyJSON: null
|
|
579
579
|
};
|
|
580
|
-
const result1 = await (0, AuthUtils_1.
|
|
581
|
-
const result2 = await (0, AuthUtils_1.
|
|
580
|
+
const result1 = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
581
|
+
const result2 = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
582
582
|
expect(result1).toBe(false);
|
|
583
583
|
expect(result2).toBe(false);
|
|
584
584
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -590,8 +590,8 @@ describe('AuthUtils', () => {
|
|
|
590
590
|
auth: 'invalid-auth-format'
|
|
591
591
|
}
|
|
592
592
|
};
|
|
593
|
-
const result1 = await (0, AuthUtils_1.
|
|
594
|
-
const result2 = await (0, AuthUtils_1.
|
|
593
|
+
const result1 = await (0, AuthUtils_1.authenticateRegularRequest)(request);
|
|
594
|
+
const result2 = await (0, AuthUtils_1.authenticateGlobalRequest)(request);
|
|
595
595
|
expect(result1).toBe(false);
|
|
596
596
|
expect(result2).toBe(false);
|
|
597
597
|
expect(app_sdk_1.logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthUtils.test.js","sourceRoot":"","sources":["../../src/auth/AuthUtils.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AuthUtils.test.js","sourceRoot":"","sources":["../../src/auth/AuthUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ class GlobalToolFunction extends app_sdk_1.GlobalFunction {
|
|
|
40
40
|
* @returns true if authentication succeeds
|
|
41
41
|
*/
|
|
42
42
|
async authorizeRequest() {
|
|
43
|
-
return await (0, AuthUtils_1.
|
|
43
|
+
return await (0, AuthUtils_1.authenticateGlobalRequest)(this.request);
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
exports.GlobalToolFunction = GlobalToolFunction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlobalToolFunction.js","sourceRoot":"","sources":["../../src/function/GlobalToolFunction.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"GlobalToolFunction.js","sourceRoot":"","sources":["../../src/function/GlobalToolFunction.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,iDAA8D;AAC9D,gDAAkD;AAElD;;;GAGG;AACH,MAAsB,kBAAmB,SAAQ,wBAAc;IAE7D;;;;;OAKG;IACO,KAAK;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,OAAO;QAClB,IAAA,yBAAe,EAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEtF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnC,OAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,sBAAY,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,gBAAgB;QAC5B,OAAO,MAAM,IAAA,qCAAyB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;CACF;AAxCD,gDAwCC"}
|
|
@@ -41,7 +41,7 @@ class ToolFunction extends app_sdk_1.Function {
|
|
|
41
41
|
* @returns true if authentication succeeds
|
|
42
42
|
*/
|
|
43
43
|
async authorizeRequest() {
|
|
44
|
-
return await (0, AuthUtils_1.
|
|
44
|
+
return await (0, AuthUtils_1.authenticateRegularRequest)(this.request);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
exports.ToolFunction = ToolFunction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolFunction.js","sourceRoot":"","sources":["../../src/function/ToolFunction.ts"],"names":[],"mappings":";;;AAAA,+CAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"ToolFunction.js","sourceRoot":"","sources":["../../src/function/ToolFunction.ts"],"names":[],"mappings":";;;AAAA,+CAAwE;AACxE,iDAA+D;AAC/D,gDAAkD;AAElD;;;GAGG;AACH,MAAsB,YAAa,SAAQ,kBAAQ;IAEjD;;;;;OAKG;IACO,KAAK;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,OAAO;QAClB,IAAA,yBAAe,EAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACtF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnC,OAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,4EAA4E;QAC5E,OAAO,sBAAY,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,gBAAgB;QAC5B,OAAO,MAAM,IAAA,sCAA0B,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;CACF;AAvCD,oCAuCC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
2
2
|
import { getAppContext, logger } from '@zaiusinc/app-sdk';
|
|
3
3
|
import { getTokenVerifier } from './TokenVerifier';
|
|
4
|
-
import {
|
|
4
|
+
import { authenticateRegularRequest, authenticateGlobalRequest } from './AuthUtils';
|
|
5
5
|
|
|
6
6
|
// Mock the dependencies
|
|
7
7
|
jest.mock('./TokenVerifier', () => ({
|
|
@@ -43,7 +43,7 @@ describe('AuthUtils', () => {
|
|
|
43
43
|
} as any);
|
|
44
44
|
});
|
|
45
45
|
|
|
46
|
-
describe('
|
|
46
|
+
describe('authenticateRegularRequest', () => {
|
|
47
47
|
beforeEach(() => {
|
|
48
48
|
// Default to successful token verification
|
|
49
49
|
mockTokenVerifier.verify.mockResolvedValue(true);
|
|
@@ -53,7 +53,7 @@ describe('AuthUtils', () => {
|
|
|
53
53
|
it('should return true without authentication', async () => {
|
|
54
54
|
const request = { path: '/discovery' };
|
|
55
55
|
|
|
56
|
-
const result = await
|
|
56
|
+
const result = await authenticateRegularRequest(request);
|
|
57
57
|
|
|
58
58
|
expect(result).toBe(true);
|
|
59
59
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
@@ -65,7 +65,7 @@ describe('AuthUtils', () => {
|
|
|
65
65
|
it('should return true without authentication', async () => {
|
|
66
66
|
const request = { path: '/ready' };
|
|
67
67
|
|
|
68
|
-
const result = await
|
|
68
|
+
const result = await authenticateRegularRequest(request);
|
|
69
69
|
|
|
70
70
|
expect(result).toBe(true);
|
|
71
71
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
@@ -88,7 +88,7 @@ describe('AuthUtils', () => {
|
|
|
88
88
|
}
|
|
89
89
|
};
|
|
90
90
|
|
|
91
|
-
const result = await
|
|
91
|
+
const result = await authenticateRegularRequest(request);
|
|
92
92
|
|
|
93
93
|
expect(result).toBe(true);
|
|
94
94
|
expect(mockGetTokenVerifier).toHaveBeenCalled();
|
|
@@ -109,7 +109,7 @@ describe('AuthUtils', () => {
|
|
|
109
109
|
}
|
|
110
110
|
};
|
|
111
111
|
|
|
112
|
-
const result = await
|
|
112
|
+
const result = await authenticateRegularRequest(request);
|
|
113
113
|
|
|
114
114
|
expect(result).toBe(true);
|
|
115
115
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -129,7 +129,7 @@ describe('AuthUtils', () => {
|
|
|
129
129
|
}
|
|
130
130
|
};
|
|
131
131
|
|
|
132
|
-
const result = await
|
|
132
|
+
const result = await authenticateRegularRequest(request);
|
|
133
133
|
|
|
134
134
|
expect(result).toBe(true);
|
|
135
135
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -143,7 +143,7 @@ describe('AuthUtils', () => {
|
|
|
143
143
|
bodyJSON: {}
|
|
144
144
|
};
|
|
145
145
|
|
|
146
|
-
const result = await
|
|
146
|
+
const result = await authenticateRegularRequest(request);
|
|
147
147
|
|
|
148
148
|
expect(result).toBe(false);
|
|
149
149
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -155,7 +155,7 @@ describe('AuthUtils', () => {
|
|
|
155
155
|
path: '/some-tool'
|
|
156
156
|
};
|
|
157
157
|
|
|
158
|
-
const result = await
|
|
158
|
+
const result = await authenticateRegularRequest(request);
|
|
159
159
|
|
|
160
160
|
expect(result).toBe(false);
|
|
161
161
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -175,7 +175,7 @@ describe('AuthUtils', () => {
|
|
|
175
175
|
}
|
|
176
176
|
};
|
|
177
177
|
|
|
178
|
-
const result = await
|
|
178
|
+
const result = await authenticateRegularRequest(request);
|
|
179
179
|
|
|
180
180
|
expect(result).toBe(false);
|
|
181
181
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -195,7 +195,7 @@ describe('AuthUtils', () => {
|
|
|
195
195
|
}
|
|
196
196
|
};
|
|
197
197
|
|
|
198
|
-
const result = await
|
|
198
|
+
const result = await authenticateRegularRequest(request);
|
|
199
199
|
|
|
200
200
|
expect(result).toBe(false);
|
|
201
201
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -215,7 +215,7 @@ describe('AuthUtils', () => {
|
|
|
215
215
|
}
|
|
216
216
|
};
|
|
217
217
|
|
|
218
|
-
const result = await
|
|
218
|
+
const result = await authenticateRegularRequest(request);
|
|
219
219
|
|
|
220
220
|
expect(result).toBe(false);
|
|
221
221
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -235,7 +235,7 @@ describe('AuthUtils', () => {
|
|
|
235
235
|
}
|
|
236
236
|
};
|
|
237
237
|
|
|
238
|
-
const result = await
|
|
238
|
+
const result = await authenticateRegularRequest(request);
|
|
239
239
|
|
|
240
240
|
expect(result).toBe(false);
|
|
241
241
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -257,7 +257,7 @@ describe('AuthUtils', () => {
|
|
|
257
257
|
}
|
|
258
258
|
};
|
|
259
259
|
|
|
260
|
-
const result = await
|
|
260
|
+
const result = await authenticateRegularRequest(request);
|
|
261
261
|
|
|
262
262
|
expect(result).toBe(false);
|
|
263
263
|
expect(logger.error).toHaveBeenCalledWith(
|
|
@@ -280,7 +280,7 @@ describe('AuthUtils', () => {
|
|
|
280
280
|
}
|
|
281
281
|
};
|
|
282
282
|
|
|
283
|
-
const result = await
|
|
283
|
+
const result = await authenticateRegularRequest(request);
|
|
284
284
|
|
|
285
285
|
expect(result).toBe(false);
|
|
286
286
|
expect(logger.error).toHaveBeenCalledWith('Organisation ID is required but not provided');
|
|
@@ -300,7 +300,7 @@ describe('AuthUtils', () => {
|
|
|
300
300
|
}
|
|
301
301
|
};
|
|
302
302
|
|
|
303
|
-
const result = await
|
|
303
|
+
const result = await authenticateRegularRequest(request);
|
|
304
304
|
|
|
305
305
|
expect(result).toBe(false);
|
|
306
306
|
expect(logger.error).toHaveBeenCalledWith('Organisation ID is required but not provided');
|
|
@@ -322,7 +322,7 @@ describe('AuthUtils', () => {
|
|
|
322
322
|
}
|
|
323
323
|
};
|
|
324
324
|
|
|
325
|
-
const result = await
|
|
325
|
+
const result = await authenticateRegularRequest(request);
|
|
326
326
|
|
|
327
327
|
expect(result).toBe(false);
|
|
328
328
|
expect(logger.error).toHaveBeenCalledWith(
|
|
@@ -346,7 +346,7 @@ describe('AuthUtils', () => {
|
|
|
346
346
|
}
|
|
347
347
|
};
|
|
348
348
|
|
|
349
|
-
const result = await
|
|
349
|
+
const result = await authenticateRegularRequest(request);
|
|
350
350
|
|
|
351
351
|
expect(result).toBe(false);
|
|
352
352
|
expect(logger.error).toHaveBeenCalledWith(
|
|
@@ -372,7 +372,7 @@ describe('AuthUtils', () => {
|
|
|
372
372
|
}
|
|
373
373
|
};
|
|
374
374
|
|
|
375
|
-
const result = await
|
|
375
|
+
const result = await authenticateRegularRequest(request);
|
|
376
376
|
|
|
377
377
|
expect(result).toBe(false);
|
|
378
378
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('invalid-token');
|
|
@@ -395,7 +395,7 @@ describe('AuthUtils', () => {
|
|
|
395
395
|
}
|
|
396
396
|
};
|
|
397
397
|
|
|
398
|
-
const result = await
|
|
398
|
+
const result = await authenticateRegularRequest(request);
|
|
399
399
|
|
|
400
400
|
expect(result).toBe(false);
|
|
401
401
|
expect(logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verificationError);
|
|
@@ -418,7 +418,7 @@ describe('AuthUtils', () => {
|
|
|
418
418
|
}
|
|
419
419
|
};
|
|
420
420
|
|
|
421
|
-
const result = await
|
|
421
|
+
const result = await authenticateRegularRequest(request);
|
|
422
422
|
|
|
423
423
|
expect(result).toBe(false);
|
|
424
424
|
expect(logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verifierError);
|
|
@@ -426,7 +426,7 @@ describe('AuthUtils', () => {
|
|
|
426
426
|
});
|
|
427
427
|
});
|
|
428
428
|
|
|
429
|
-
describe('
|
|
429
|
+
describe('authenticateGlobalRequest', () => {
|
|
430
430
|
beforeEach(() => {
|
|
431
431
|
// Default to successful token verification
|
|
432
432
|
mockTokenVerifier.verify.mockResolvedValue(true);
|
|
@@ -436,7 +436,7 @@ describe('AuthUtils', () => {
|
|
|
436
436
|
it('should return true without authentication', async () => {
|
|
437
437
|
const request = { path: '/discovery' };
|
|
438
438
|
|
|
439
|
-
const result = await
|
|
439
|
+
const result = await authenticateGlobalRequest(request);
|
|
440
440
|
|
|
441
441
|
expect(result).toBe(true);
|
|
442
442
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
@@ -448,7 +448,7 @@ describe('AuthUtils', () => {
|
|
|
448
448
|
it('should return true without authentication', async () => {
|
|
449
449
|
const request = { path: '/ready' };
|
|
450
450
|
|
|
451
|
-
const result = await
|
|
451
|
+
const result = await authenticateGlobalRequest(request);
|
|
452
452
|
|
|
453
453
|
expect(result).toBe(true);
|
|
454
454
|
expect(mockGetTokenVerifier).not.toHaveBeenCalled();
|
|
@@ -471,7 +471,7 @@ describe('AuthUtils', () => {
|
|
|
471
471
|
}
|
|
472
472
|
};
|
|
473
473
|
|
|
474
|
-
const result = await
|
|
474
|
+
const result = await authenticateGlobalRequest(request);
|
|
475
475
|
|
|
476
476
|
expect(result).toBe(true);
|
|
477
477
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -495,7 +495,7 @@ describe('AuthUtils', () => {
|
|
|
495
495
|
}
|
|
496
496
|
};
|
|
497
497
|
|
|
498
|
-
const result = await
|
|
498
|
+
const result = await authenticateGlobalRequest(request);
|
|
499
499
|
|
|
500
500
|
expect(result).toBe(true);
|
|
501
501
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -515,7 +515,7 @@ describe('AuthUtils', () => {
|
|
|
515
515
|
}
|
|
516
516
|
};
|
|
517
517
|
|
|
518
|
-
const result = await
|
|
518
|
+
const result = await authenticateGlobalRequest(request);
|
|
519
519
|
|
|
520
520
|
expect(result).toBe(true);
|
|
521
521
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -529,7 +529,7 @@ describe('AuthUtils', () => {
|
|
|
529
529
|
bodyJSON: {}
|
|
530
530
|
};
|
|
531
531
|
|
|
532
|
-
const result = await
|
|
532
|
+
const result = await authenticateGlobalRequest(request);
|
|
533
533
|
|
|
534
534
|
expect(result).toBe(false);
|
|
535
535
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -549,7 +549,7 @@ describe('AuthUtils', () => {
|
|
|
549
549
|
}
|
|
550
550
|
};
|
|
551
551
|
|
|
552
|
-
const result = await
|
|
552
|
+
const result = await authenticateGlobalRequest(request);
|
|
553
553
|
|
|
554
554
|
expect(result).toBe(false);
|
|
555
555
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -569,7 +569,7 @@ describe('AuthUtils', () => {
|
|
|
569
569
|
}
|
|
570
570
|
};
|
|
571
571
|
|
|
572
|
-
const result = await
|
|
572
|
+
const result = await authenticateGlobalRequest(request);
|
|
573
573
|
|
|
574
574
|
expect(result).toBe(false);
|
|
575
575
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -589,7 +589,7 @@ describe('AuthUtils', () => {
|
|
|
589
589
|
}
|
|
590
590
|
};
|
|
591
591
|
|
|
592
|
-
const result = await
|
|
592
|
+
const result = await authenticateGlobalRequest(request);
|
|
593
593
|
|
|
594
594
|
expect(result).toBe(false);
|
|
595
595
|
expect(logger.error).toHaveBeenCalledWith('OptiID token is required but not provided');
|
|
@@ -613,7 +613,7 @@ describe('AuthUtils', () => {
|
|
|
613
613
|
}
|
|
614
614
|
};
|
|
615
615
|
|
|
616
|
-
const result = await
|
|
616
|
+
const result = await authenticateGlobalRequest(request);
|
|
617
617
|
|
|
618
618
|
expect(result).toBe(false);
|
|
619
619
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('invalid-token');
|
|
@@ -636,14 +636,14 @@ describe('AuthUtils', () => {
|
|
|
636
636
|
}
|
|
637
637
|
};
|
|
638
638
|
|
|
639
|
-
const result = await
|
|
639
|
+
const result = await authenticateGlobalRequest(request);
|
|
640
640
|
|
|
641
641
|
expect(result).toBe(false);
|
|
642
642
|
expect(logger.error).toHaveBeenCalledWith('OptiID token validation failed:', verificationError);
|
|
643
643
|
});
|
|
644
644
|
});
|
|
645
645
|
|
|
646
|
-
describe('organization validation differences from
|
|
646
|
+
describe('organization validation differences from authenticateRegularRequest', () => {
|
|
647
647
|
it('should NOT validate organization ID and allow any customer_id', async () => {
|
|
648
648
|
const request = {
|
|
649
649
|
path: '/global-tool',
|
|
@@ -658,7 +658,7 @@ describe('AuthUtils', () => {
|
|
|
658
658
|
}
|
|
659
659
|
};
|
|
660
660
|
|
|
661
|
-
const result = await
|
|
661
|
+
const result = await authenticateGlobalRequest(request);
|
|
662
662
|
|
|
663
663
|
expect(result).toBe(true);
|
|
664
664
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -687,7 +687,7 @@ describe('AuthUtils', () => {
|
|
|
687
687
|
}
|
|
688
688
|
};
|
|
689
689
|
|
|
690
|
-
const result = await
|
|
690
|
+
const result = await authenticateGlobalRequest(request);
|
|
691
691
|
|
|
692
692
|
expect(result).toBe(true);
|
|
693
693
|
expect(mockTokenVerifier.verify).toHaveBeenCalledWith('valid-token-123');
|
|
@@ -702,8 +702,8 @@ describe('AuthUtils', () => {
|
|
|
702
702
|
bodyJSON: null
|
|
703
703
|
};
|
|
704
704
|
|
|
705
|
-
const result1 = await
|
|
706
|
-
const result2 = await
|
|
705
|
+
const result1 = await authenticateRegularRequest(request);
|
|
706
|
+
const result2 = await authenticateGlobalRequest(request);
|
|
707
707
|
|
|
708
708
|
expect(result1).toBe(false);
|
|
709
709
|
expect(result2).toBe(false);
|
|
@@ -718,8 +718,8 @@ describe('AuthUtils', () => {
|
|
|
718
718
|
}
|
|
719
719
|
};
|
|
720
720
|
|
|
721
|
-
const result1 = await
|
|
722
|
-
const result2 = await
|
|
721
|
+
const result1 = await authenticateRegularRequest(request);
|
|
722
|
+
const result2 = await authenticateGlobalRequest(request);
|
|
723
723
|
|
|
724
724
|
expect(result1).toBe(false);
|
|
725
725
|
expect(result2).toBe(false);
|
package/src/auth/AuthUtils.ts
CHANGED
|
@@ -97,21 +97,21 @@ async function authenticateRequest(request: any, validateOrg: boolean = false):
|
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
/**
|
|
100
|
-
*
|
|
100
|
+
* Authenticate a request for regular functions (with organization validation)
|
|
101
101
|
*
|
|
102
102
|
* @param request - The incoming request
|
|
103
103
|
* @returns true if authentication and authorization succeed
|
|
104
104
|
*/
|
|
105
|
-
export async function
|
|
105
|
+
export async function authenticateRegularRequest(request: any): Promise<boolean> {
|
|
106
106
|
return await authenticateRequest(request, true);
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
/**
|
|
110
|
-
*
|
|
110
|
+
* Authenticate a request for global functions (without organization validation)
|
|
111
111
|
*
|
|
112
112
|
* @param request - The incoming request
|
|
113
113
|
* @returns true if authentication succeeds
|
|
114
114
|
*/
|
|
115
|
-
export async function
|
|
115
|
+
export async function authenticateGlobalRequest(request: any): Promise<boolean> {
|
|
116
116
|
return await authenticateRequest(request, false);
|
|
117
117
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { GlobalFunction, Response, amendLogContext } from '@zaiusinc/app-sdk';
|
|
2
|
-
import {
|
|
2
|
+
import { authenticateGlobalRequest } from '../auth/AuthUtils';
|
|
3
3
|
import { toolsService } from '../service/Service';
|
|
4
4
|
|
|
5
5
|
/**
|
|
@@ -44,6 +44,6 @@ export abstract class GlobalToolFunction extends GlobalFunction {
|
|
|
44
44
|
* @returns true if authentication succeeds
|
|
45
45
|
*/
|
|
46
46
|
private async authorizeRequest(): Promise<boolean> {
|
|
47
|
-
return await
|
|
47
|
+
return await authenticateGlobalRequest(this.request);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Function, Response, amendLogContext } from '@zaiusinc/app-sdk';
|
|
2
|
-
import {
|
|
2
|
+
import { authenticateRegularRequest } from '../auth/AuthUtils';
|
|
3
3
|
import { toolsService } from '../service/Service';
|
|
4
4
|
|
|
5
5
|
/**
|
|
@@ -43,6 +43,6 @@ export abstract class ToolFunction extends Function {
|
|
|
43
43
|
* @returns true if authentication succeeds
|
|
44
44
|
*/
|
|
45
45
|
private async authorizeRequest(): Promise<boolean> {
|
|
46
|
-
return await
|
|
46
|
+
return await authenticateRegularRequest(this.request);
|
|
47
47
|
}
|
|
48
48
|
}
|