diff --git a/package.json b/package.json index 833bf65b0641a7082149a558e4ba4d9bfc9991af..ccd329cc47bdef31fcb90a7aed303fa5a604e92a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "account-management-webapp", - "version": "0.0.0", + "version": "0.0.3", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json", @@ -39,4 +39,4 @@ "karma-jasmine-html-reporter": "~1.7.0", "typescript": "~4.6.4" } -} \ No newline at end of file +} diff --git a/src/app/account.service.ts b/src/app/account.service.ts index 9b84f1d6d05c53523d3aab1f4f73132ac41556e3..4ff7b03db4c13d66ae8f3b8d4dae414126ab15cd 100644 --- a/src/app/account.service.ts +++ b/src/app/account.service.ts @@ -16,8 +16,9 @@ export class AccountService implements OnInit { ngOnInit() { this.logHeader = "[AccountService:ngOnInit()] "; - this.messageService.add(this.logHeader + "\n keycloakURL: " + environment.keycloakURL - + "\n apiURL : " + environment.apiURL + "\n"); + this.messageService.add(this.logHeader + "\n keycloakURL : " + environment.keycloakURL + + "\n appVersion : " + environment.appVersion + + + "\n apiURL : " + environment.apiURL + "\n"); } private logHeader = '' private apiURL = environment.apiURL; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 4a243dbfe77f03971d7e85a55a99d458d18e5801..fb2a6d26d7d06bb48631e3706c85aa279603365e 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,10 +1,29 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { OidcSecurityService } from 'angular-auth-oidc-client'; +import {environment} from "../environments/environment"; @Component({ selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.css'], }) -export class AppComponent { + +/** + * According to Damion Bods readme + * https://github.com/damienbod/angular-auth-oidc-client/blob/main/README.md + * we need to call this.oidcSecurityService.checkAuth() in AppComponent + */ + +export class AppComponent implements OnInit { title = 'sample-code-flow-auto-login-all-routes'; + constructor(public oidcSecurityService: OidcSecurityService) {} + + ngOnInit() { + this.oidcSecurityService.checkAuth().subscribe(({ isAuthenticated, userData, accessToken, idToken }) => { + console.log( "App-Info::isAuthenticated : " + isAuthenticated +"\n"); + console.log( "App-Info::appVersion : " + environment.appVersion + "\n"); + console.log( "App-Info::apiUrl : " + environment.apiURL + "\n"); + console.log( "App-Info::keycloakURL : " + environment.keycloakURL + "\n"); + }); + } } diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index c1256679cc47e2b400cc5898919dcccab3666ba6..7de0560f94c808e901caa3d87dd7cde3cd9bc62e 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,10 +1,10 @@ +declare const require: any; + export const environment = { production: true, //keycloakURL: 'https://kube-master-h1.informatik.fh-nuernberg.de:/auth/', keycloakURL: '/auth/', apiURL: '/api', - //apiURL: 'https://kube-master-h1.informatik.fh-nuernberg.de:/api', - // secureRoute: 'https://kube-master-h1.informatik.fh-nuernberg.de:/' - secureRoute: '/api/' + appVersion: require('../../package.json').version }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 7b8f89ebd3ef5d7db28fb8255b5ab2b59eef9b80..b55b37ba5c98083c4db9468ad5925feb634cf420 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -2,6 +2,7 @@ // `ng build` replaces `environment.ts` with `environment.prod.ts`. // The list of file replacements can be found in `angular.json`. +declare const require: any; export const environment = { production: false, @@ -9,7 +10,8 @@ export const environment = { // keycloakURL: '/auth/', keycloakURL: 'https://kube-master-h1.informatik.fh-nuernberg.de/auth/', apiURL: 'http://localhost:8080/api', - // secureRoute: 'http://localhost:8080/api' + appVersion: require('../../package.json').version + }; /*