diff --git a/packages/frontend/src/app/app.config.ts b/packages/frontend/src/app/app.config.ts index f90aa1d..9b1e34f 100644 --- a/packages/frontend/src/app/app.config.ts +++ b/packages/frontend/src/app/app.config.ts @@ -37,6 +37,7 @@ import { provideServiceWorker } from '@angular/service-worker'; import { de } from 'date-fns/locale'; import { routes } from './app.routes'; import { initializeApi } from './util/api'; +import { keycloakConfig } from './util/keycloak-config'; export const appConfig: ApplicationConfig = { providers: [ @@ -49,13 +50,7 @@ export const appConfig: ApplicationConfig = { provideBrowserGlobalErrorListeners(), provideZoneChangeDetection({ eventCoalescing: true }), provideKeycloak({ - config: { - url: isDevMode() - ? 'http://localhost:8080/' - : 'https://keycloak.toni714.de:8443/', - realm: 'taekwondo', - clientId: 'angular-frontend', - }, + config: keycloakConfig, initOptions: { onLoad: 'check-sso', silentCheckSsoRedirectUri: diff --git a/packages/frontend/src/app/app.html b/packages/frontend/src/app/app.html index afda16e..8f41600 100644 --- a/packages/frontend/src/app/app.html +++ b/packages/frontend/src/app/app.html @@ -1,7 +1,14 @@ @if(this.auth.loggedIn()){
- - + + +
} diff --git a/packages/frontend/src/app/app.routes.ts b/packages/frontend/src/app/app.routes.ts index 4669c48..99b2c44 100644 --- a/packages/frontend/src/app/app.routes.ts +++ b/packages/frontend/src/app/app.routes.ts @@ -11,6 +11,7 @@ import { AuthGuardData, createAuthGuard } from 'keycloak-angular'; import { Login } from './components/login/login'; import { MissingPage } from './components/missing-page/missing-page'; import { Claim } from './generated-api/api'; +import { keycloakConfig } from './util/keycloak-config'; export const roles = { UserAdmin: 'useradmin', @@ -70,5 +71,9 @@ export const routes: Routes = [ ), canActivate: [requireRoles([Claim.Memberadmin])], }, + { + path: 'profile', + redirectTo: `${keycloakConfig.url}/realms/${keycloakConfig.realm}/account`, + }, { path: '**', component: MissingPage }, ]; diff --git a/packages/frontend/src/app/components/view-members/view-members.html b/packages/frontend/src/app/components/view-members/view-members.html index 838423d..d596632 100644 --- a/packages/frontend/src/app/components/view-members/view-members.html +++ b/packages/frontend/src/app/components/view-members/view-members.html @@ -47,7 +47,7 @@ - + diff --git a/packages/frontend/src/app/util/keycloak-config.ts b/packages/frontend/src/app/util/keycloak-config.ts new file mode 100644 index 0000000..21d1304 --- /dev/null +++ b/packages/frontend/src/app/util/keycloak-config.ts @@ -0,0 +1,10 @@ +import { isDevMode } from '@angular/core'; +import { KeycloakServerConfig } from 'keycloak-js'; + +export const keycloakConfig: KeycloakServerConfig = { + url: isDevMode() + ? 'http://localhost:8080' + : 'https://keycloak.toni714.de:8443', + realm: 'taekwondo', + clientId: 'angular-frontend', +};
Bearb.