From c8b91e402202be849bafe875c6852180d2463412 Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Tue, 22 Apr 2025 19:49:12 +0530 Subject: [PATCH] fix: oauth endpoints to follow multi region naming --- .../auth/(providers)/appleOAuth.svelte | 6 +++--- .../auth/(providers)/auth0OAuth.svelte | 6 +++--- .../auth/(providers)/authentikOAuth.svelte | 6 +++--- .../auth/(providers)/gitlabOAuth.svelte | 6 +++--- .../auth/(providers)/googleOAuth.svelte | 8 +++----- .../auth/(providers)/mainOAuth.svelte | 8 ++++---- .../auth/(providers)/microsoftOAuth.svelte | 6 +++--- .../auth/(providers)/oidcOAuth.svelte | 6 +++--- .../auth/(providers)/oktaOAuth.svelte | 6 +++--- 9 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte index f5aed0aa3..b95fcf2ac 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputSwitch, InputText, InputTextarea } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -67,7 +67,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte index 26ae7296e..484970c75 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -77,7 +77,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte index e6b99f2b4..64c8cf11f 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -77,7 +77,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte index dc1dd71a4..2debd500d 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -75,7 +75,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte index 9ddfdb74f..a9dad9828 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -68,9 +68,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte index 0e38ff2e6..b5f0a2253 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte @@ -2,11 +2,11 @@ import { page } from '$app/stores'; import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; - import { sdk } from '$lib/stores/sdk'; + import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; - import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; const projectId = $page.params.project; @@ -67,7 +67,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte index 8df2259fc..ba7565938 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -76,7 +76,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte index 0c6565f19..85c363a74 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -114,7 +114,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte index 3f73d9d13..a8ec617aa 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte @@ -3,10 +3,10 @@ import { Alert, CopyInput, Modal } from '$lib/components'; import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms'; import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers'; - import { sdk } from '$lib/stores/sdk'; + import { getApiEndpoint } from '$lib/stores/sdk'; + import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { updateOAuth } from '../updateOAuth'; - import type { Models } from '@appwrite.io/console'; const projectId = $page.params.project; @@ -86,7 +86,7 @@

URI

+ value={`${getApiEndpoint($page.params.region)}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />