Skip to content

Commit

Permalink
chore: .semrelrc
Browse files Browse the repository at this point in the history
  • Loading branch information
hairmare committed Dec 25, 2024
1 parent c13a98c commit 8ebda41
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
4 changes: 4 additions & 0 deletions .semrelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"maintainedVersion": "0.11-beta"
}

5 changes: 4 additions & 1 deletion app-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,15 @@ auth:
session:
secret: ${SESSION_SECRET}
providers:
keycloak:
oidc:
production:
prompt: auto
metadataUrl: ${AUTH_KEYCLOAK_METADATA_URL}
clientId: ${AUTH_KEYCLOAK_CLIENT_ID}
clientSecret: ${AUTH_KEYCLOAK_CLIENT_SECRET}
signIn:
resolvers:
- resolver: emailMatchingUserEntityProfileEmail
github:
production:
clientId: ${AUTH_GITHUB_CLIENT_ID}
Expand Down
10 changes: 5 additions & 5 deletions packages/app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
import { DevToolsPage } from '@backstage/plugin-devtools';
import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
import { UserSettingsPage } from '@backstage/plugin-user-settings';
import { apis, keycloakOIDCAuthApiRef } from './apis';
import { apis, oidcAuthApiRef } from './apis';
import { homePage } from './components/home/HomePage';
import { entityPage } from './components/catalog/EntityPage';
import { searchPage } from './components/search/SearchPage';
Expand Down Expand Up @@ -65,10 +65,10 @@ const app = createApp({
{...props}
auto
provider={{
id: 'keycloak-auth-provider',
title: 'Keycloak',
message: 'Sign in using Keycloak',
apiRef: keycloakOIDCAuthApiRef,
id: 'oidc-auth-provider',
title: 'RaBe SSO',
message: 'Sign in using your RaBe account',
apiRef: oidcAuthApiRef,
}}
/>
),
Expand Down
13 changes: 7 additions & 6 deletions packages/app/src/apis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
AnyApiFactory,
ApiRef,
BackstageIdentityApi,
OAuthApi,
OpenIdConnectApi,
ProfileInfoApi,
SessionApi,
Expand All @@ -18,15 +19,15 @@ import {
oauthRequestApiRef
} from '@backstage/core-plugin-api';

export const keycloakOIDCAuthApiRef: ApiRef<
OpenIdConnectApi & ProfileInfoApi & BackstageIdentityApi & SessionApi
export const oidcAuthApiRef: ApiRef<
OAuthApi & OpenIdConnectApi & ProfileInfoApi & BackstageIdentityApi & SessionApi
> = createApiRef({
id: 'auth.keycloak',
id: 'internal.auth.oidc',
});

export const apis: AnyApiFactory[] = [
createApiFactory({
api: keycloakOIDCAuthApiRef,
api: oidcAuthApiRef,
deps: {
discoveryApi: discoveryApiRef,
oauthRequestApi: oauthRequestApiRef,
Expand All @@ -38,8 +39,8 @@ export const apis: AnyApiFactory[] = [
discoveryApi,
oauthRequestApi,
provider: {
id: 'keycloak',
title: 'Keycloak auth provider',
id: 'oidc',
title: 'OIDC auth provider',
icon: () => null,
},
environment: configApi.getOptionalString('auth.environment'),
Expand Down

0 comments on commit 8ebda41

Please sign in to comment.