Skip to content

Commit 45cc39c

Browse files
committed
1 parent 1c64952 commit 45cc39c

File tree

6 files changed

+50
-72
lines changed

6 files changed

+50
-72
lines changed

backstage/app-config.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ backend:
3030
- host: raw.githubusercontent.com
3131
paths:
3232
- /DiamondLightSource
33-
# Disable new default auth to work with legacy plugins
34-
auth:
35-
dangerouslyDisableDefaultAuthPolicy: true
3633

3734
integrations:
3835
github:
@@ -56,6 +53,7 @@ techdocs:
5653
auth:
5754
environment: development
5855
providers:
56+
guest: {}
5957
github:
6058
development:
6159
clientId: ${GITHUB_APP_CLIENT_ID}

backstage/packages/app/src/App.tsx

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import { createApp } from '@backstage/app-defaults';
22
import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
3-
import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
3+
import {
4+
AlertDisplay,
5+
OAuthRequestDialog,
6+
SignInPage,
7+
} from '@backstage/core-components';
8+
import { githubAuthApiRef } from '@backstage/core-plugin-api';
49
import { apiDocsPlugin } from '@backstage/plugin-api-docs';
510
import {
611
CatalogEntityPage,
@@ -39,6 +44,22 @@ import { searchPage } from './components/search/SearchPage';
3944
import { PrefixNavigate } from './components/utils/PrefixNavigate';
4045

4146
const app = createApp({
47+
components: {
48+
SignInPage: props => (
49+
<SignInPage
50+
{...props}
51+
providers={[
52+
'guest',
53+
{
54+
id: 'github-auth-provider',
55+
title: 'GitHub',
56+
message: 'Sign in using GitHub',
57+
apiRef: githubAuthApiRef,
58+
},
59+
]}
60+
/>
61+
),
62+
},
4263
apis,
4364
bindRoutes({ bind }) {
4465
bind(catalogPlugin.externalRoutes, {

backstage/packages/backend/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
"@backstage/config": "^1.3.2",
2626
"@backstage/integration": "^1.16.1",
2727
"@backstage/plugin-auth-backend": "^0.24.2",
28+
"@backstage/plugin-auth-backend-module-github-provider": "^0.2.4",
29+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.4",
2830
"@backstage/plugin-auth-node": "^0.5.6",
2931
"@backstage/plugin-catalog-backend": "^1.30.0",
3032
"@backstage/plugin-catalog-backend-module-github": "^0.7.9",

backstage/packages/backend/src/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import {
66
} from '@immobiliarelabs/backstage-plugin-gitlab-backend';
77

88
const backend = createBackend();
9-
backend.add(legacyPlugin('auth', import('./plugins/auth')));
9+
backend.add(import('@backstage/plugin-auth-backend'));
10+
backend.add(import('@backstage/plugin-auth-backend-module-github-provider'));
11+
backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
1012

1113
// Catalog with Scaffolder module
1214
backend.add(import('@backstage/plugin-catalog-backend'));

backstage/packages/backend/src/plugins/auth.ts

Lines changed: 0 additions & 54 deletions
This file was deleted.

backstage/yarn.lock

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3659,6 +3659,17 @@
36593659
google-auth-library "^9.0.0"
36603660
passport-google-oauth20 "^2.0.0"
36613661

3662+
"@backstage/plugin-auth-backend-module-guest-provider@^0.2.4":
3663+
version "0.2.4"
3664+
resolved "https://registry.yarnpkg.com/@backstage/plugin-auth-backend-module-guest-provider/-/plugin-auth-backend-module-guest-provider-0.2.4.tgz#1cb5ed34af636fccb0c712ea3d53636f7065f458"
3665+
integrity sha512-UVFsNwh0E+VBjDOhioIpf6tewQu8KffDpFEPUxpVBkyyc3YMhdNEmfhfiK8G9vE2L6VGAgdKDq8DfPDD1vspyg==
3666+
dependencies:
3667+
"@backstage/backend-plugin-api" "^1.1.1"
3668+
"@backstage/catalog-model" "^1.7.3"
3669+
"@backstage/errors" "^1.2.7"
3670+
"@backstage/plugin-auth-node" "^0.5.6"
3671+
passport-oauth2 "^1.7.0"
3672+
36623673
"@backstage/plugin-auth-backend-module-microsoft-provider@^0.2.4":
36633674
version "0.2.4"
36643675
resolved "https://registry.yarnpkg.com/@backstage/plugin-auth-backend-module-microsoft-provider/-/plugin-auth-backend-module-microsoft-provider-0.2.4.tgz#ed4a11aa107ce5646f24484fcea5c6b2c84d6706"
@@ -11112,12 +11123,10 @@
1111211123
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
1111311124
integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
1111411125

11115-
"@types/react-dom@*", "@types/react-dom@<18.0.0":
11116-
version "17.0.25"
11117-
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
11118-
integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
11119-
dependencies:
11120-
"@types/react" "^17"
11126+
"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^17":
11127+
version "17.0.26"
11128+
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.26.tgz#fa7891ba70fd39ddbaa7e85b6ff9175bb546bc1b"
11129+
integrity sha512-Z+2VcYXJwOqQ79HreLU/1fyQ88eXSSFh6I3JdrEHQIfYSI0kCQpTGvOrbE6jFGGYXKsHuwY9tBa/w5Uo6KzrEg==
1112111130

1112211131
"@types/react-redux@^7.1.20":
1112311132
version "7.1.33"
@@ -11144,12 +11153,12 @@
1114411153
"@types/react" "*"
1114511154

1114611155
"@types/react@*", "@types/react@^16.13.1 || ^17.0.0 || ^18.0.0", "@types/react@^17":
11147-
version "17.0.76"
11148-
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.76.tgz#bfdf762046699e265655cd8f67a51beab6cd1e80"
11149-
integrity sha512-w9Aq+qeszGYoQM0hgFcdsAODGJdogadBDiitPm+zjBFJ0mLymvn2qSXsDaLJUndFRqqXk1FQfa9avHUBk1JhJQ==
11156+
version "17.0.83"
11157+
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.83.tgz#b477c56387b74279281149dcf5ba2a1e2216d131"
11158+
integrity sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==
1115011159
dependencies:
1115111160
"@types/prop-types" "*"
11152-
"@types/scheduler" "*"
11161+
"@types/scheduler" "^0.16"
1115311162
csstype "^3.0.2"
1115411163

1115511164
"@types/request@^2.47.1", "@types/request@^2.48.8":
@@ -11172,7 +11181,7 @@
1117211181
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
1117311182
integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
1117411183

11175-
"@types/scheduler@*":
11184+
"@types/scheduler@^0.16":
1117611185
version "0.16.8"
1117711186
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
1117811187
integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
@@ -23486,7 +23495,7 @@ [email protected]:
2348623495
uid2 "0.0.x"
2348723496
utils-merge "1.x.x"
2348823497

23489-
[email protected], passport-oauth2@^1.1.2, passport-oauth2@^1.4.0, passport-oauth2@^1.6.0, passport-oauth2@^1.6.1:
23498+
[email protected], passport-oauth2@^1.1.2, passport-oauth2@^1.4.0, passport-oauth2@^1.6.0, passport-oauth2@^1.6.1, passport-oauth2@^1.7.0:
2349023499
version "1.8.0"
2349123500
resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.8.0.tgz#55725771d160f09bbb191828d5e3d559eee079c8"
2349223501
integrity sha512-cjsQbOrXIDE4P8nNb3FQRCCmJJ/utnFKEz2NX209f7KOHPoX18gF7gBzBbLLsj2/je4KrgiwLLGjf0lm9rtTBA==
@@ -27233,7 +27242,7 @@ swagger-client@^3.24.6:
2723327242
qs "^6.10.2"
2723427243
traverse "~0.6.6"
2723527244

27236-
swagger-ui-react@^5.0.0:
27245+
swagger-ui-react@<5.11.0, swagger-ui-react@^5.0.0:
2723727246
version "5.10.5"
2723827247
resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.10.5.tgz#a9da3c452599530b1df4e1c7860c2888f683c617"
2723927248
integrity sha512-uBQLku4j3L1NC4/xE3HTgz1EcFisBphh8AnGqbj9LMxeGGcpKOlx/ZDigRAeVXWr9jOnZZbeGBzMe4NVHxPZrQ==

0 commit comments

Comments
 (0)