Merge pull request #2670 from appwrite/fix-direct-org-hits

Author: ItzNotABug

src/lib/stores/organization.ts

@@ -1,8 +1,8 @@
 import { page } from '$app/stores';
-import { derived, writable } from 'svelte/store';
-import type { Models } from '@appwrite.io/console';
 import type { Tier } from './billing';
 import type { Plan } from '$lib/sdk/billing';
+import { derived, writable } from 'svelte/store';
+import { type Models, Platform } from '@appwrite.io/console';
 
 export type OrganizationError = {
     status: number;
@@ -35,6 +35,7 @@ export type Organization = Models.Team<Record<string, unknown>> & {
     status: string;
     remarks: string;
     projects: string[];
+    platform: Platform;
 };
 
 export type OrganizationList = {

src/routes/(console)/organization-[organization]/+layout.ts

@@ -2,7 +2,7 @@ import { Dependencies } from '$lib/constants';
 import { failedInvoice } from '$lib/stores/billing';
 import { isCloud } from '$lib/system';
 import { sdk } from '$lib/stores/sdk';
-import { error } from '@sveltejs/kit';
+import { error, redirect } from '@sveltejs/kit';
 import type { LayoutLoad } from './$types';
 import Breadcrumbs from './breadcrumbs.svelte';
 import Header from './header.svelte';
@@ -14,14 +14,18 @@ import { defaultRoles, defaultScopes } from '$lib/constants';
 import type { Plan } from '$lib/sdk/billing';
 import { loadAvailableRegions } from '$routes/(console)/regions';
 import type { Organization } from '$lib/stores/organization';
+import { Platform } from '@appwrite.io/console';
+import { resolve } from '$app/paths';
 
 export const load: LayoutLoad = async ({ params, depends, parent }) => {
-    const { preferences: prefs } = await parent();
+    const { organizations, preferences: prefs } = await parent();
 
     depends(Dependencies.ORGANIZATION);
     depends(Dependencies.MEMBERS);
     depends(Dependencies.PAYMENT_METHODS);
 
+    const requestedOrg = await checkPlatformAndRedirect(params, organizations, prefs);
+
     let roles = isCloud ? [] : defaultRoles;
     let scopes = isCloud ? [] : defaultScopes;
     let currentPlan: Plan = null;
@@ -42,8 +46,13 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
             sdk.forConsole.account.updatePrefs({ prefs: newPrefs });
         }
 
-        const [organization, members, countryList, locale] = await Promise.all([
-            sdk.forConsole.teams.get({ teamId: params.organization }) as Promise<Organization>,
+        // fetch org only if we haven't already fetched it for platform check
+        const orgPromise: Promise<Organization> = requestedOrg
+            ? Promise.resolve(requestedOrg)
+            : (sdk.forConsole.teams.get({ teamId: params.organization }) as Promise<Organization>);
+
+        const [org, members, countryList, locale] = await Promise.all([
+            orgPromise,
             sdk.forConsole.teams.listMemberships({ teamId: params.organization }),
             sdk.forConsole.locale.listCountries(),
             sdk.forConsole.locale.get(),
@@ -54,7 +63,7 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
         return {
             header: Header,
             breadcrumbs: Breadcrumbs,
-            organization,
+            organization: org,
             currentPlan,
             members,
             roles,
@@ -82,3 +91,69 @@ function loadFailedInvoices(teamId: string) {
         }
     });
 }
+
+async function checkPlatformAndRedirect(
+    params: { organization: string },
+    organizations: { teams: Array<{ $id: string; platform?: string }> },
+    prefs: Record<string, string>
+): Promise<Organization | null> {
+    // check if preloaded
+    let requestedOrg = organizations.teams.find((team) => team.$id === params.organization) as
+        | Organization
+        | undefined;
+
+    // not found, load!
+    if (!requestedOrg) {
+        try {
+            requestedOrg = (await sdk.forConsole.teams.get({
+                teamId: params.organization
+            })) as Organization;
+        } catch (e) {
+            return null;
+        }
+    }
+
+    if (requestedOrg && requestedOrg.platform !== Platform.Appwrite) {
+        const orgIdInPrefs = prefs.organization;
+
+        // grab the first org with matching platform
+        const samePlatformOrganization = organizations.teams.find(
+            (team) => team.platform === Platform.Appwrite
+        );
+
+        // exists, lets redirect!
+        if (samePlatformOrganization) {
+            redirect(
+                303,
+                resolve('/(console)/organization-[organization]', {
+                    organization: samePlatformOrganization.$id
+                })
+            );
+        }
+        // not in list, check prefs
+        else if (orgIdInPrefs) {
+            try {
+                // check if exists and is valid
+                const orgFromPrefs = (await sdk.forConsole.teams.get({
+                    teamId: orgIdInPrefs
+                })) as Organization;
+
+                // exists and is valid, redirect
+                redirect(
+                    303,
+                    resolve('/(console)/organization-[organization]', {
+                        organization: orgFromPrefs.$id
+                    })
+                );
+            } catch (e) {
+                redirect(303, resolve('/(console)'));
+            }
+        } else {
+            redirect(303, resolve('/(console)'));
+        }
+    }
+
+    // send the org,
+    // if already in the full list so we don't have to make another API request.
+    return requestedOrg;
+}

src/routes/(console)/project-[region]-[project]/+layout.ts

@@ -1,15 +1,17 @@
-import { Dependencies } from '$lib/constants';
+import { defaultRoles, defaultScopes, Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
 import type { LayoutLoad } from './$types';
 import { preferences } from '$lib/stores/preferences';
 import { failedInvoice } from '$lib/stores/billing';
 import { isCloud } from '$lib/system';
-import { defaultRoles, defaultScopes } from '$lib/constants';
 import { get } from 'svelte/store';
 import { headerAlert } from '$lib/stores/headerAlert';
 import PaymentFailed from '$lib/components/billing/alerts/paymentFailed.svelte';
 import { loadAvailableRegions } from '$routes/(console)/regions';
 import type { Organization, OrganizationList } from '$lib/stores/organization';
+import { Platform } from '@appwrite.io/console';
+import { redirect } from '@sveltejs/kit';
+import { resolve } from '$app/paths';
 
 export const load: LayoutLoad = async ({ params, depends, parent }) => {
     const { plansInfo, organizations, preferences: prefs } = await parent();
@@ -38,6 +40,17 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
 
     if (!organization) organization = org;
 
+    // not the right organization project based on platform,
+    // redirect to organization, and it should handle the rest!
+    if (organization.platform !== Platform.Appwrite) {
+        redirect(
+            303,
+            resolve('/(console)/organization-[organization]', {
+                organization: organization.$id
+            })
+        );
+    }
+
     // fetch if not available in `plansInfo`.
     // out of promise.all because we filter orgs based on platform now!
     const organizationPlan = includedInBasePlans