u

2026-10-13 00:33:38 +02:00
parent 1ad9b14aa6
commit 4c5ccf7f64
12 changed files with 1152 additions and 645 deletions
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -57,10 +57,16 @@ class App extends PureComponent {
    }

    if (status !== 'authed') {
+      if (typeof window !== 'undefined' && window.location.pathname === '/oauth/authorize') {
+        const returnTo = encodeURIComponent(window.location.pathname + window.location.search);
+        window.history.replaceState(null, '', `/login?returnTo=${returnTo}`);
+      }
      return <LoginPage />;
    }

-    if (user?.selectedCompanyId == null) {
+    const isOAuthAuthorize = typeof window !== 'undefined' && window.location.pathname === '/oauth/authorize';
+
+    if (user?.selectedCompanyId == null && !isOAuthAuthorize) {
      return <CompanySetupDialog />;
    }