paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 40 Packages Projects Releases Wiki Activity

update normalizeScopes signature

Browse Source 
Signed-off-by: Gasan.Guseinov <465806+gusega@users.noreply.github.com>
This commit is contained in:
Gasan.Guseinov
2025-02-11 18:18:15 +01:00
parent 398f4b32ee
commit 75e0c40abb
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core-app-api/report.api.md
+3 -1
View File
@@ -566,8 +566,10 @@ export class OAuth2
getProfile(options?: AuthRequestOptions): Promise<ProfileInfo | undefined>;
// (undocumented)
static normalizeScopes(
scopeTransform: (scopes: string[]) => string[],
scopes?: string | string[],
options?: {
scopeTransform: (scopes: string[]) => string[];
},
): Set<string>;
// (undocumented)
sessionState$(): Observable<SessionState>;
packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
+11 -6
View File
@@ -85,10 +85,9 @@ export default class OAuth2
providerInfo: {
idToken: res.providerInfo.idToken,
accessToken: res.providerInfo.accessToken,
scopes: OAuth2.normalizeScopes(
scopes: OAuth2.normalizeScopes(res.providerInfo.scope, {
scopeTransform,
res.providerInfo.scope,
),
}),
expiresAt: res.providerInfo.expiresInSeconds
? new Date(Date.now() + res.providerInfo.expiresInSeconds * 1000)
: undefined,
@@ -169,7 +168,9 @@ export default class OAuth2
scope?: string | string[],
options?: AuthRequestOptions,
) {
const normalizedScopes = OAuth2.normalizeScopes(this.scopeTransform, scope);
const normalizedScopes = OAuth2.normalizeScopes(scope, {
scopeTransform: this.scopeTransform,
});
const session = await this.sessionManager.getSession({
...options,
scopes: normalizedScopes,
@@ -201,8 +202,8 @@ export default class OAuth2
* @public
*/
public static normalizeScopes(
scopeTransform: (scopes: string[]) => string[],
scopes?: string | string[],
options?: { scopeTransform: (scopes: string[]) => string[] },
): Set<string> {
if (!scopes) {
return new Set();
@@ -212,6 +213,10 @@ export default class OAuth2
? scopes
: scopes.split(/[\s|,]/).filter(Boolean);
return new Set(scopeTransform(scopeList));
const transformedScopes = options
? options.scopeTransform(scopeList)
: scopeList;
return new Set(transformedScopes);
}
}
packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2CustomAuthConnector.test.ts
+2 -3
View File
@@ -70,10 +70,9 @@ describe('OAuth2CustomAuthConnector', () => {
providerInfo: {
idToken: res.providerInfo.idToken,
accessToken: res.providerInfo.accessToken,
scopes: OAuth2.normalizeScopes(
scopes: OAuth2.normalizeScopes(res.providerInfo.scope, {
scopeTransform,
res.providerInfo.scope,
),
}),
expiresAt: res.providerInfo.expiresInSeconds
? new Date(Date.now() + res.providerInfo.expiresInSeconds * 1000)
: undefined,