From b69783d8ff3defec58e677e2a2b81fca3c0b6881 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 4 Jul 2022 14:33:14 +0200 Subject: [PATCH 1/5] fix: wrong text --- src/routes/console/[project]/users/_createTeam.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/[project]/users/_createTeam.svelte b/src/routes/console/[project]/users/_createTeam.svelte index 5356238cd..fa1981b52 100644 --- a/src/routes/console/[project]/users/_createTeam.svelte +++ b/src/routes/console/[project]/users/_createTeam.svelte @@ -46,7 +46,7 @@ {:else} Team ID -

Enter a custom user ID. Leave blank for a randomly generated user ID.

+

Enter a custom team ID. Leave blank for a randomly generated team ID.

Date: Mon, 4 Jul 2022 15:58:13 +0200 Subject: [PATCH 2/5] feat: move authMethods to the store folder --- src/lib/stores/authMethods.ts | 71 +++++++++++++++++++ src/routes/console/[project]/users/auth.ts | 68 ------------------ .../[project]/users/authentication.svelte | 3 +- 3 files changed, 73 insertions(+), 69 deletions(-) create mode 100644 src/lib/stores/authMethods.ts diff --git a/src/lib/stores/authMethods.ts b/src/lib/stores/authMethods.ts new file mode 100644 index 000000000..411a4c18b --- /dev/null +++ b/src/lib/stores/authMethods.ts @@ -0,0 +1,71 @@ +import { writable } from 'svelte/store'; +import type { Models } from '@aw-labs/appwrite-console'; + +function createAuthMethods() { + const { subscribe, set } = writable({ + list: [ + { + label: 'Password', + method: 'email-password', + value: null + }, + { + label: 'Magic URL', + method: 'magic-url', + value: null + }, + { + label: 'Anonymous', + method: 'anonymous', + value: null + }, + { + label: 'Invites', + method: 'invites', + value: null + }, + { + label: 'JWT', + method: 'jwt', + value: null + } + ] + }); + + return { + subscribe, + set, + load: (project: Models.Project) => { + const list = [ + { + label: 'Password', + method: 'email-password', + value: project.authEmailPassword + }, + { + label: 'Magic URL', + method: 'magic-url', + value: project.authUsersAuthMagicURL + }, + { + label: 'Anonymous', + method: 'anonymous', + value: project.authAnonymous + }, + { + label: 'Invites', + method: 'invites', + value: project.authInvites + }, + { + label: 'JWT', + method: 'jwt', + value: project.authJWT + } + ]; + set({ list }); + } + }; +} + +export const authMethods = createAuthMethods(); diff --git a/src/routes/console/[project]/users/auth.ts b/src/routes/console/[project]/users/auth.ts index 007e7bf6b..b3c111909 100644 --- a/src/routes/console/[project]/users/auth.ts +++ b/src/routes/console/[project]/users/auth.ts @@ -7,7 +7,6 @@ import Okta from './_oktaOAuth.svelte'; import Auth0 from './_auth0OAuth.svelte'; import Main from './_mainOAuth.svelte'; -export type AuthMethod = { label: string; method: string; value: boolean }; export type Provider = { name: string; icon: string; @@ -22,72 +21,6 @@ export type Providers = { providers: Provider[]; }; -function createAuthMethods() { - const { subscribe, set } = writable({ - list: [ - { - label: 'Password', - method: 'email-password', - value: null - }, - { - label: 'Magic URL', - method: 'magic-url', - value: null - }, - { - label: 'Anonymous', - method: 'anonymous', - value: null - }, - { - label: 'Invites', - method: 'invites', - value: null - }, - { - label: 'JWT', - method: 'jwt', - value: null - } - ] - }); - - return { - subscribe, - set, - load: (project: Models.Project) => { - const list = [ - { - label: 'Password', - method: 'email-password', - value: project.authEmailPassword - }, - { - label: 'Magic URL', - method: 'magic-url', - value: project.authUsersAuthMagicURL - }, - { - label: 'Anonymous', - method: 'anonymous', - value: project.authAnonymous - }, - { - label: 'Invites', - method: 'invites', - value: project.authInvites - }, - { - label: 'JWT', - method: 'jwt', - value: project.authJWT - } - ]; - set({ list }); - } - }; -} function createOAuthProviders() { const { subscribe, set } = writable({ providers: [ @@ -647,5 +580,4 @@ function createOAuthProviders() { }; } -export const authMethods = createAuthMethods(); export const OAuthProviders = createOAuthProviders(); diff --git a/src/routes/console/[project]/users/authentication.svelte b/src/routes/console/[project]/users/authentication.svelte index aa2618ac2..5804fccc7 100644 --- a/src/routes/console/[project]/users/authentication.svelte +++ b/src/routes/console/[project]/users/authentication.svelte @@ -6,7 +6,8 @@ import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import { project } from '../store'; - import { authMethods, OAuthProviders } from './auth'; + import { OAuthProviders } from './auth'; + import { authMethods } from '$lib/stores/authMethods'; import type { Provider } from './auth'; $: projectId = $project.$id; From 8cf9ca68f5429285804247f4f09d1d25ddea17fd Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 4 Jul 2022 16:21:06 +0200 Subject: [PATCH 3/5] feat: move oauthProviders to the store folder --- .../users/auth.ts => lib/stores/oauthProviders.ts} | 10 +++++----- .../console/[project]/users/authentication.svelte | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename src/{routes/console/[project]/users/auth.ts => lib/stores/oauthProviders.ts} (98%) diff --git a/src/routes/console/[project]/users/auth.ts b/src/lib/stores/oauthProviders.ts similarity index 98% rename from src/routes/console/[project]/users/auth.ts rename to src/lib/stores/oauthProviders.ts index b3c111909..45512bc7c 100644 --- a/src/routes/console/[project]/users/auth.ts +++ b/src/lib/stores/oauthProviders.ts @@ -1,11 +1,11 @@ import { writable } from 'svelte/store'; import type { Models } from '@aw-labs/appwrite-console'; import type { SvelteComponent } from 'svelte'; -import Apple from './_appleOAuth.svelte'; -import Microsoft from './_microsoftOAuth.svelte'; -import Okta from './_oktaOAuth.svelte'; -import Auth0 from './_auth0OAuth.svelte'; -import Main from './_mainOAuth.svelte'; +import Apple from '../../routes/console/[project]/users/_appleOAuth.svelte'; +import Microsoft from '../../routes/console/[project]/users/_microsoftOAuth.svelte'; +import Okta from '../../routes/console/[project]/users/_oktaOAuth.svelte'; +import Auth0 from '../../routes/console/[project]/users/_auth0OAuth.svelte'; +import Main from '../../routes/console/[project]/users/_mainOAuth.svelte'; export type Provider = { name: string; diff --git a/src/routes/console/[project]/users/authentication.svelte b/src/routes/console/[project]/users/authentication.svelte index 5804fccc7..759601d1f 100644 --- a/src/routes/console/[project]/users/authentication.svelte +++ b/src/routes/console/[project]/users/authentication.svelte @@ -6,9 +6,9 @@ import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import { project } from '../store'; - import { OAuthProviders } from './auth'; import { authMethods } from '$lib/stores/authMethods'; - import type { Provider } from './auth'; + import { OAuthProviders } from '$lib/stores/oauthProviders'; + import type { Provider } from '$lib/stores/oauthProviders'; $: projectId = $project.$id; $: authMethods.load($project); From 8370cc8be71fb14765818bab90b19abdcc5f0d6b Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 4 Jul 2022 16:26:09 +0200 Subject: [PATCH 4/5] fix: changed naming convenction --- src/lib/stores/{authMethods.ts => auth-methods.ts} | 0 src/lib/stores/{oauthProviders.ts => oauth-providers.ts} | 0 src/routes/console/[project]/users/authentication.svelte | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/lib/stores/{authMethods.ts => auth-methods.ts} (100%) rename src/lib/stores/{oauthProviders.ts => oauth-providers.ts} (100%) diff --git a/src/lib/stores/authMethods.ts b/src/lib/stores/auth-methods.ts similarity index 100% rename from src/lib/stores/authMethods.ts rename to src/lib/stores/auth-methods.ts diff --git a/src/lib/stores/oauthProviders.ts b/src/lib/stores/oauth-providers.ts similarity index 100% rename from src/lib/stores/oauthProviders.ts rename to src/lib/stores/oauth-providers.ts diff --git a/src/routes/console/[project]/users/authentication.svelte b/src/routes/console/[project]/users/authentication.svelte index 759601d1f..e17014996 100644 --- a/src/routes/console/[project]/users/authentication.svelte +++ b/src/routes/console/[project]/users/authentication.svelte @@ -6,9 +6,9 @@ import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import { project } from '../store'; - import { authMethods } from '$lib/stores/authMethods'; - import { OAuthProviders } from '$lib/stores/oauthProviders'; - import type { Provider } from '$lib/stores/oauthProviders'; + import { authMethods } from '$lib/stores/auth-methods'; + import { OAuthProviders } from '$lib/stores/oauth-providers'; + import type { Provider } from '$lib/stores/oauth-providers'; $: projectId = $project.$id; $: authMethods.load($project); From fa27262951dc02751916ca6a1067819c75e56ec3 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 4 Jul 2022 16:42:56 +0200 Subject: [PATCH 5/5] fix: update imports --- src/routes/console/[project]/users/_appleOAuth.svelte | 2 +- src/routes/console/[project]/users/_auth0OAuth.svelte | 2 +- src/routes/console/[project]/users/_mainOAuth.svelte | 2 +- src/routes/console/[project]/users/_microsoftOAuth.svelte | 2 +- src/routes/console/[project]/users/_oktaOAuth.svelte | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/routes/console/[project]/users/_appleOAuth.svelte b/src/routes/console/[project]/users/_appleOAuth.svelte index 2ed3270af..21b1b8a4d 100644 --- a/src/routes/console/[project]/users/_appleOAuth.svelte +++ b/src/routes/console/[project]/users/_appleOAuth.svelte @@ -11,7 +11,7 @@ } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import type { Provider } from './auth'; + import type { Provider } from '$lib/stores/oauth-providers'; export let showModal = false; export let provider: Provider; diff --git a/src/routes/console/[project]/users/_auth0OAuth.svelte b/src/routes/console/[project]/users/_auth0OAuth.svelte index a663da53a..9fe0625a6 100644 --- a/src/routes/console/[project]/users/_auth0OAuth.svelte +++ b/src/routes/console/[project]/users/_auth0OAuth.svelte @@ -11,7 +11,7 @@ } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import type { Provider } from './auth'; + import type { Provider } from '$lib/stores/oauth-providers'; export let showModal = false; export let provider: Provider; diff --git a/src/routes/console/[project]/users/_mainOAuth.svelte b/src/routes/console/[project]/users/_mainOAuth.svelte index 5e0f2e8bc..f913262e7 100644 --- a/src/routes/console/[project]/users/_mainOAuth.svelte +++ b/src/routes/console/[project]/users/_mainOAuth.svelte @@ -11,7 +11,7 @@ } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import type { Provider } from './auth'; + import type { Provider } from '$lib/stores/oauth-providers'; export let showModal = false; export let provider: Provider; diff --git a/src/routes/console/[project]/users/_microsoftOAuth.svelte b/src/routes/console/[project]/users/_microsoftOAuth.svelte index 7f90931c3..6a940e210 100644 --- a/src/routes/console/[project]/users/_microsoftOAuth.svelte +++ b/src/routes/console/[project]/users/_microsoftOAuth.svelte @@ -11,7 +11,7 @@ } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import type { Provider } from './auth'; + import type { Provider } from '$lib/stores/oauth-providers'; export let showModal = false; export let provider: Provider; diff --git a/src/routes/console/[project]/users/_oktaOAuth.svelte b/src/routes/console/[project]/users/_oktaOAuth.svelte index e84d025ba..990dd6122 100644 --- a/src/routes/console/[project]/users/_oktaOAuth.svelte +++ b/src/routes/console/[project]/users/_oktaOAuth.svelte @@ -11,7 +11,7 @@ } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import type { Provider } from './auth'; + import type { Provider } from '$lib/stores/oauth-providers'; export let showModal = false; export let provider: Provider;