From c13ef42932e7fcf49681ad7eec20df48779b959c Mon Sep 17 00:00:00 2001
From: Helmut Hutzler <helmut.hutzler@th-nuernberg.de>
Date: Sat, 29 Oct 2022 19:07:51 +0200
Subject: [PATCH] Tesing apiUrl keycloakURL for prod
---
src/app/account.service.ts | 8 ++++++--
src/environments/environment.prod.ts | 2 +-
src/environments/environment.ts | 4 +++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/app/account.service.ts b/src/app/account.service.ts
index a9d4eb2..140d651 100644
--- a/src/app/account.service.ts
+++ b/src/app/account.service.ts
@@ -4,6 +4,7 @@ import {HttpClient, HttpErrorResponse, HttpHeaders} from "@angular/common/http";
import {map, Observable, of, tap, throwError} from 'rxjs';
import { retry, catchError } from 'rxjs/operators';
import { Account } from './account';
+import { environment } from '../environments/environment';
@Injectable({
providedIn: 'root'
@@ -13,7 +14,8 @@ export class AccountService {
constructor(public messageService: MessageService,
private http: HttpClient) { }
private logHeader = ''
- private apiURL = 'http://localhost:8080/api';
+ private apiURL = environment.apiURL;
+ 'http://localhost:8080/api';
private preferredUsername = 'No User';
private httpOptions = {
@@ -29,8 +31,9 @@ export class AccountService {
getAccountsObservableApi(): Observable<any> {
this.logHeader = '[AccountService:getAccountsObservable()] ';
let appUrl = this.apiURL + '/kc/getusers';
+ this.messageService.add(this.logHeader + 'appUrl: ' + appUrl);
return this.http.get<any>(appUrl ).pipe(
- tap((data:any) => this.messageService.add(this.logHeader + ' Retrieving all Accounts Observable')),
+ tap((data:any) => this.messageService.add(this.logHeader + ' xx Retrieving all Accounts Observable')),
// catchError takes in an input Observable, and outputs an Output Observable.
catchError(this.handleError(this.logHeader))
);
@@ -39,6 +42,7 @@ export class AccountService {
getAccountsObservable(): Observable<any> {
this.logHeader = '[AccountService:getAccountsObservableRest()] ';
let appUrl = this.apiURL + '/accounts' ;
+ this.messageService.add(this.logHeader + ' Retrieving all Accounts: - appUrL: ' + appUrl );
return this.http.get<any>(appUrl,this.httpOptions ).pipe(
tap((data:any) => this.messageService.add(this.logHeader + ' Retrieving all Accounts Observable')),
// catchError takes in an input Observable, and outputs an Output Observable.
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 8749f29..e994229 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -2,6 +2,6 @@ export const environment = {
production: true,
//keycloakURL: 'https://kube-master-h1.informatik.fh-nuernberg.de:/auth/',
keycloakURL: '/auth/',
- apiURL: 'http://localhost:8080/api'
+ apiURL: '/api'
};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 9c1862c..40e1559 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,7 +6,9 @@
export const environment = {
production: false,
// keycloakURL: 'http://localhost:8280/auth/'
- keycloakURL: 'https://kube-master-h1.informatik.fh-nuernberg.de:/auth/'
+ // keycloakURL: '/auth/',
+ keycloakURL: 'https://kube-master-h1.informatik.fh-nuernberg.de:/auth/',
+ apiURL: 'http://localhost:8080/api'
};
/*
--
GitLab