From 30846478ed6a112813953b9217a69ef047ffa217 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 7 Jul 2023 12:07:19 +0300
Subject: [PATCH] use oauth url with origin & fix http requests

---
 src/lib/services/generic.service.ts     | 2 +-
 src/lib/tenants/keycloak-initializer.ts | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib/services/generic.service.ts b/src/lib/services/generic.service.ts
index 8721614..f2db687 100644
--- a/src/lib/services/generic.service.ts
+++ b/src/lib/services/generic.service.ts
@@ -58,7 +58,7 @@ export abstract class GenericService<I> {
         let path = `/${this._serviceName}/${encodeURI(modelPath)}`;
 
         if (typeof body === 'string') {
-            path += `/${this._serviceName}/${encodeURIComponent(body)}`;
+            path += `/${encodeURIComponent(body)}`;
         }
 
         return this._http.delete(path, {
diff --git a/src/lib/tenants/keycloak-initializer.ts b/src/lib/tenants/keycloak-initializer.ts
index b585d88..8ccb811 100644
--- a/src/lib/tenants/keycloak-initializer.ts
+++ b/src/lib/tenants/keycloak-initializer.ts
@@ -7,9 +7,15 @@ import { NGXLogger } from 'ngx-logger';
 import { Router } from '@angular/router';
 
 export function getKeycloakOptions(baseUrl: string, config: IqserAppConfig, tenant: string): KeycloakOptions {
+    let oauthUrl = config.OAUTH_URL;
+    if (!oauthUrl.startsWith('http')) {
+        oauthUrl = oauthUrl.startsWith('/') ? oauthUrl : '/' + oauthUrl;
+        oauthUrl = window.location.origin + oauthUrl;
+    }
+
     return {
         config: {
-            url: config.OAUTH_URL,
+            url: oauthUrl,
             realm: tenant,
             clientId: config.OAUTH_CLIENT_ID,
         },