From 7894a1cd4deec8f9f95409f489ab1d81498eaaee Mon Sep 17 00:00:00 2001
From: Erez Hod
Date: Sat, 24 Jun 2023 19:25:42 +0300
Subject: [PATCH 01/15] Fixed `Extraneous argument label 'status:' in call` for
Apple App setup in step 3 for `setSelfSigned` method.
---
.../overview/platforms/wizard/apple/step3.svelte | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte
index fc5b28077..d0394946f 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte
@@ -10,7 +10,7 @@
let client = Client()
.setEndpoint("${endpoint}")
.setProject("${project}")
- .setSelfSigned(status: true) // For self signed certificates, only use for development`;
+ .setSelfSigned(true) // For self signed certificates, only use for development`;
let showAlert = true;
From afe4dfa9ec8070c736c3f4107ab4df3afc68e843 Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Tue, 25 Jul 2023 17:32:35 -0700
Subject: [PATCH 02/15] Ensure console requests include project header
A change recently to Appwrite required all API calls to include the project
ID.
---
src/routes/console/+layout.ts | 7 ++++++-
.../project-[project]/overview/platforms/wizard/store.ts | 8 ++++++--
.../console/project-[project]/settings/+page.svelte | 1 +
.../project-[project]/settings/transferProject.svelte | 1 +
src/routes/register/invite/[slug]/+page.svelte | 4 +++-
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts
index 65de11ecd..184409719 100644
--- a/src/routes/console/+layout.ts
+++ b/src/routes/console/+layout.ts
@@ -2,7 +2,12 @@ import { sdk } from '$lib/stores/sdk';
import type { LayoutLoad } from './$types';
export const load: LayoutLoad = async () => {
- const response = await fetch(`${sdk.forConsole.client.config.endpoint}/health/version`);
+ const { endpoint, project } = sdk.forConsole.client.config;
+ const response = await fetch(`${endpoint}/health/version`, {
+ headers: {
+ 'X-Appwrite-Project': project
+ }
+ });
const data = await response.json();
return {
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts
index 8a00d0d35..f8e7b1b88 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts
@@ -56,8 +56,12 @@ export const versions = cachedStore<
>('versions', function ({ set }) {
return {
load: async () => {
- const { endpoint } = sdk.forConsole.client.config;
- const response = await fetch(`${endpoint}/../versions`);
+ const { endpoint, project } = sdk.forConsole.client.config;
+ const response = await fetch(`${endpoint}/../versions`, {
+ headers: {
+ 'X-Appwrite-Project': project
+ }
+ });
set(await response.json());
}
};
diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte
index 699f12ddf..be38f8bfc 100644
--- a/src/routes/console/project-[project]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/settings/+page.svelte
@@ -74,6 +74,7 @@
'PATCH',
new URL(sdk.forConsole.client.config.endpoint + path),
{
+ 'X-Appwrite-Project': sdk.forConsole.client.config.project,
'content-type': 'application/json'
},
{
diff --git a/src/routes/console/project-[project]/settings/transferProject.svelte b/src/routes/console/project-[project]/settings/transferProject.svelte
index 9e16d5611..cba255afd 100644
--- a/src/routes/console/project-[project]/settings/transferProject.svelte
+++ b/src/routes/console/project-[project]/settings/transferProject.svelte
@@ -20,6 +20,7 @@
sdk.forConsole.client.config.endpoint + '/projects/' + $project.$id + '/team'
),
{
+ 'X-Appwrite-Project': sdk.forConsole.client.config.project,
'content-type': 'application/json'
},
{
diff --git a/src/routes/register/invite/[slug]/+page.svelte b/src/routes/register/invite/[slug]/+page.svelte
index 346f737c0..c2d9deb61 100644
--- a/src/routes/register/invite/[slug]/+page.svelte
+++ b/src/routes/register/invite/[slug]/+page.svelte
@@ -54,9 +54,11 @@
async function invite() {
try {
- const res = await fetch(`${sdk.forConsole.client.config.endpoint}/account/invite`, {
+ const { endpoint, project } = sdk.forConsole.client.config;
+ const res = await fetch(`${endpoint}/account/invite`, {
method: 'POST',
headers: {
+ 'X-Appwrite-Project': project,
'Content-Type': 'application/json'
},
body: JSON.stringify({
From d6d960fec74a6e66e6faba80ecf6b3df5ca9060d Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Thu, 1 Jun 2023 17:59:50 -0700
Subject: [PATCH 03/15] Add user labels to user list and detail pages
---
src/lib/actions/analytics.ts | 1 +
.../project-[project]/auth/+page.svelte | 12 +-
.../auth/user-[user]/+page.svelte | 2 +
.../auth/user-[user]/updateLabels.svelte | 119 ++++++++++++++++++
4 files changed, 133 insertions(+), 1 deletion(-)
create mode 100644 src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte
diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index b9724ff75..664d86d46 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -118,6 +118,7 @@ export enum Submit {
UserCreate = 'submit_user_create',
UserDelete = 'submit_user_delete',
UserUpdateEmail = 'submit_user_update_email',
+ UserUpdateLabels = 'submit_user_update_labels',
UserUpdateName = 'submit_user_update_name',
UserUpdatePassword = 'submit_user_update_password',
UserUpdatePhone = 'submit_user_update_phone',
diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte
index 0063f7ea1..39252ec87 100644
--- a/src/routes/console/project-[project]/auth/+page.svelte
+++ b/src/routes/console/project-[project]/auth/+page.svelte
@@ -29,6 +29,12 @@
export let data: PageData;
+ // TODO: Remove this when the console SDK is updated
+ const users = data.users.users.map((user) => {
+ const labels: string[] = [];
+ return { labels, ...user };
+ });
+
let showCreate = false;
const projectId = $page.params.project;
async function userCreated(event: CustomEvent>>) {
@@ -49,10 +55,11 @@
Identifiers
Status
ID
+ Labels
Joined
- {#each data.users.users as user}
+ {#each users as user}
@@ -102,6 +109,9 @@
+
+ {user.labels.join(', ')}
+
{toLocaleDateTime(user.registration)}
diff --git a/src/routes/console/project-[project]/auth/user-[user]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/+page.svelte
index b48becb71..04ef2f14a 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/+page.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/+page.svelte
@@ -2,6 +2,7 @@
import { Container } from '$lib/layout';
import DangerZone from './dangerZone.svelte';
import UpdateEmail from './updateEmail.svelte';
+ import UpdateLabels from './updateLabels.svelte';
import UpdateName from './updateName.svelte';
import UpdatePassword from './updatePassword.svelte';
import UpdatePhone from './updatePhone.svelte';
@@ -15,6 +16,7 @@
+
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte
new file mode 100644
index 000000000..b8fe68150
--- /dev/null
+++ b/src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte
@@ -0,0 +1,119 @@
+
+
+
From c57a8d291844cbe63090e0d0573233ef855f70ad Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Thu, 6 Jul 2023 16:57:50 -0700
Subject: [PATCH 04/15] Show user's last activity
---
src/lib/helpers/date.ts | 10 ++++++++++
.../console/project-[project]/auth/+page.svelte | 15 +++++++++++++--
.../auth/user-[user]/dangerZone.svelte | 5 +++++
.../auth/user-[user]/updateStatus.svelte | 6 +++++-
tests/unit/helpers/date.test.ts | 8 ++++++++
5 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts
index 8558f315f..68f9c31a7 100644
--- a/src/lib/helpers/date.ts
+++ b/src/lib/helpers/date.ts
@@ -1,5 +1,10 @@
export const toLocaleDate = (datetime: string) => {
const date = new Date(datetime);
+
+ if (isNaN(date.getTime())) {
+ return 'n/a';
+ }
+
const options: Intl.DateTimeFormatOptions = {
year: 'numeric',
month: 'short',
@@ -11,6 +16,11 @@ export const toLocaleDate = (datetime: string) => {
export const toLocaleDateTime = (datetime: string | number) => {
const date = new Date(datetime);
+
+ if (isNaN(date.getTime())) {
+ return 'n/a';
+ }
+
const options: Intl.DateTimeFormatOptions = {
year: 'numeric',
month: 'short',
diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte
index 0063f7ea1..830d43793 100644
--- a/src/routes/console/project-[project]/auth/+page.svelte
+++ b/src/routes/console/project-[project]/auth/+page.svelte
@@ -19,7 +19,7 @@
TableRowLink
} from '$lib/elements/table';
import { Pill } from '$lib/elements';
- import { toLocaleDateTime } from '$lib/helpers/date';
+ import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
import { Container } from '$lib/layout';
import { base } from '$app/paths';
import { goto } from '$app/navigation';
@@ -29,6 +29,13 @@
export let data: PageData;
+ // TODO: Remove this when the console SDK is updated
+ const users = data.users.users.map((user) => {
+ const labels: string[] = [];
+ const accessedAt = '';
+ return { accessedAt, labels, ...user };
+ });
+
let showCreate = false;
const projectId = $page.params.project;
async function userCreated(event: CustomEvent>>) {
@@ -50,9 +57,10 @@
Status
ID
Joined
+ Last Activity
- {#each data.users.users as user}
+ {#each users as user}
@@ -105,6 +113,9 @@
{toLocaleDateTime(user.registration)}
+
+ {user.accessedAt ? toLocaleDate(user.accessedAt) : 'never'}
+
{/each}
diff --git a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte b/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
index 8fa2ff05d..a04d1cfc0 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
@@ -1,10 +1,14 @@
@@ -42,6 +46,7 @@
? [$user.email, $user.phone].join(',')
: $user.email || $user.phone}
+ Last activity: {accessedAt ? toLocaleDate(accessedAt) : 'never'}
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
index 60a2189d1..80fe968c8 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
@@ -5,7 +5,7 @@
import { Dependencies } from '$lib/constants';
import { Pill } from '$lib/elements';
import { Button } from '$lib/elements/forms';
- import { toLocaleDateTime } from '$lib/helpers/date';
+ import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
import { addNotification } from '$lib/stores/notifications';
import { sdk } from '$lib/stores/sdk';
import { user } from './store';
@@ -71,6 +71,9 @@
trackError(error, Submit.UserUpdateStatus);
}
}
+
+ // TODO: Remove this when the console SDK is updated
+ $: accessedAt = ($user as unknown as { accessedAt: string }).accessedAt;
@@ -100,6 +103,7 @@
{$user.phone}
{/if}
Joined: {toLocaleDateTime($user.registration)}
+ Last activity: {accessedAt ? toLocaleDate(accessedAt) : 'never'}
{#if !$user.status}
blocked
diff --git a/tests/unit/helpers/date.test.ts b/tests/unit/helpers/date.test.ts
index 16b5ff3f4..fab13619a 100644
--- a/tests/unit/helpers/date.test.ts
+++ b/tests/unit/helpers/date.test.ts
@@ -16,6 +16,10 @@ describe('local date', () => {
expect(toLocaleDate(value)).toBe(expected);
});
});
+
+ it('invalid date', () => {
+ expect(toLocaleDate('')).toBe('n/a');
+ });
});
describe('local date time', () => {
@@ -27,6 +31,10 @@ describe('local date time', () => {
expect(toLocaleDateTime(value)).toBe(expected);
});
});
+
+ it('invalid date', () => {
+ expect(toLocaleDateTime('')).toBe('n/a');
+ });
});
describe('is same day', () => {
From 28b4b9984737e94264b0a2d003b4cbc6164130ba Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Fri, 21 Jul 2023 13:42:55 -0700
Subject: [PATCH 05/15] Update API Key Last Accessed to omit time
Since accessedAt is only updated once in the last 24 hours,
showing the time can cause confusion.
---
.../console/project-[project]/overview/keys/+page.svelte | 4 ++--
.../overview/keys/[key]/+page@project-[project].svelte | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte
index 714ccea79..92cc16287 100644
--- a/src/routes/console/project-[project]/overview/keys/+page.svelte
+++ b/src/routes/console/project-[project]/overview/keys/+page.svelte
@@ -9,7 +9,7 @@
TableHeader,
TableRowLink
} from '$lib/elements/table';
- import { toLocaleDateTime } from '$lib/helpers/date';
+ import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
import { wizard } from '$lib/stores/wizard';
import type { PageData } from './$types';
import Wizard from './wizard.svelte';
@@ -46,7 +46,7 @@
{key.name}
- {key.accessedAt ? toLocaleDateTime(key.accessedAt) : 'never'}
+ {key.accessedAt ? toLocaleDate(key.accessedAt) : 'never'}
{key.expire ? toLocaleDateTime(key.expire) : 'never'}
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
index e82edaeb4..62d563158 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
+++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
@@ -5,7 +5,7 @@
import { Dependencies } from '$lib/constants';
import { Button, Form, FormList, InputText } from '$lib/elements/forms';
import { symmetricDifference } from '$lib/helpers/array';
- import { toLocaleDateTime } from '$lib/helpers/date';
+ import { toLocaleDate } from '$lib/helpers/date';
import { Container } from '$lib/layout';
import { addNotification } from '$lib/stores/notifications';
import { sdk } from '$lib/stores/sdk';
@@ -83,7 +83,7 @@
- {@const accessedAt = $key.accessedAt ? toLocaleDateTime($key.accessedAt) : 'never'}
+ {@const accessedAt = $key.accessedAt ? toLocaleDate($key.accessedAt) : 'never'}
{$key.name}
From 53abcbe90f1f77deb9b9b22d5aee039599f6f32a Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Thu, 27 Apr 2023 19:06:12 -0700
Subject: [PATCH 06/15] Add a generic OIDC OAuth2 provider
---
src/lib/stores/oauth-providers.ts | 11 +-
.../project-[project]/auth/oidcOAuth.svelte | 127 ++++++++++++++++++
static/icons/dark/color/oidc.svg | 4 +
static/icons/dark/grayscale/oidc.svg | 4 +
static/icons/light/color/oidc.svg | 4 +
static/icons/light/grayscale/oidc.svg | 4 +
6 files changed, 151 insertions(+), 3 deletions(-)
create mode 100644 src/routes/console/project-[project]/auth/oidcOAuth.svelte
create mode 100644 static/icons/dark/color/oidc.svg
create mode 100644 static/icons/dark/grayscale/oidc.svg
create mode 100644 static/icons/light/color/oidc.svg
create mode 100644 static/icons/light/grayscale/oidc.svg
diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index 40bcff26a..fbdd710cb 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -1,14 +1,15 @@
-import { writable } from 'svelte/store';
import type { Models } from '@appwrite.io/console';
import type { SvelteComponent } from 'svelte';
+import { writable } from 'svelte/store';
import Apple from '../../routes/console/project-[project]/auth/appleOAuth.svelte';
-import Microsoft from '../../routes/console/project-[project]/auth/microsoftOAuth.svelte';
-import Okta from '../../routes/console/project-[project]/auth/oktaOAuth.svelte';
import Auth0 from '../../routes/console/project-[project]/auth/auth0OAuth.svelte';
import Authentik from '../../routes/console/project-[project]/auth/authentikOAuth.svelte';
import GitLab from '../../routes/console/project-[project]/auth/gitlabOAuth.svelte';
import Google from '../../routes/console/project-[project]/auth/googleOAuth.svelte';
import Main from '../../routes/console/project-[project]/auth/mainOAuth.svelte';
+import Microsoft from '../../routes/console/project-[project]/auth/microsoftOAuth.svelte';
+import Oidc from '../../routes/console/project-[project]/auth/oidcOAuth.svelte';
+import Okta from '../../routes/console/project-[project]/auth/oktaOAuth.svelte';
export type Provider = Models.Provider & {
icon: string;
@@ -94,6 +95,10 @@ const setProviders = (project: Models.Project): Provider[] => {
case 'notion':
docs = 'https://developers.notion.com/docs';
break;
+ case 'oidc':
+ docs = 'https://openid.net/connect/faq/';
+ component = Oidc;
+ break;
case 'okta':
docs = 'https://developer.okta.com';
component = Okta;
diff --git a/src/routes/console/project-[project]/auth/oidcOAuth.svelte b/src/routes/console/project-[project]/auth/oidcOAuth.svelte
new file mode 100644
index 000000000..8c3db7df6
--- /dev/null
+++ b/src/routes/console/project-[project]/auth/oidcOAuth.svelte
@@ -0,0 +1,127 @@
+
+
+
+ {provider.name.toUpperCase()} OAuth2 Settings
+
+
+ To use {provider.name.toUpperCase()} authentication in your application, first fill in this
+ form. For more info you can
+ visit the docs.
+
+
+
+
+
+
+
+
+
+
+ To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
+
+
+
+
+ (provider = null)}>Cancel
+ Update
+
+
diff --git a/static/icons/dark/color/oidc.svg b/static/icons/dark/color/oidc.svg
new file mode 100644
index 000000000..0eb22aad2
--- /dev/null
+++ b/static/icons/dark/color/oidc.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/static/icons/dark/grayscale/oidc.svg b/static/icons/dark/grayscale/oidc.svg
new file mode 100644
index 000000000..f3a6a0937
--- /dev/null
+++ b/static/icons/dark/grayscale/oidc.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/static/icons/light/color/oidc.svg b/static/icons/light/color/oidc.svg
new file mode 100644
index 000000000..0eb22aad2
--- /dev/null
+++ b/static/icons/light/color/oidc.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/static/icons/light/grayscale/oidc.svg b/static/icons/light/grayscale/oidc.svg
new file mode 100644
index 000000000..84da2cb78
--- /dev/null
+++ b/static/icons/light/grayscale/oidc.svg
@@ -0,0 +1,4 @@
+
+
+
+
From 68867afabfd3431d65e7263edcc7d00163cd75d5 Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Thu, 20 Jul 2023 16:17:49 -0700
Subject: [PATCH 07/15] Format OAuth2 provider name better
Show provider name in the Console and use the provider key for
everything else.
---
src/lib/stores/oauth-providers.ts | 8 +++++---
.../console/project-[project]/auth/appleOAuth.svelte | 4 +---
.../console/project-[project]/auth/auth0OAuth.svelte | 4 +---
.../project-[project]/auth/authentikOAuth.svelte | 4 +---
.../console/project-[project]/auth/gitlabOAuth.svelte | 4 +---
.../console/project-[project]/auth/mainOAuth.svelte | 4 +---
.../project-[project]/auth/microsoftOAuth.svelte | 4 +---
.../console/project-[project]/auth/oidcOAuth.svelte | 10 ++++------
.../console/project-[project]/auth/oktaOAuth.svelte | 4 +---
.../project-[project]/auth/settings/+page.svelte | 2 +-
.../console/project-[project]/auth/updateOAuth.ts | 2 +-
11 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index fbdd710cb..c43a597df 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -12,6 +12,7 @@ import Oidc from '../../routes/console/project-[project]/auth/oidcOAuth.svelte';
import Okta from '../../routes/console/project-[project]/auth/oktaOAuth.svelte';
export type Provider = Models.Provider & {
+ key: string;
icon: string;
docs?: string;
component?: typeof SvelteComponent;
@@ -24,11 +25,12 @@ export type Providers = {
const setProviders = (project: Models.Project): Provider[] => {
return (
project?.providers.map((n) => {
+ const p = n as Models.Provider & { key: string };
let docs: Provider['docs'];
- let icon: Provider['icon'] = n.name.toLowerCase();
+ let icon: Provider['icon'] = p.key.toLowerCase();
let component: Provider['component'] = Main;
- switch (n.name.toLowerCase()) {
+ switch (p.key.toLowerCase()) {
case 'amazon':
docs = 'https://developer.amazon.com/apps-and-games/services-and-apis';
break;
@@ -156,7 +158,7 @@ const setProviders = (project: Models.Project): Provider[] => {
}
return {
- ...n,
+ ...p,
icon,
docs,
component
diff --git a/src/routes/console/project-[project]/auth/appleOAuth.svelte b/src/routes/console/project-[project]/auth/appleOAuth.svelte
index 88b48040c..850ae6721 100644
--- a/src/routes/console/project-[project]/auth/appleOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/appleOAuth.svelte
@@ -63,9 +63,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/auth0OAuth.svelte b/src/routes/console/project-[project]/auth/auth0OAuth.svelte
index b8e0fa35c..52e46a680 100644
--- a/src/routes/console/project-[project]/auth/auth0OAuth.svelte
+++ b/src/routes/console/project-[project]/auth/auth0OAuth.svelte
@@ -72,9 +72,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/authentikOAuth.svelte b/src/routes/console/project-[project]/auth/authentikOAuth.svelte
index 350fac230..e204be4e0 100644
--- a/src/routes/console/project-[project]/auth/authentikOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/authentikOAuth.svelte
@@ -72,9 +72,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
index 934d73801..510e4a5c6 100644
--- a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
@@ -70,9 +70,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/mainOAuth.svelte b/src/routes/console/project-[project]/auth/mainOAuth.svelte
index 684e8ff81..36d0aa89f 100644
--- a/src/routes/console/project-[project]/auth/mainOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/mainOAuth.svelte
@@ -63,9 +63,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
index e404fec84..10925962a 100644
--- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
@@ -72,9 +72,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/oidcOAuth.svelte b/src/routes/console/project-[project]/auth/oidcOAuth.svelte
index 8c3db7df6..6fade4f7f 100644
--- a/src/routes/console/project-[project]/auth/oidcOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/oidcOAuth.svelte
@@ -61,11 +61,11 @@
- {provider.name.toUpperCase()} OAuth2 Settings
+ {provider.name} OAuth2 Settings
- To use {provider.name.toUpperCase()} authentication in your application, first fill in this
- form. For more info you can
+ To use {provider.name} authentication in your application, first fill in this form. For more
+ info you can
visit the docs.
@@ -110,9 +110,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/oktaOAuth.svelte b/src/routes/console/project-[project]/auth/oktaOAuth.svelte
index 98f607df1..548a99576 100644
--- a/src/routes/console/project-[project]/auth/oktaOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/oktaOAuth.svelte
@@ -82,9 +82,7 @@
URI
+ value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte
index 42f640d07..afacc54eb 100644
--- a/src/routes/console/project-[project]/auth/settings/+page.svelte
+++ b/src/routes/console/project-[project]/auth/settings/+page.svelte
@@ -75,7 +75,7 @@
on:click={() => {
selectedProvider = provider;
trackEvent(`click_select_provider`, {
- provider: provider.name.toLowerCase()
+ provider: provider.key.toLowerCase()
});
}}>
diff --git a/src/routes/console/project-[project]/auth/updateOAuth.ts b/src/routes/console/project-[project]/auth/updateOAuth.ts
index 8e7f3272e..f148c41a3 100644
--- a/src/routes/console/project-[project]/auth/updateOAuth.ts
+++ b/src/routes/console/project-[project]/auth/updateOAuth.ts
@@ -28,7 +28,7 @@ export async function updateOAuth({
try {
await sdk.forConsole.projects.updateOAuth2(
projectId,
- provider.name.toLowerCase(),
+ provider.key,
appId || undefined,
secret || undefined,
enabled
From b118147656a7c0ae4d8beaa93048ecda7d180a79 Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Wed, 26 Jul 2023 10:27:46 -0700
Subject: [PATCH 08/15] Update user preferences text to match design
---
.../project-[project]/auth/user-[user]/updatePrefs.svelte | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte
index 08511efd2..2df1583c4 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte
@@ -56,11 +56,8 @@
- Enter a new password. A password must contain at least 8 characters.
+ Enter a new password. A password must contain at least 8 characters .
From a8ad70f66047a6460ad7810d5a63854a4dbef37a Mon Sep 17 00:00:00 2001
From: Steven Nguyen
Date: Fri, 28 Jul 2023 11:34:57 -0700
Subject: [PATCH 14/15] Update update email, password, and phone description
per Eldad's request
Use inline code for email to indicate it's a value. Remove bolding to
simplify things.
---
.../project-[project]/auth/user-[user]/updateEmail.svelte | 6 +++++-
.../auth/user-[user]/updatePassword.svelte | 4 +---
.../project-[project]/auth/user-[user]/updatePhone.svelte | 4 +---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte
index 5ffa721c0..8a18491e3 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte
@@ -36,7 +36,11 @@
Email
- Update user's email. An Email should be formatted as: name@example.com .
+
+ Update user's email. An Email should be formatted as: name@example.com .
+
-
- Enter a new password. A password must contain at least 8 characters .
-
+ Enter a new password. A password must contain at least 8 characters.