Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-10-20 08:39:44 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix unable to fetch web service tokens in app

Browse Source
This commit is contained in:
Samuel Elliott
2025-08-01 21:29:04 +01:00
parent 3bfee7559f
commit 2ddac1619f
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/coral.ts
View File

@@ -919,7 +919,8 @@ class CoralApiRequest<T = unknown> {
const decrypted = request_encryption instanceof ZncaApiNxapi ?
await request_encryption.decryptResponse(data,
this.flags[RequestFlagNxapiZncaApiRequestNsaAssertionSymbol]) :
request_encryption.auth?.has_nsa_assertion_scope &&
this.flags[RequestFlagNxapiZncaApiRequestNsaAssertionSymbol]) :
await request_encryption.decryptResponse(data);
const encryption: ResponseEncryption = {

10
src/api/f.ts
View File

@@ -554,7 +554,7 @@ export class NxapiZncaAuth {
{ id: string; secret: string; } |
{ id: string; } |
null = null;
request_scope = 'ca:gf ca:er ca:dr';
token: TokenData | null = null;
@@ -626,6 +626,13 @@ export class NxapiZncaAuth {
return !!this.token && this.token.expires_at > Date.now();
}
get has_nsa_assertion_scope() {
return this.token?.result.scope ? !!this.token.result.scope.match(/\bca:ns\b/) :
this.client_assertion_provider && !this.client_credentials ?
!!this.client_assertion_provider.scope.match(/\bca:ns\b/) :
this.client_credentials ? !!this.request_scope.match(/\bca:ns\b/) : false;
}
async getAccessToken(): Promise<TokenResponse> {
const resource = this.protected_resource ?? (this.protected_resource = await this.getProtectedResource());
const refresh_token = this.refresh_token;
@@ -658,6 +665,7 @@ export class NxapiZncaAuth {
body.append('client_assertion_type', type);
body.append('client_assertion', assertion);
body.set('scope', this.client_assertion_provider.scope);
} else {
if (resource.resource_metadata.resource_documentation) {
throw new TypeError('Client authentication not configured\n\n' +