fix: breaking app when window not available on startup

obot-platform · Oct 25, 2024 · 5d75b0d · 5d75b0d
1 parent 965090d
commit 5d75b0d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ui/admin/app/lib/model/oauthApps/providers/github.ts b/ui/admin/app/lib/model/oauthApps/providers/github.ts
@@ -21,7 +21,7 @@ const steps: OAuthFormStep<typeof schema.shape>[] = [
     },
     {
         type: "copy",
-        text: BaseUrl,
+        text: BaseUrl(),
     },
 
     {

diff --git a/ui/admin/app/lib/model/oauthApps/providers/google.ts b/ui/admin/app/lib/model/oauthApps/providers/google.ts
@@ -114,7 +114,7 @@ const steps: OAuthFormStep<typeof schema.shape>[] = [
     },
     {
         type: "copy",
-        text: DomainUrl,
+        text: DomainUrl(),
     },
     {
         type: "markdown",

diff --git a/ui/admin/app/lib/routers/baseRouter.ts b/ui/admin/app/lib/routers/baseRouter.ts
@@ -1,2 +1,10 @@
-export const BaseUrl = window.location.origin + "/admin";
-export const DomainUrl = window.location.origin;
+export const BaseUrl = () => {
+    if (typeof window === "undefined") return "";
+
+    return window.location.origin + "/admin";
+};
+export const DomainUrl = () => {
+    if (typeof window === "undefined") return "";
+
+    return window.location.origin;
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ const steps: OAuthFormStep<typeof schema.shape>[] = [ @@
         },
         {
             type: "copy",
-            text: BaseUrl,
+            text: BaseUrl(),
         },
         {
@@ Expand Down @@