fix: handle login when opening org logged out [INS-4330] (#7865)

* fix: handle login when opening org logged out [INS-4330]

* do the redirect in organization.tsx to avoid initial login edge case errors

* undo

packages/insomnia/src/ui/routes/organization.tsx

@@ -277,6 +277,12 @@ export const indexLoader: LoaderFunction = async () => {
     const personalOrganizationId = personalOrganization.id;
     await migrateProjectsUnderOrganization(personalOrganizationId, sessionId);
 
+    const specificOrgRedirectAfterAuthorize = window.localStorage.getItem('specificOrgRedirectAfterAuthorize');
+    if (specificOrgRedirectAfterAuthorize && specificOrgRedirectAfterAuthorize !== '') {
+      window.localStorage.removeItem('specificOrgRedirectAfterAuthorize');
+      return redirect(`/organization/${specificOrgRedirectAfterAuthorize}`);
+    }
+
     if (personalOrganization) {
       return redirect(`/organization/${personalOrganizationId}`);
     }

packages/insomnia/src/ui/routes/root.tsx

@@ -13,6 +13,7 @@ import { createPlugin } from '../../plugins/create';
 import { setTheme } from '../../plugins/misc';
 import { exchangeCodeForToken } from '../../sync/git/github-oauth-provider';
 import { exchangeCodeForGitLabToken } from '../../sync/git/gitlab-oauth-provider';
+import { getLoginUrl } from '../auth-session-provider';
 import { ErrorBoundary } from '../components/error-boundary';
 import { showError, showModal } from '../components/modals';
 import { AlertModal } from '../components/modals/alert-modal';
@@ -208,7 +209,17 @@ const Root = () => {
           }
 
           case 'insomnia://app/open/organization':
-            navigate(`/organization/${params.organizationId}`);
+            // if user is logged out, navigate to authorize instead
+            // gracefully handle open org in app from browser
+            const userSession = await models.userSession.getOrCreate();
+            if (!userSession.id || userSession.id === '') {
+              const url = new URL(getLoginUrl());
+              window.main.openInBrowser(url.toString());
+              window.localStorage.setItem('specificOrgRedirectAfterAuthorize', params.organizationId);
+              navigate('/auth/authorize');
+            } else {
+              navigate(`/organization/${params.organizationId}`);
+            }
             break;
 
           default: {