From 63bad8eedc79046c1d783150fb603b9ceaa98b6e Mon Sep 17 00:00:00 2001 From: anicke Date: Fri, 10 Jan 2025 09:41:24 +0100 Subject: [PATCH] chore(backend): update dev script, add guest provider (#241) Co-authored-by: Niklas Aronsson Co-authored-by: Frida Jacobsson <76013501+fridajac@users.noreply.github.com> --- app-config.yaml | 1 + package.json | 3 +- packages/backend/package.json | 1 + packages/backend/src/index.ts | 1 + yarn.lock | 180 +++++++++++++++++++++++++++++----- 5 files changed, 158 insertions(+), 28 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 913cd1ee..1dd67438 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -73,6 +73,7 @@ techdocs: auth: # see https://backstage.io/docs/auth/ to learn about auth providers providers: + guest: {} microsoft: development: clientId: ${AUTH_MICROSOFT_CLIENT_ID} diff --git a/package.json b/package.json index 2104adc5..a14b8b52 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "node": "18 || 20 || 22" }, "scripts": { - "dev": "concurrently \"yarn start\" \"yarn start-backend\"", + "dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start", "start": "yarn workspace app start", "start-backend": "yarn workspace backend start", "build:backend": "yarn workspace backend build", @@ -45,7 +45,6 @@ "@changesets/cli": "^2.26.2", "@playwright/test": "^1.32.3", "@spotify/prettier-config": "^12.0.0", - "concurrently": "^8.0.0", "lerna": "^7.3.0", "node-gyp": "^9.0.0", "prettier": "^2.3.2", diff --git a/packages/backend/package.json b/packages/backend/package.json index c50a5eb2..17f4ed51 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -28,6 +28,7 @@ "@backstage/config": "^1.2.0", "@backstage/plugin-app-backend": "^0.3.72", "@backstage/plugin-auth-backend": "^0.22.10", + "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.3", "@backstage/plugin-auth-backend-module-microsoft-provider": "^0.1.18", "@backstage/plugin-auth-node": "^0.5.0", "@backstage/plugin-catalog-backend": "^1.25.0", diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index 75dcb747..f4a15fdd 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -4,6 +4,7 @@ const backend = createBackend(); backend.add(import('@backstage/plugin-catalog-backend/alpha')); backend.add(import('@backstage/plugin-scaffolder-backend/alpha')); backend.add(import('@backstage/plugin-auth-backend')); +backend.add(import('@backstage/plugin-auth-backend-module-guest-provider')); backend.add(import('@backstage/plugin-auth-backend-module-microsoft-provider')); backend.add(import('@backstage/plugin-proxy-backend/alpha')); backend.add(import('@backstage/plugin-techdocs-backend/alpha')); diff --git a/yarn.lock b/yarn.lock index 3dff9673..3c492920 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3693,6 +3693,24 @@ __metadata: languageName: node linkType: hard +"@backstage/backend-plugin-api@npm:^1.1.0": + version: 1.1.0 + resolution: "@backstage/backend-plugin-api@npm:1.1.0" + dependencies: + "@backstage/cli-common": "npm:^0.1.15" + "@backstage/config": "npm:^1.3.1" + "@backstage/errors": "npm:^1.2.6" + "@backstage/plugin-auth-node": "npm:^0.5.5" + "@backstage/plugin-permission-common": "npm:^0.8.3" + "@backstage/types": "npm:^1.2.0" + "@types/express": "npm:^4.17.6" + "@types/luxon": "npm:^3.0.0" + knex: "npm:^3.0.0" + luxon: "npm:^3.0.0" + checksum: 61f30fbbad6acb2869105ef7e49895d2a0e0ef0f601d3deb9dfa438cd46f37385e2df6cf5bb9208d43b069be949624e7ed8bd11559cd3653627b4db053bfd518 + languageName: node + linkType: hard + "@backstage/backend-tasks@npm:^0.6.0": version: 0.6.0 resolution: "@backstage/backend-tasks@npm:0.6.0" @@ -3785,6 +3803,18 @@ __metadata: languageName: node linkType: hard +"@backstage/catalog-client@npm:^1.9.0": + version: 1.9.0 + resolution: "@backstage/catalog-client@npm:1.9.0" + dependencies: + "@backstage/catalog-model": "npm:^1.7.2" + "@backstage/errors": "npm:^1.2.6" + cross-fetch: "npm:^4.0.0" + uri-template: "npm:^2.0.0" + checksum: 25ad60e614ceb1d6bfe288a2749ef76fa73a80fb2152458e9142729c57cf9890b41f2b904d64cb5d291323919ac96c4edaddb4208a42d14d414dddd10dde4db1 + languageName: node + linkType: hard + "@backstage/catalog-model@npm:^1.4.5": version: 1.4.5 resolution: "@backstage/catalog-model@npm:1.4.5" @@ -3821,6 +3851,18 @@ __metadata: languageName: node linkType: hard +"@backstage/catalog-model@npm:^1.7.2": + version: 1.7.2 + resolution: "@backstage/catalog-model@npm:1.7.2" + dependencies: + "@backstage/errors": "npm:^1.2.6" + "@backstage/types": "npm:^1.2.0" + ajv: "npm:^8.10.0" + lodash: "npm:^4.17.21" + checksum: 9cc2d512110a63b355970d4068e06206070e3e3195109b84b05ef3b9ea3e151084e441bed268ebaf647eb12b8a1f2a9003e54ff440b1b8ab8f8630a5538cfd69 + languageName: node + linkType: hard + "@backstage/cli-common@npm:^0.1.14": version: 0.1.14 resolution: "@backstage/cli-common@npm:0.1.14" @@ -3828,6 +3870,13 @@ __metadata: languageName: node linkType: hard +"@backstage/cli-common@npm:^0.1.15": + version: 0.1.15 + resolution: "@backstage/cli-common@npm:0.1.15" + checksum: 6155d7343814dbe1bc84073d5cdf73e00f379ffc7880a166ad8843443e7dedbe0887a389df5010b909832e8f232d4283a81b2abbda992130a865286445643ff9 + languageName: node + linkType: hard + "@backstage/cli-node@npm:^0.2.7": version: 0.2.7 resolution: "@backstage/cli-node@npm:0.2.7" @@ -4038,6 +4087,17 @@ __metadata: languageName: node linkType: hard +"@backstage/config@npm:^1.3.1": + version: 1.3.1 + resolution: "@backstage/config@npm:1.3.1" + dependencies: + "@backstage/errors": "npm:^1.2.6" + "@backstage/types": "npm:^1.2.0" + ms: "npm:^2.1.3" + checksum: f9c519b57f0c6590ad6f2a6619bf418d3e64a4cf4cf05b357cf109b64e25bb479923665dd88937cfb2ec1cc87d5ede784690df7a9ee4ed99e5907674023adc60 + languageName: node + linkType: hard + "@backstage/core-app-api@npm:^1.14.2": version: 1.14.2 resolution: "@backstage/core-app-api@npm:1.14.2" @@ -4264,6 +4324,16 @@ __metadata: languageName: node linkType: hard +"@backstage/errors@npm:^1.2.6": + version: 1.2.6 + resolution: "@backstage/errors@npm:1.2.6" + dependencies: + "@backstage/types": "npm:^1.2.0" + serialize-error: "npm:^8.0.1" + checksum: c563debf11cd89fbbc246a3d8050979a2a52bce625bbb2df77673be3694ae3669c313029f95272446d73c48b8f86b496d1b63e5d929d3fc44a1fd61fcc081db7 + languageName: node + linkType: hard + "@backstage/eslint-plugin@npm:^0.1.8": version: 0.1.8 resolution: "@backstage/eslint-plugin@npm:0.1.8" @@ -4813,6 +4883,19 @@ __metadata: languageName: node linkType: hard +"@backstage/plugin-auth-backend-module-guest-provider@npm:^0.2.3": + version: 0.2.3 + resolution: "@backstage/plugin-auth-backend-module-guest-provider@npm:0.2.3" + dependencies: + "@backstage/backend-plugin-api": "npm:^1.1.0" + "@backstage/catalog-model": "npm:^1.7.2" + "@backstage/errors": "npm:^1.2.6" + "@backstage/plugin-auth-node": "npm:^0.5.5" + passport-oauth2: "npm:^1.7.0" + checksum: 5fda9f84acdb3fbf07473b3bd11f49bf5236038a1d3932ca93ede8110d45ca57a6313c9733abae08802a152e116ce018df40619ae3daf6d6c8245481492f3b5e + languageName: node + linkType: hard + "@backstage/plugin-auth-backend-module-microsoft-provider@npm:^0.1.18": version: 0.1.18 resolution: "@backstage/plugin-auth-backend-module-microsoft-provider@npm:0.1.18" @@ -5151,6 +5234,31 @@ __metadata: languageName: node linkType: hard +"@backstage/plugin-auth-node@npm:^0.5.5": + version: 0.5.5 + resolution: "@backstage/plugin-auth-node@npm:0.5.5" + dependencies: + "@backstage/backend-common": "npm:^0.25.0" + "@backstage/backend-plugin-api": "npm:^1.1.0" + "@backstage/catalog-client": "npm:^1.9.0" + "@backstage/catalog-model": "npm:^1.7.2" + "@backstage/config": "npm:^1.3.1" + "@backstage/errors": "npm:^1.2.6" + "@backstage/types": "npm:^1.2.0" + "@types/express": "npm:^4.17.6" + "@types/passport": "npm:^1.0.3" + express: "npm:^4.17.1" + jose: "npm:^5.0.0" + lodash: "npm:^4.17.21" + passport: "npm:^0.7.0" + winston: "npm:^3.2.1" + zod: "npm:^3.22.4" + zod-to-json-schema: "npm:^3.21.4" + zod-validation-error: "npm:^3.4.0" + checksum: d35018fda29f79283c828b0a0d24f8ff5e6208230fdfb57dc9a377010334c128c1ad0bb3e1a7cfc85c08ffdb685fe882678a883b184c42d5d5be4da1e700fe6b + languageName: node + linkType: hard + "@backstage/plugin-auth-react@npm:^0.1.5": version: 0.1.5 resolution: "@backstage/plugin-auth-react@npm:0.1.5" @@ -5595,6 +5703,21 @@ __metadata: languageName: node linkType: hard +"@backstage/plugin-permission-common@npm:^0.8.3": + version: 0.8.3 + resolution: "@backstage/plugin-permission-common@npm:0.8.3" + dependencies: + "@backstage/config": "npm:^1.3.1" + "@backstage/errors": "npm:^1.2.6" + "@backstage/types": "npm:^1.2.0" + cross-fetch: "npm:^4.0.0" + uuid: "npm:^11.0.0" + zod: "npm:^3.22.4" + zod-to-json-schema: "npm:^3.20.4" + checksum: 99a36a8566d4ad292839d78bea68bade9daddf3993572dca2fb81f5269a396d652181d3ed47fccf03d328008a8d518722ddced779db1e39c6b07ef16a584af57 + languageName: node + linkType: hard + "@backstage/plugin-permission-node@npm:^0.8.1": version: 0.8.1 resolution: "@backstage/plugin-permission-node@npm:0.8.1" @@ -6536,6 +6659,13 @@ __metadata: languageName: node linkType: hard +"@backstage/types@npm:^1.2.0": + version: 1.2.0 + resolution: "@backstage/types@npm:1.2.0" + checksum: 7fd20efcf365446a6dc057b6af92254cb9082a89fd487c0369df631cb904c2bab7e5bc6bb9097c05c1af5124cffef3b2ad55953ed7dce0d444ca807da5d7cf3a + languageName: node + linkType: hard + "@backstage/version-bridge@npm:^1.0.8": version: 1.0.8 resolution: "@backstage/version-bridge@npm:1.0.8" @@ -17184,6 +17314,7 @@ __metadata: "@backstage/config": "npm:^1.2.0" "@backstage/plugin-app-backend": "npm:^0.3.72" "@backstage/plugin-auth-backend": "npm:^0.22.10" + "@backstage/plugin-auth-backend-module-guest-provider": "npm:^0.2.3" "@backstage/plugin-auth-backend-module-microsoft-provider": "npm:^0.1.18" "@backstage/plugin-auth-node": "npm:^0.5.0" "@backstage/plugin-catalog-backend": "npm:^1.25.0" @@ -18830,26 +18961,6 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:^8.0.0": - version: 8.2.2 - resolution: "concurrently@npm:8.2.2" - dependencies: - chalk: "npm:^4.1.2" - date-fns: "npm:^2.30.0" - lodash: "npm:^4.17.21" - rxjs: "npm:^7.8.1" - shell-quote: "npm:^1.8.1" - spawn-command: "npm:0.0.2" - supports-color: "npm:^8.1.1" - tree-kill: "npm:^1.2.2" - yargs: "npm:^17.7.2" - bin: - conc: dist/bin/concurrently.js - concurrently: dist/bin/concurrently.js - checksum: 0e9683196fe9c071d944345d21d8f34aa6c0cc50c0dd897e95619f2f1c9eb4871dca851b2569da17888235b7335b4c821ca19deed35bebcd9a131ee5d247f34c - languageName: node - linkType: hard - "connect-history-api-fallback@npm:^2.0.0": version: 2.0.0 resolution: "connect-history-api-fallback@npm:2.0.0" @@ -19838,7 +19949,7 @@ __metadata: languageName: node linkType: hard -"date-fns@npm:^2.16.1, date-fns@npm:^2.30.0": +"date-fns@npm:^2.16.1": version: 2.30.0 resolution: "date-fns@npm:2.30.0" dependencies: @@ -28638,7 +28749,7 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1": +"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.3": version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 @@ -33564,7 +33675,6 @@ __metadata: "@changesets/cli": "npm:^2.26.2" "@playwright/test": "npm:^1.32.3" "@spotify/prettier-config": "npm:^12.0.0" - concurrently: "npm:^8.0.0" lerna: "npm:^7.3.0" node-gyp: "npm:^9.0.0" prettier: "npm:^2.3.2" @@ -33629,7 +33739,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.5.5, rxjs@npm:^7.8.1": +"rxjs@npm:^7.5.5": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -34359,7 +34469,7 @@ __metadata: languageName: node linkType: hard -"spawn-command@npm:0.0.2, spawn-command@npm:^0.0.2-1": +"spawn-command@npm:^0.0.2-1": version: 0.0.2 resolution: "spawn-command@npm:0.0.2" checksum: b22f2d71239e6e628a400831861ba747750bbb40c0a53323754cf7b84330b73d81e40ff1f9055e6d1971818679510208a9302e13d9ff3b32feb67e74d7a1b3ef @@ -35198,7 +35308,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^8.0.0, supports-color@npm:^8.1.0, supports-color@npm:^8.1.1": +"supports-color@npm:^8.0.0, supports-color@npm:^8.1.0": version: 8.1.1 resolution: "supports-color@npm:8.1.1" dependencies: @@ -36922,6 +37032,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^11.0.0": + version: 11.0.4 + resolution: "uuid@npm:11.0.4" + bin: + uuid: dist/esm/bin/uuid + checksum: 3c13591c4dedaa3741f925e284df5974e3d6e0b1cb0f6f75f98c36f9c01d2a414350364fd067613ef600a21c6973dab0506530d4f499ff878f32a06f84569ead + languageName: node + linkType: hard + "uuid@npm:^3.3.2, uuid@npm:^3.4.0": version: 3.4.0 resolution: "uuid@npm:3.4.0" @@ -38242,6 +38361,15 @@ __metadata: languageName: node linkType: hard +"zod-validation-error@npm:^3.4.0": + version: 3.4.0 + resolution: "zod-validation-error@npm:3.4.0" + peerDependencies: + zod: ^3.18.0 + checksum: aaadb0e65c834aacb12fa088663d52d9f4224b5fe6958f09b039f4ab74145fda381c8a7d470bfddf7ddd9bbb5fdfbb52739cd66958ce6d388c256a44094d1fba + languageName: node + linkType: hard + "zod@npm:^3.22.4": version: 3.22.4 resolution: "zod@npm:3.22.4"