@backstage/plugin-auth-backend 0.15.1-next.1 → 0.16.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @backstage/plugin-auth-backend
 
+## 0.16.0-next.1
+
+### Minor Changes
+
+- 2fc41ebf07: Removed the previously deprecated class `AtlassianAuthProvider`. Please use `providers.atlassian.create(...)` instead.
+- a291688bc5: Renamed the `RedirectInfo` type to `OAuthStartResponse`
+
+### Patch Changes
+
+- d669d89206: Minor API signatures cleanup
+- e1ebaeb332: Cloudflare Access Provider: Add JWT to CloudflareAccessResult
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.2.5-next.1
+  - @backstage/backend-common@0.15.1-next.1
+
+## 0.15.2-next.0
+
+### Patch Changes
+
+- bf5e9030eb: Updated dependency `msw` to `^0.45.0`.
+- Updated dependencies
+  - @backstage/backend-common@0.15.1-next.0
+  - @backstage/catalog-client@1.0.5-next.0
+  - @backstage/plugin-auth-node@0.2.5-next.0
+
+## 0.15.1
+
+### Patch Changes
+
+- c676a9e07b: Fixed a bug in auth plugin on the backend where it ignores the skip migration database options when using the database provider.
+- 2d7d6028e1: Updated dependency `@google-cloud/firestore` to `^6.0.0`.
+- Updated dependencies
+  - @backstage/backend-common@0.15.0
+  - @backstage/plugin-auth-node@0.2.4
+
 ## 0.15.1-next.1
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -1187,7 +1187,11 @@ class CloudflareAccessAuthProvider {
     const sub = verifyResult.payload.sub;
     const cfAccessResultStr = await ((_a = this.cache) == null ? void 0 : _a.get(`${CACHE_PREFIX}/${sub}`));
     if (typeof cfAccessResultStr === "string") {
-      return JSON.parse(cfAccessResultStr);
+      const result = JSON.parse(cfAccessResultStr);
+      return {
+        ...result,
+        token: jwt
+      };
     }
     const claims = verifyResult.payload;
     try {
@@ -1198,7 +1202,10 @@ class CloudflareAccessAuthProvider {
         expiresInSeconds: claims.exp - claims.iat
       };
       (_b = this.cache) == null ? void 0 : _b.set(`${CACHE_PREFIX}/${sub}`, JSON.stringify(cfAccessResult));
-      return cfAccessResult;
+      return {
+        ...cfAccessResult,
+        token: jwt
+      };
     } catch (err) {
       throw new errors.ForwardedError(
         "Failed to populate access identity information",
@@ -2790,23 +2797,27 @@ const parseDate = (date) => {
 };
 class DatabaseKeyStore {
   static async create(options) {
+    var _a;
     const { database } = options;
-    await database.migrate.latest({
-      directory: migrationsDir
-    });
-    return new DatabaseKeyStore(options);
+    const client = await database.getClient();
+    if (!((_a = database.migrations) == null ? void 0 : _a.skip)) {
+      await client.migrate.latest({
+        directory: migrationsDir
+      });
+    }
+    return new DatabaseKeyStore(client);
   }
-  constructor(options) {
-    this.database = options.database;
+  constructor(client) {
+    this.client = client;
   }
   async addKey(key) {
-    await this.database(TABLE).insert({
+    await this.client(TABLE).insert({
       kid: key.kid,
       key: JSON.stringify(key)
     });
   }
   async listKeys() {
-    const rows = await this.database(TABLE).select();
+    const rows = await this.client(TABLE).select();
     return {
       items: rows.map((row) => ({
         key: JSON.parse(row.key),
@@ -2815,7 +2826,7 @@ class DatabaseKeyStore {
     };
   }
   async removeKeys(kids) {
-    await this.database(TABLE).delete().whereIn("kid", kids);
+    await this.client(TABLE).delete().whereIn("kid", kids);
   }
 }
 
@@ -2925,9 +2936,7 @@ class KeyStores {
       if (!database) {
         throw new Error("This KeyStore provider requires a database");
       }
-      return await DatabaseKeyStore.create({
-        database: await database.getClient()
-      });
+      return await DatabaseKeyStore.create({ database });
     }
     if (provider === "memory") {
       return new MemoryKeyStore();
@@ -3236,7 +3245,6 @@ function createOriginFilter(config) {
   };
 }
 
-exports.AtlassianAuthProvider = AtlassianAuthProvider;
 exports.CatalogIdentityClient = CatalogIdentityClient;
 exports.OAuthAdapter = OAuthAdapter;
 exports.OAuthEnvironmentHandler = OAuthEnvironmentHandler;