Skip to content

Commit 2eec001

Browse files
committed
fix: url issue
1 parent debd461 commit 2eec001

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/middleware/keycloak-auth-middleware.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const keycloakAuthMiddleware = async (req: Request, res: Response, next: NextFun
5252

5353
let url = origin;
5454

55-
if (origin.includes("pro-mentor.live") || referUrl.includes("pro-mentor.live")
56-
|| origin.includes("sltc-promentor") || referUrl.includes("sltc-promentor")) {
55+
if ((origin && origin.includes("pro-mentor.live")) || (referUrl && referUrl.includes("pro-mentor.live") )
56+
|| (origin && origin.includes("sltc-promentor")) || (referUrl && referUrl.includes("sltc-promentor"))) {
5757
keyTenant = "sltc";
5858
keyclockIdpServerUrl = "http://keycloak-service:443"
5959
} else {

src/util/url-handler.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { InvalidURLException } from "../errors/custom_exceptions/invalid-url-exc
1616
const getTenantIdFromURL = (url: string): string => {
1717
console.debug("reserved url: ", url);
1818

19-
if (url.includes("pro-mentor.live") || url.includes("sltc-promentor")) {
19+
if (url && (url.includes("pro-mentor.live") || url.includes("sltc-promentor"))) {
2020
return "sltc";
2121
}
2222

@@ -56,7 +56,7 @@ const getTenantIdFromURL = (url: string): string => {
5656
const getKeycloakIdpUrl = (url: string): string => {
5757
console.debug("reserved url: ", url);
5858

59-
if (url.includes("pro-mentor.live") || url.includes("sltc-promentor")) {
59+
if (url && (url.includes("pro-mentor.live") || url.includes("sltc-promentor"))) {
6060
return "http://keycloak-service:443";
6161
}
6262

0 commit comments

Comments
 (0)