@backstage/core-app-api 0.5.1 → 0.5.2-next.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @backstage/core-app-api
 
+## 0.5.2-next.0
+
+### Patch Changes
+
+- 40775bd263: Switched out the `GithubAuth` implementation to use the common `OAuth2` implementation. This relies on the simultaneous change in `@backstage/plugin-auth-backend` that enabled access token storage in cookies rather than the current solution that's based on `LocalStorage`.
+
+  > **NOTE:** Make sure you upgrade the `auth-backend` deployment before or at the same time as you deploy this change.
+
 ## 0.5.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode, PropsWithChildren, ComponentType } from 'react';
 import PropTypes from 'prop-types';
-import { ApiHolder, ApiRef, ApiFactory, AnyApiRef, ProfileInfo, BackstageIdentityResponse, OAuthRequestApi, DiscoveryApi, AuthProviderInfo, OAuthApi, SessionApi, SessionState, AuthRequestOptions, gitlabAuthApiRef, googleAuthApiRef, OpenIdConnectApi, ProfileInfoApi, BackstageIdentityApi, oktaAuthApiRef, auth0AuthApiRef, microsoftAuthApiRef, oneloginAuthApiRef, bitbucketAuthApiRef, atlassianAuthApiRef, AlertApi, AlertMessage, AnalyticsApi, AnalyticsEvent, AppThemeApi, AppTheme, ErrorApi, ErrorApiError, ErrorApiErrorContext, FeatureFlagsApi, FeatureFlag, FeatureFlagsSaveOptions, FetchApi, IdentityApi, OAuthRequesterOptions, OAuthRequester, PendingOAuthRequest, StorageApi, StorageValueSnapshot, BackstagePlugin, IconComponent, ExternalRouteRef, AnyApiFactory, RouteRef, SubRouteRef } from '@backstage/core-plugin-api';
+import { ApiHolder, ApiRef, ApiFactory, AnyApiRef, ProfileInfo, BackstageIdentityResponse, OAuthRequestApi, DiscoveryApi, AuthProviderInfo, githubAuthApiRef, gitlabAuthApiRef, googleAuthApiRef, OAuthApi, OpenIdConnectApi, ProfileInfoApi, BackstageIdentityApi, SessionApi, SessionState, AuthRequestOptions, oktaAuthApiRef, auth0AuthApiRef, microsoftAuthApiRef, oneloginAuthApiRef, bitbucketAuthApiRef, atlassianAuthApiRef, AlertApi, AlertMessage, AnalyticsApi, AnalyticsEvent, AppThemeApi, AppTheme, ErrorApi, ErrorApiError, ErrorApiErrorContext, FeatureFlagsApi, FeatureFlag, FeatureFlagsSaveOptions, FetchApi, IdentityApi, OAuthRequesterOptions, OAuthRequester, PendingOAuthRequest, StorageApi, StorageValueSnapshot, BackstagePlugin, IconComponent, ExternalRouteRef, AnyApiFactory, RouteRef, SubRouteRef } from '@backstage/core-plugin-api';
 import * as _backstage_types from '@backstage/types';
 import { Observable, JsonValue } from '@backstage/types';
 import { Config, AppConfig } from '@backstage/config';
@@ -130,16 +130,11 @@ declare type AuthApiCreateOptions = {
  *
  * @public
  */
-declare class GithubAuth implements OAuthApi, SessionApi {
-    private readonly sessionManager;
-    static create(options: OAuthApiCreateOptions): GithubAuth;
-    private constructor();
-    signIn(): Promise<void>;
-    signOut(): Promise<void>;
-    sessionState$(): Observable<SessionState>;
-    getAccessToken(scope?: string, options?: AuthRequestOptions): Promise<string>;
-    getBackstageIdentity(options?: AuthRequestOptions): Promise<BackstageIdentityResponse | undefined>;
-    getProfile(options?: AuthRequestOptions): Promise<ProfileInfo | undefined>;
+declare class GithubAuth {
+    static create(options: OAuthApiCreateOptions): typeof githubAuthApiRef.T;
+    /**
+     * @deprecated This method is deprecated and will be removed in a future release.
+     */
     static normalizeScope(scope?: string): Set<string>;
 }
 

package/dist/index.esm.js

@@ -725,167 +725,7 @@ class AuthSessionStore {
   }
 }
 
-class OptionalRefreshSessionManagerMux {
-  constructor(options) {
-    this.stateTracker = new SessionStateTracker();
-    this.sessionCanRefresh = options.sessionCanRefresh;
-    this.staticSessionManager = options.staticSessionManager;
-    this.refreshingSessionManager = options.refreshingSessionManager;
-  }
-  async getSession(options) {
-    const staticSession = await this.staticSessionManager.getSession({
-      ...options,
-      optional: true
-    });
-    if (staticSession) {
-      this.stateTracker.setIsSignedIn(true);
-      return staticSession;
-    }
-    const session = await this.refreshingSessionManager.getSession(options);
-    if (!session) {
-      this.stateTracker.setIsSignedIn(false);
-      return void 0;
-    }
-    if (this.sessionCanRefresh(session)) {
-      this.stateTracker.setIsSignedIn(true);
-      return session;
-    }
-    this.staticSessionManager.setSession(session);
-    this.stateTracker.setIsSignedIn(true);
-    return session;
-  }
-  async removeSession() {
-    await Promise.all([
-      this.refreshingSessionManager.removeSession(),
-      this.staticSessionManager.removeSession()
-    ]);
-    this.stateTracker.setIsSignedIn(false);
-  }
-  sessionState$() {
-    return this.stateTracker.sessionState$();
-  }
-}
-
-const githubSessionSchema = z.object({
-  providerInfo: z.object({
-    accessToken: z.string(),
-    scopes: z.set(z.string()),
-    expiresAt: z.date().optional()
-  }),
-  profile: z.object({
-    email: z.string().optional(),
-    displayName: z.string().optional(),
-    picture: z.string().optional()
-  }),
-  backstageIdentity: z.object({
-    id: z.string(),
-    token: z.string(),
-    identity: z.object({
-      type: z.literal("user"),
-      userEntityRef: z.string(),
-      ownershipEntityRefs: z.array(z.string())
-    })
-  })
-});
-
 const DEFAULT_PROVIDER$a = {
-  id: "github",
-  title: "GitHub",
-  icon: () => null
-};
-class GithubAuth {
-  constructor(sessionManager) {
-    this.sessionManager = sessionManager;
-  }
-  static create(options) {
-    const {
-      discoveryApi,
-      environment = "development",
-      provider = DEFAULT_PROVIDER$a,
-      oauthRequestApi,
-      defaultScopes = ["read:user"]
-    } = options;
-    const connector = new DefaultAuthConnector({
-      discoveryApi,
-      environment,
-      provider,
-      oauthRequestApi,
-      sessionTransform(res) {
-        return {
-          ...res,
-          providerInfo: {
-            accessToken: res.providerInfo.accessToken,
-            scopes: GithubAuth.normalizeScope(res.providerInfo.scope),
-            expiresAt: res.providerInfo.expiresInSeconds ? new Date(Date.now() + res.providerInfo.expiresInSeconds * 1e3) : void 0
-          }
-        };
-      }
-    });
-    const refreshingSessionManager = new RefreshingAuthSessionManager({
-      connector,
-      defaultScopes: new Set(defaultScopes),
-      sessionScopes: (session) => session.providerInfo.scopes,
-      sessionShouldRefresh: (session) => {
-        const { expiresAt } = session.providerInfo;
-        if (!expiresAt) {
-          return false;
-        }
-        const expiresInSec = (expiresAt.getTime() - Date.now()) / 1e3;
-        return expiresInSec < 60 * 5;
-      }
-    });
-    const staticSessionManager = new AuthSessionStore({
-      manager: new StaticAuthSessionManager({
-        connector,
-        defaultScopes: new Set(defaultScopes),
-        sessionScopes: (session) => session.providerInfo.scopes
-      }),
-      storageKey: `${provider.id}Session`,
-      schema: githubSessionSchema,
-      sessionScopes: (session) => session.providerInfo.scopes
-    });
-    const sessionManagerMux = new OptionalRefreshSessionManagerMux({
-      refreshingSessionManager,
-      staticSessionManager,
-      sessionCanRefresh: (session) => session.providerInfo.expiresAt !== void 0
-    });
-    return new GithubAuth(sessionManagerMux);
-  }
-  async signIn() {
-    await this.getAccessToken();
-  }
-  async signOut() {
-    await this.sessionManager.removeSession();
-  }
-  sessionState$() {
-    return this.sessionManager.sessionState$();
-  }
-  async getAccessToken(scope, options) {
-    var _a;
-    const session = await this.sessionManager.getSession({
-      ...options,
-      scopes: GithubAuth.normalizeScope(scope)
-    });
-    return (_a = session == null ? void 0 : session.providerInfo.accessToken) != null ? _a : "";
-  }
-  async getBackstageIdentity(options = {}) {
-    const session = await this.sessionManager.getSession(options);
-    return session == null ? void 0 : session.backstageIdentity;
-  }
-  async getProfile(options = {}) {
-    const session = await this.sessionManager.getSession(options);
-    return session == null ? void 0 : session.profile;
-  }
-  static normalizeScope(scope) {
-    if (!scope) {
-      return /* @__PURE__ */ new Set();
-    }
-    const scopeList = Array.isArray(scope) ? scope : scope.split(/[\s|,]/).filter(Boolean);
-    return new Set(scopeList);
-  }
-}
-
-const DEFAULT_PROVIDER$9 = {
   id: "oauth2",
   title: "Your Identity Provider",
   icon: () => null
@@ -895,7 +735,7 @@ class OAuth2 {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$9,
+      provider = DEFAULT_PROVIDER$a,
       oauthRequestApi,
       defaultScopes = [],
       scopeTransform = (x) => x
@@ -972,6 +812,37 @@ class OAuth2 {
   }
 }
 
+const DEFAULT_PROVIDER$9 = {
+  id: "github",
+  title: "GitHub",
+  icon: () => null
+};
+class GithubAuth {
+  static create(options) {
+    const {
+      discoveryApi,
+      environment = "development",
+      provider = DEFAULT_PROVIDER$9,
+      oauthRequestApi,
+      defaultScopes = ["read:user"]
+    } = options;
+    return OAuth2.create({
+      discoveryApi,
+      oauthRequestApi,
+      provider,
+      environment,
+      defaultScopes
+    });
+  }
+  static normalizeScope(scope) {
+    if (!scope) {
+      return /* @__PURE__ */ new Set();
+    }
+    const scopeList = Array.isArray(scope) ? scope : scope.split(/[\s|,]/).filter(Boolean);
+    return new Set(scopeList);
+  }
+}
+
 const DEFAULT_PROVIDER$8 = {
   id: "gitlab",
   title: "GitLab",