From 881b01e342cbaa9430ec0655951ea71c18988467 Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Fri, 27 Sep 2024 09:43:03 -0500 Subject: [PATCH] login fix --- src/webpage/login.ts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/webpage/login.ts b/src/webpage/login.ts index c0d3752..a33ed6c 100644 --- a/src/webpage/login.ts +++ b/src/webpage/login.ts @@ -286,12 +286,13 @@ async function getapiurls(str: string): Promise< url.pathname.includes("api") ? "" : "api" }/policies/instance/domains` ).then(x=>x.json()); + const apiurl = new URL(info.apiEndpoint); return{ - api: info.apiEndpoint+(url.pathname.includes("api") ? "" : "/api"), + api: info.apiEndpoint+(apiurl.pathname.includes("api") ? "" : "/api"), gateway: info.gateway, cdn: info.cdn, wellknown: str, - login: info.apiEndpoint, + login: info.apiEndpoint+(apiurl.pathname.includes("api") ? "" : "/api"), }; }catch{ const val = stringURLsMap.get(str); @@ -302,21 +303,21 @@ async function getapiurls(str: string): Promise< if(responce.ok){ if(val.login){ return val as { - wellknown: string; - api: string; - cdn: string; - gateway: string; - login: string; - }; + wellknown: string; + api: string; + cdn: string; + gateway: string; + login: string; + }; }else{ val.login = val.api; return val as { - wellknown: string; - api: string; - cdn: string; - gateway: string; - login: string; - }; + wellknown: string; + api: string; + cdn: string; + gateway: string; + login: string; + }; } } }