From 2eec001ad77556a69aaa487e60d5b55caa7cf9bf Mon Sep 17 00:00:00 2001
From: kavishkamk <kavishkamadhushan727@gmail.com>
Date: Sun, 24 Mar 2024 23:25:53 +0530
Subject: [PATCH 1/2] fix: url issue

---
 src/middleware/keycloak-auth-middleware.ts | 4 ++--
 src/util/url-handler.ts                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/middleware/keycloak-auth-middleware.ts b/src/middleware/keycloak-auth-middleware.ts
index 7fc0c0b..ecf02fc 100644
--- a/src/middleware/keycloak-auth-middleware.ts
+++ b/src/middleware/keycloak-auth-middleware.ts
@@ -52,8 +52,8 @@ const keycloakAuthMiddleware = async (req: Request, res: Response, next: NextFun
 
         let url = origin;
 
-        if (origin.includes("pro-mentor.live") || referUrl.includes("pro-mentor.live") 
-            || origin.includes("sltc-promentor") || referUrl.includes("sltc-promentor")) {
+        if ((origin && origin.includes("pro-mentor.live")) || (referUrl && referUrl.includes("pro-mentor.live") )
+            || (origin && origin.includes("sltc-promentor")) || (referUrl && referUrl.includes("sltc-promentor"))) {
             keyTenant = "sltc";
             keyclockIdpServerUrl = "http://keycloak-service:443"
         } else {
diff --git a/src/util/url-handler.ts b/src/util/url-handler.ts
index de858e6..38baf2f 100644
--- a/src/util/url-handler.ts
+++ b/src/util/url-handler.ts
@@ -16,7 +16,7 @@ import { InvalidURLException } from "../errors/custom_exceptions/invalid-url-exc
 const getTenantIdFromURL = (url: string): string => {
     console.debug("reserved url: ", url);
 
-    if (url.includes("pro-mentor.live") || url.includes("sltc-promentor")) {
+    if (url && (url.includes("pro-mentor.live") || url.includes("sltc-promentor"))) {
         return "sltc";
     }
 
@@ -56,7 +56,7 @@ const getTenantIdFromURL = (url: string): string => {
 const getKeycloakIdpUrl = (url: string): string => {
     console.debug("reserved url: ", url);
 
-    if (url.includes("pro-mentor.live") || url.includes("sltc-promentor")) {
+    if (url && (url.includes("pro-mentor.live") || url.includes("sltc-promentor"))) {
         return "http://keycloak-service:443";
     }
 

From 8b83b650721c0378af21069ee9d17c62c5379b59 Mon Sep 17 00:00:00 2001
From: kavishkamk <kavishkamadhushan727@gmail.com>
Date: Sun, 24 Mar 2024 23:26:32 +0530
Subject: [PATCH 2/2] 1.0.40

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 711e8db..fc23c7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@promentor-app/shared-lib",
-    "version": "1.0.39",
+    "version": "1.0.40",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@promentor-app/shared-lib",
-            "version": "1.0.39",
+            "version": "1.0.40",
             "license": "ISC",
             "dependencies": {
                 "amqplib": "^0.10.3",
diff --git a/package.json b/package.json
index e8dbb60..db8e34f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@promentor-app/shared-lib",
-    "version": "1.0.39",
+    "version": "1.0.40",
     "description": "shared library for the application",
     "main": "./build/index.js",
     "types": "./build/index.d.ts",