fixed /auth

Author: enzosav

cape-dashboard/src/app/auth/login/login.service.ts

@@ -32,7 +32,7 @@ export class LoginService {
 
     const authResult = await this.authService.logout(this.authProfile).toPromise();
     if (authResult.isSuccess()) {
-      const redirectedHref = `${this.idmHost}/auth/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.dashboardUrl}/login`;
+      const redirectedHref = `${this.idmHost}/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.dashboardUrl}/login`;
 
       if (redirectIntoOpener) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access

cape-online-services/src/app/app.component.ts

@@ -53,13 +53,13 @@ export class AppComponent implements OnInit, OnDestroy {
       baseEndpoint: this.appConfig.system.auth.idmHost,
       clientAuthMethod: NbOAuth2ClientAuthMethod.NONE,
       token: {
-        endpoint: `/auth/realms/${this.appConfig.system.auth.authRealm}/protocol/openid-connect/token`,
+        endpoint: `/realms/${this.appConfig.system.auth.authRealm}/protocol/openid-connect/token`,
         redirectUri: `${this.appConfig.system.onlineServicesUrl}/login/loginPopup`,
         class: OidcJWTToken,
         key: 'access_token',
       },
       authorize: {
-        endpoint: `/auth/realms/${this.appConfig.system.auth.authRealm}/protocol/openid-connect/auth`,
+        endpoint: `/realms/${this.appConfig.system.auth.authRealm}/protocol/openid-connect/auth`,
         scope: 'openid',
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         state: uuidv4(),
@@ -72,7 +72,7 @@ export class AppComponent implements OnInit, OnDestroy {
         failure: null, // stay on the same page
       },
       refresh: {
-        endpoint: `/auth/realms/${this.appConfig.system.auth.authRealm}/protocol/openid-connect/token`,
+        endpoint: `/realms/${this.appConfig.system.auth.authRealm}/protocol/openid-connect/token`,
         grantType: NbOAuth2GrantType.REFRESH_TOKEN,
       },
     });

cape-online-services/src/app/auth/login/login.service.ts

@@ -32,7 +32,7 @@ export class LoginService {
 
     const authResult = await this.authService.logout(this.authProfile).toPromise();
     if (authResult.isSuccess()) {
-      window.location.href = `${this.idmHost}/auth/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.logoutRedirectUrl}/login`;
+      window.location.href = `${this.idmHost}/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.logoutRedirectUrl}/login`;
     } else {
       window.alert(this.translateService.instant('login.logout_error'));
     }

cape-online-services/src/app/auth/login/loginPopup/loginPopup.component.ts

@@ -15,6 +15,7 @@ import { ErrorResponse } from 'src/app/model/errorResponse';
   templateUrl: './loginPopup.component.html',
 })
 export class LoginPopupComponent implements AfterViewInit, OnDestroy {
+  oidcField: string;
   onlineServicesUrl: string;
   locale: string;
 
@@ -33,6 +34,7 @@ export class LoginPopupComponent implements AfterViewInit, OnDestroy {
     private activatedRoute: ActivatedRoute,
     private dialogService: NbDialogService
   ) {
+    this.oidcField = (this.configService.config as AppConfig).system.auth.oidcField;
     this.onlineServicesUrl = (this.configService.config as AppConfig).system.onlineServicesUrl;
     this.locale = (this.configService.config as AppConfig).i18n.locale;
     this.queryParams = this.activatedRoute.snapshot.queryParams;
@@ -61,7 +63,12 @@ export class LoginPopupComponent implements AfterViewInit, OnDestroy {
       // Get Idm User Details to create the associated Cape Account
       const tokenPayload = token.getAccessTokenPayload();
 
-      localStorage.setItem('serviceAccountId', tokenPayload.preferred_username);
+      let accountId=tokenPayload.preferred_username;
+      if(this.oidcField!=undefined && this.oidcField!='preferred_username'){
+        accountId=tokenPayload[this.oidcField];
+      }
+
+      localStorage.setItem('accountId', accountId);
       localStorage.setItem('serviceAccountEmail', tokenPayload.email);
 
       /*

cape-online-services/src/app/model/appConfig.ts

@@ -18,6 +18,7 @@ export interface Auth {
   authProfile: string;
   authRealm: string;
   defaultIdP: string;
+  oidcField?: string;
 }
 
 export interface Services {

cape-online-services/src/assets/config.json

@@ -4,12 +4,13 @@
     "onlineServicesUrl": "http://localhost:83/cape-online-services",
     "dashboardUrl": "https://www.cape-suite.eu/cape-dashboard",
     "auth": {
-      "idmHost": "https://idm.cape-suite.eu",
+      "idmHost": "https://idm.cape-suite.eu/auth",
       "clientId": "cape-service-sdk",
       "disableAuth": "false",
       "authProfile": "oidc",
       "authRealm": "Cape",
-      "defaultIdP": ""
+      "defaultIdP": "",
+      "oidcField":"preferred_username"
     }
   },
   "services": {

cape-online-services/src/assets/config.prod.json

@@ -4,12 +4,13 @@
     "onlineServicesUrl": "https://www.cape-suite.eu/cape-online-services",
     "dashboardUrl": "https://www.cape-suite.eu/cape-dashboard",
     "auth": {
-      "idmHost": "https://idm.cape-suite.eu",
+      "idmHost": "https://idm.cape-suite.eu/auth",
       "clientId": "cape-service-sdk",
       "disableAuth": "false",
       "authProfile": "oidc",
       "authRealm": "Cape",
-      "defaultIdP": ""
+      "defaultIdP": "",
+      "oidcField":"preferred_username"
     }
   },
   "services": {

cape-sdk/cape-sdk-angular-standalone/src/app/auth/login/login.service.ts

@@ -32,7 +32,7 @@ export class LoginService {
 
     const authResult = await this.authService.logout(this.authProfile).toPromise();
     if (authResult.isSuccess()) {
-      window.location.href = `${this.idmHost}/auth/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.logoutRedirectUrl}/login`;
+      window.location.href = `${this.idmHost}/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.logoutRedirectUrl}/login`;
     } else {
       window.alert(this.translateService.instant('login.logout_error'));
     }

cape-service-editor/src/app/auth/login/login.service.ts

@@ -32,7 +32,7 @@ export class LoginService {
 
     const authResult = await this.authService.logout(this.authProfile).toPromise();
     if (authResult.isSuccess()) {
-      window.location.href = `${this.idmHost}/auth/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.serviceEditorUrl}/login`;
+      window.location.href = `${this.idmHost}/realms/${this.authRealm}/protocol/openid-connect/logout?redirect_uri=${this.serviceEditorUrl}/login`;
     } else {
       window.alert(this.translateService.instant('login.logout_error'));
     }