@backstage/core-app-api 1.4.0 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @backstage/core-app-api
 
+## 1.5.0
+
+### Minor Changes
+
+- db10b6ef65: Added a Bitbucket Server Auth Provider and added its API to the app defaults
+
+### Patch Changes
+
+- dff4d8ddb1: Fixed an issue where an explicit port the frontend base URL could break the app.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.4.0
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## 1.4.1-next.0
+
+### Patch Changes
+
+- dff4d8ddb1: Fixed an issue where an explicit port the frontend base URL could break the app.
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
 ## 1.4.0
 
 ### Minor 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, OAuthRequestApi, DiscoveryApi, AuthProviderInfo, githubAuthApiRef, gitlabAuthApiRef, googleAuthApiRef, OAuthApi, OpenIdConnectApi, ProfileInfoApi, BackstageIdentityApi, SessionApi, SessionState, AuthRequestOptions, BackstageIdentityResponse, ProfileInfo, oktaAuthApiRef, 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, OAuthRequestApi, DiscoveryApi, AuthProviderInfo, githubAuthApiRef, gitlabAuthApiRef, googleAuthApiRef, OAuthApi, OpenIdConnectApi, ProfileInfoApi, BackstageIdentityApi, SessionApi, SessionState, AuthRequestOptions, BackstageIdentityResponse, ProfileInfo, oktaAuthApiRef, microsoftAuthApiRef, oneloginAuthApiRef, bitbucketAuthApiRef, bitbucketServerAuthApiRef, 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';
@@ -256,6 +256,29 @@ declare class BitbucketAuth {
     static create(options: OAuthApiCreateOptions): typeof bitbucketAuthApiRef.T;
 }
 
+/**
+ * Session information for Bitbucket Server auth.
+ *
+ * @public
+ */
+declare type BitbucketServerSession = {
+    providerInfo: {
+        accessToken: string;
+        scopes: Set<string>;
+        expiresAt?: Date;
+    };
+    profile: ProfileInfo;
+    backstageIdentity: BackstageIdentityResponse;
+};
+
+/**
+ * Implements the OAuth flow to Bitbucket Server.
+ * @public
+ */
+declare class BitbucketServerAuth {
+    static create(options: OAuthApiCreateOptions): typeof bitbucketServerAuthApiRef.T;
+}
+
 /**
  * Implements the OAuth flow to Atlassian products.
  *
@@ -959,4 +982,4 @@ declare type FeatureFlaggedProps = {
  */
 declare const FeatureFlagged: (props: FeatureFlaggedProps) => JSX.Element;
 
-export { AlertApiForwarder, ApiFactoryHolder, ApiFactoryRegistry, ApiFactoryScope, ApiProvider, ApiProviderProps, ApiResolver, AppComponents, AppConfigLoader, AppContext, AppIcons, AppOptions, AppRouteBinder, AppRouter, AppRouterProps, AppThemeSelector, AtlassianAuth, AuthApiCreateOptions, BackstageApp, BitbucketAuth, BitbucketSession, BootErrorPageProps, ErrorAlerter, ErrorApiForwarder, ErrorBoundaryFallbackProps, FeatureFlagged, FeatureFlaggedProps, FetchMiddleware, FetchMiddlewares, FlatRoutes, FlatRoutesProps, GithubAuth, GitlabAuth, GoogleAuth, LocalStorageFeatureFlags, MicrosoftAuth, MultipleAnalyticsApi, NoOpAnalyticsApi, OAuth2, OAuth2CreateOptions, OAuth2Session, OAuthApiCreateOptions, OAuthRequestManager, OktaAuth, OneLoginAuth, OneLoginAuthCreateOptions, SamlAuth, SignInPageProps, UnhandledErrorForwarder, UrlPatternDiscovery, WebStorage, createFetchApi, createSpecializedApp, defaultConfigLoader };
+export { AlertApiForwarder, ApiFactoryHolder, ApiFactoryRegistry, ApiFactoryScope, ApiProvider, ApiProviderProps, ApiResolver, AppComponents, AppConfigLoader, AppContext, AppIcons, AppOptions, AppRouteBinder, AppRouter, AppRouterProps, AppThemeSelector, AtlassianAuth, AuthApiCreateOptions, BackstageApp, BitbucketAuth, BitbucketServerAuth, BitbucketServerSession, BitbucketSession, BootErrorPageProps, ErrorAlerter, ErrorApiForwarder, ErrorBoundaryFallbackProps, FeatureFlagged, FeatureFlaggedProps, FetchMiddleware, FetchMiddlewares, FlatRoutes, FlatRoutesProps, GithubAuth, GitlabAuth, GoogleAuth, LocalStorageFeatureFlags, MicrosoftAuth, MultipleAnalyticsApi, NoOpAnalyticsApi, OAuth2, OAuth2CreateOptions, OAuth2Session, OAuthApiCreateOptions, OAuthRequestManager, OktaAuth, OneLoginAuth, OneLoginAuthCreateOptions, SamlAuth, SignInPageProps, UnhandledErrorForwarder, UrlPatternDiscovery, WebStorage, createFetchApi, createSpecializedApp, defaultConfigLoader };

package/dist/index.esm.js

@@ -767,7 +767,7 @@ class AuthSessionStore {
   }
 }
 
-const DEFAULT_PROVIDER$9 = {
+const DEFAULT_PROVIDER$a = {
   id: "oauth2",
   title: "Your Identity Provider",
   icon: () => null
@@ -777,7 +777,7 @@ class OAuth2 {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$9,
+      provider = DEFAULT_PROVIDER$a,
       oauthRequestApi,
       defaultScopes = [],
       scopeTransform = (x) => x
@@ -859,7 +859,7 @@ class OAuth2 {
   }
 }
 
-const DEFAULT_PROVIDER$8 = {
+const DEFAULT_PROVIDER$9 = {
   id: "github",
   title: "GitHub",
   icon: () => null
@@ -869,7 +869,7 @@ class GithubAuth {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$8,
+      provider = DEFAULT_PROVIDER$9,
       oauthRequestApi,
       defaultScopes = ["read:user"]
     } = options;
@@ -883,7 +883,7 @@ class GithubAuth {
   }
 }
 
-const DEFAULT_PROVIDER$7 = {
+const DEFAULT_PROVIDER$8 = {
   id: "gitlab",
   title: "GitLab",
   icon: () => null
@@ -893,7 +893,7 @@ class GitlabAuth {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$7,
+      provider = DEFAULT_PROVIDER$8,
       oauthRequestApi,
       defaultScopes = ["read_user"]
     } = options;
@@ -907,7 +907,7 @@ class GitlabAuth {
   }
 }
 
-const DEFAULT_PROVIDER$6 = {
+const DEFAULT_PROVIDER$7 = {
   id: "google",
   title: "Google",
   icon: () => null
@@ -919,7 +919,7 @@ class GoogleAuth {
       discoveryApi,
       oauthRequestApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$6,
+      provider = DEFAULT_PROVIDER$7,
       defaultScopes = [
         "openid",
         `${SCOPE_PREFIX$1}userinfo.email`,
@@ -950,7 +950,7 @@ class GoogleAuth {
   }
 }
 
-const DEFAULT_PROVIDER$5 = {
+const DEFAULT_PROVIDER$6 = {
   id: "okta",
   title: "Okta",
   icon: () => null
@@ -970,7 +970,7 @@ class OktaAuth {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$5,
+      provider = DEFAULT_PROVIDER$6,
       oauthRequestApi,
       defaultScopes = ["openid", "email", "profile", "offline_access"]
     } = options;
@@ -1011,7 +1011,7 @@ const samlSessionSchema = z.object({
   })
 });
 
-const DEFAULT_PROVIDER$4 = {
+const DEFAULT_PROVIDER$5 = {
   id: "saml",
   title: "SAML",
   icon: () => null
@@ -1024,7 +1024,7 @@ class SamlAuth {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$4
+      provider = DEFAULT_PROVIDER$5
     } = options;
     const connector = new DirectAuthConnector({
       discoveryApi,
@@ -1060,7 +1060,7 @@ class SamlAuth {
   }
 }
 
-const DEFAULT_PROVIDER$3 = {
+const DEFAULT_PROVIDER$4 = {
   id: "microsoft",
   title: "Microsoft",
   icon: () => null
@@ -1069,7 +1069,7 @@ class MicrosoftAuth {
   static create(options) {
     const {
       environment = "development",
-      provider = DEFAULT_PROVIDER$3,
+      provider = DEFAULT_PROVIDER$4,
       oauthRequestApi,
       discoveryApi,
       defaultScopes = [
@@ -1090,7 +1090,7 @@ class MicrosoftAuth {
   }
 }
 
-const DEFAULT_PROVIDER$2 = {
+const DEFAULT_PROVIDER$3 = {
   id: "onelogin",
   title: "onelogin",
   icon: () => null
@@ -1110,7 +1110,7 @@ class OneLoginAuth {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$2,
+      provider = DEFAULT_PROVIDER$3,
       oauthRequestApi
     } = options;
     return OAuth2.create({
@@ -1134,7 +1134,7 @@ class OneLoginAuth {
   }
 }
 
-const DEFAULT_PROVIDER$1 = {
+const DEFAULT_PROVIDER$2 = {
   id: "bitbucket",
   title: "Bitbucket",
   icon: () => null
@@ -1144,7 +1144,7 @@ class BitbucketAuth {
     const {
       discoveryApi,
       environment = "development",
-      provider = DEFAULT_PROVIDER$1,
+      provider = DEFAULT_PROVIDER$2,
       oauthRequestApi,
       defaultScopes = ["team"]
     } = options;
@@ -1158,6 +1158,30 @@ class BitbucketAuth {
   }
 }
 
+const DEFAULT_PROVIDER$1 = {
+  id: "bitbucketServer",
+  title: "Bitbucket Server",
+  icon: () => null
+};
+class BitbucketServerAuth {
+  static create(options) {
+    const {
+      discoveryApi,
+      environment = "development",
+      provider = DEFAULT_PROVIDER$1,
+      oauthRequestApi,
+      defaultScopes = ["PROJECT_ADMIN"]
+    } = options;
+    return OAuth2.create({
+      discoveryApi,
+      oauthRequestApi,
+      provider,
+      environment,
+      defaultScopes
+    });
+  }
+}
+
 const DEFAULT_PROVIDER = {
   id: "atlassian",
   title: "Atlassian",
@@ -2727,6 +2751,13 @@ var __privateSet = (obj, member, value, setter) => {
   return value;
 };
 var _getProviderCalled;
+function createLocalBaseUrl(fullUrl) {
+  const url = new URL(fullUrl);
+  url.protocol = document.location.protocol;
+  url.hostname = document.location.hostname;
+  url.port = document.location.port;
+  return url.toString().replace(/\/$/, "");
+}
 function useConfigLoader(configLoader, components, appThemeApi) {
   var _a;
   const hasConfig = Boolean(configLoader);
@@ -2748,13 +2779,6 @@ function useConfigLoader(configLoader, components, appThemeApi) {
   let configReader;
   if ((_a = config.value) == null ? void 0 : _a.length) {
     const urlConfigReader = ConfigReader.fromConfigs(config.value);
-    const getOrigin = (url) => new URL(url).origin;
-    const overrideOrigin = (fullUrl) => {
-      return new URL(
-        fullUrl.replace(getOrigin(fullUrl), ""),
-        document.location.origin
-      ).href.replace(/\/$/, "");
-    };
     const appBaseUrl = urlConfigReader.getOptionalString("app.baseUrl");
     const backendBaseUrl = urlConfigReader.getOptionalString("backend.baseUrl");
     let configs = config.value;
@@ -2763,17 +2787,17 @@ function useConfigLoader(configLoader, components, appThemeApi) {
       context: "relative-resolver"
     };
     if (appBaseUrl && backendBaseUrl) {
-      const appOrigin = getOrigin(appBaseUrl);
-      const backendOrigin = getOrigin(backendBaseUrl);
+      const appOrigin = new URL(appBaseUrl).origin;
+      const backendOrigin = new URL(backendBaseUrl).origin;
       if (appOrigin === backendOrigin) {
-        const newBackendBaseUrl = overrideOrigin(backendBaseUrl);
+        const newBackendBaseUrl = createLocalBaseUrl(backendBaseUrl);
         if (backendBaseUrl !== newBackendBaseUrl) {
           relativeResolverConfig.data.backend = { baseUrl: newBackendBaseUrl };
         }
       }
     }
     if (appBaseUrl) {
-      const newAppBaseUrl = overrideOrigin(appBaseUrl);
+      const newAppBaseUrl = createLocalBaseUrl(appBaseUrl);
       if (appBaseUrl !== newAppBaseUrl) {
         relativeResolverConfig.data.app = { baseUrl: newAppBaseUrl };
       }
@@ -3095,5 +3119,5 @@ const FlatRoutes = (props) => {
   return useRoutes(withNotFound);
 };
 
-export { AlertApiForwarder, ApiFactoryRegistry, ApiProvider, ApiResolver, AppRouter, AppThemeSelector, AtlassianAuth, BitbucketAuth, ErrorAlerter, ErrorApiForwarder, FeatureFlagged, FetchMiddlewares, FlatRoutes, GithubAuth, GitlabAuth, GoogleAuth, LocalStorageFeatureFlags, MicrosoftAuth, MultipleAnalyticsApi, NoOpAnalyticsApi, OAuth2, OAuthRequestManager, OktaAuth, OneLoginAuth, SamlAuth, UnhandledErrorForwarder, UrlPatternDiscovery, WebStorage, createFetchApi, createSpecializedApp, defaultConfigLoader };
+export { AlertApiForwarder, ApiFactoryRegistry, ApiProvider, ApiResolver, AppRouter, AppThemeSelector, AtlassianAuth, BitbucketAuth, BitbucketServerAuth, ErrorAlerter, ErrorApiForwarder, FeatureFlagged, FetchMiddlewares, FlatRoutes, GithubAuth, GitlabAuth, GoogleAuth, LocalStorageFeatureFlags, MicrosoftAuth, MultipleAnalyticsApi, NoOpAnalyticsApi, OAuth2, OAuthRequestManager, OktaAuth, OneLoginAuth, SamlAuth, UnhandledErrorForwarder, UrlPatternDiscovery, WebStorage, createFetchApi, createSpecializedApp, defaultConfigLoader };
 //# sourceMappingURL=index.esm.js.map