@backstage/plugin-auth-backend 0.12.2 → 0.13.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @backstage/plugin-auth-backend
 
+## 0.13.0-next.1
+
+### Patch Changes
+
+- a45bce06e3: Handle trailing slashes on GitHub `enterpriseInstanceUrl` settings
+- Updated dependencies
+  - @backstage/backend-common@0.13.2-next.1
+
+## 0.13.0-next.0
+
+### Minor Changes
+
+- 15d3a3c39a: **BREAKING**: All sign-in resolvers must now return a `token` in their sign-in result. Returning an `id` is no longer supported.
+
+### Patch Changes
+
+- 2cc1d1b235: Applied the fix from version 0.12.3 of this package, which is part of the v1.0.1 release of Backstage.
+- 6ee04078e1: **DEPRECATION**: The `tokenIssuer` option for `OAuthAdapter` is no longer needed and has been deprecated.
+- Updated dependencies
+  - @backstage/catalog-model@1.0.1-next.0
+  - @backstage/plugin-auth-node@0.2.0-next.0
+  - @backstage/backend-common@0.13.2-next.0
+  - @backstage/catalog-client@1.0.1-next.0
+
+## 0.12.3
+
+### Patch Changes
+
+- Fix migrations to do the right thing on sqlite databases, and reapply the column type fix for those who are _not_ on sqlite databases.
+
+  Reconstruction of #10317 in the form of a patch release instead.
+
 ## 0.12.2
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -10,8 +10,8 @@ var errors = require('@backstage/errors');
 var pickBy = require('lodash/pickBy');
 var crypto = require('crypto');
 var url = require('url');
-var catalogModel = require('@backstage/catalog-model');
 var jwtDecoder = require('jwt-decode');
+var catalogModel = require('@backstage/catalog-model');
 var fetch = require('node-fetch');
 var NodeCache = require('node-cache');
 var jose = require('jose');
@@ -255,18 +255,11 @@ function parseJwtPayload(token) {
 }
 function prepareBackstageIdentityResponse(result) {
   const { sub, ent } = parseJwtPayload(result.token);
-  const userEntityRef = catalogModel.stringifyEntityRef(catalogModel.parseEntityRef(sub, {
-    defaultKind: "user",
-    defaultNamespace: catalogModel.DEFAULT_NAMESPACE
-  }));
   return {
-    ...{
-      idToken: result.token,
-      ...result
-    },
+    ...result,
     identity: {
       type: "user",
-      userEntityRef,
+      userEntityRef: sub,
       ownershipEntityRefs: ent != null ? ent : []
     }
   };
@@ -429,17 +422,10 @@ class OAuthAdapter {
     if (!identity) {
       return void 0;
     }
-    if (identity.token) {
-      return prepareBackstageIdentityResponse(identity);
+    if (!identity.token) {
+      throw new errors.InputError(`Identity response must return a token`);
     }
-    const userEntityRef = catalogModel.stringifyEntityRef(catalogModel.parseEntityRef(identity.id, {
-      defaultKind: "user",
-      defaultNamespace: catalogModel.DEFAULT_NAMESPACE
-    }));
-    const token = await this.options.tokenIssuer.issueToken({
-      claims: { sub: userEntityRef }
-    });
-    return prepareBackstageIdentityResponse({ ...identity, token });
+    return prepareBackstageIdentityResponse(identity);
   }
 }
 
@@ -1284,10 +1270,10 @@ const createGithubProvider = (options) => {
     catalogApi,
     logger
   }) => OAuthEnvironmentHandler.mapConfig(config, (envConfig) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const clientId = envConfig.getString("clientId");
     const clientSecret = envConfig.getString("clientSecret");
-    const enterpriseInstanceUrl = envConfig.getOptionalString("enterpriseInstanceUrl");
+    const enterpriseInstanceUrl = (_a = envConfig.getOptionalString("enterpriseInstanceUrl")) == null ? void 0 : _a.replace(/\/$/, "");
     const customCallbackUrl = envConfig.getOptionalString("callbackUrl");
     const authorizationUrl = enterpriseInstanceUrl ? `${enterpriseInstanceUrl}/login/oauth/authorize` : void 0;
     const tokenUrl = enterpriseInstanceUrl ? `${enterpriseInstanceUrl}/login/oauth/access_token` : void 0;
@@ -1300,13 +1286,13 @@ const createGithubProvider = (options) => {
     const authHandler = (options == null ? void 0 : options.authHandler) ? options.authHandler : async ({ fullProfile }) => ({
       profile: makeProfileInfo(fullProfile)
     });
-    const signInResolverFn = (_b = (_a = options == null ? void 0 : options.signIn) == null ? void 0 : _a.resolver) != null ? _b : githubDefaultSignInResolver;
+    const signInResolverFn = (_c = (_b = options == null ? void 0 : options.signIn) == null ? void 0 : _b.resolver) != null ? _c : githubDefaultSignInResolver;
     const signInResolver = (info) => signInResolverFn(info, {
       catalogIdentityClient,
       tokenIssuer,
       logger
     });
-    const stateEncoder = (_c = options == null ? void 0 : options.stateEncoder) != null ? _c : async (req) => {
+    const stateEncoder = (_d = options == null ? void 0 : options.stateEncoder) != null ? _d : async (req) => {
       return { encodedState: encodeState(req.state) };
     };
     const provider = new GithubAuthProvider({