mirror of
https://github.com/appwrite/console.git
synced 2026-11-18 20:47:21 +00:00
Add Appwrite provider; Improve OIDC provider
This commit is contained in:
1 parent
98b6451021
commit
16bc0d102b
4 files changed
+119
-9
No files matched your search
@@ -23,6 +23,12 @@ export const oAuthProviders: Record<string, Provider> = {
|
||||
docs: 'https://developer.apple.com/sign-in-with-apple/',
|
||||
component: Main
|
||||
},
|
||||
appwrite: {
|
||||
name: 'Appwrite',
|
||||
icon: 'appwrite',
|
||||
docs: 'https://appwrite.io/docs/products/auth/oauth2',
|
||||
component: Main
|
||||
},
|
||||
auth0: {
|
||||
name: 'Auth0',
|
||||
icon: 'auth0',
|
||||
|
||||
@@ -3,13 +3,18 @@
|
||||
import { CopyInput, Modal } from '$lib/components';
|
||||
import {
|
||||
Button,
|
||||
InputNumber,
|
||||
InputPassword,
|
||||
InputSwitch,
|
||||
InputText,
|
||||
InputTextarea
|
||||
} from '$lib/elements/forms';
|
||||
import { updateOAuth } from '../updateOAuth';
|
||||
import { OAuthProvider, type Models as ConsoleModels } from '@appwrite.io/console';
|
||||
import {
|
||||
OAuthProvider,
|
||||
ProjectOAuth2OidcPrompt,
|
||||
type Models as ConsoleModels
|
||||
} from '@appwrite.io/console';
|
||||
import type { AuthProvider } from '../updateOAuth';
|
||||
import { oAuthProviders } from '$lib/stores/oauth-providers';
|
||||
import {
|
||||
@@ -25,6 +30,7 @@
|
||||
} from '@appwrite.io/pink-svelte';
|
||||
import { IconDocument, IconPencil, IconUpload, IconX } from '@appwrite.io/pink-icons-svelte';
|
||||
import { getApiEndpoint } from '$lib/stores/sdk';
|
||||
import OidcPromptPicker from './oidcPromptPicker.svelte';
|
||||
|
||||
const projectId = page.params.project;
|
||||
const region = page.params.region;
|
||||
@@ -44,14 +50,21 @@
|
||||
let initialEnabled = false;
|
||||
let initialAppId: string | null = null;
|
||||
let initialDetailValues: Record<string, string> = {};
|
||||
let oidcPrompt: ProjectOAuth2OidcPrompt[] = [];
|
||||
let initialOidcPrompt: ProjectOAuth2OidcPrompt[] = [];
|
||||
let oidcMaxAge: number | null = null;
|
||||
let initialOidcMaxAge: number | null = null;
|
||||
|
||||
$: isOidc = provider?.key === OAuthProvider.Oidc;
|
||||
$: appIdParam = parameters.length >= 1 ? parameters[0] : null;
|
||||
$: additionalParams = parameters.slice(1);
|
||||
$: detailParams = additionalParams.filter((param) => !isSecretParam(param.$id));
|
||||
$: secretParams = additionalParams.filter((param) => isSecretParam(param.$id));
|
||||
$: basicDetailParams =
|
||||
provider?.key === OAuthProvider.Oidc
|
||||
? detailParams.filter((param) => !isOidcAdvancedParam(param.$id))
|
||||
? detailParams.filter(
|
||||
(param) => !isOidcAdvancedParam(param.$id) && !isOidcCustomParam(param.$id)
|
||||
)
|
||||
: detailParams;
|
||||
$: advancedDetailParams =
|
||||
provider?.key === OAuthProvider.Oidc
|
||||
@@ -66,11 +79,16 @@
|
||||
normalizeFieldValue(fieldValues[param.$id]) !== (initialDetailValues[param.$id] ?? '')
|
||||
);
|
||||
});
|
||||
$: hasOidcChanges =
|
||||
isOidc &&
|
||||
([...oidcPrompt].sort().join(',') !== [...initialOidcPrompt].sort().join(',') ||
|
||||
(oidcMaxAge ?? 0) !== (initialOidcMaxAge ?? 0));
|
||||
$: nothingChanged =
|
||||
enabled === initialEnabled &&
|
||||
normalizeFieldValue(appId) === normalizeFieldValue(initialAppId) &&
|
||||
!hasSecretInput &&
|
||||
!hasDetailChanges;
|
||||
!hasDetailChanges &&
|
||||
!hasOidcChanges;
|
||||
$: oAuthProvider = oAuthProviders[provider.key];
|
||||
$: secretCardTitle =
|
||||
secretParams.length === 1 ? primaryName(secretParams[0]?.name ?? '') : 'Credentials';
|
||||
@@ -90,6 +108,19 @@
|
||||
);
|
||||
p8PasteMode = {};
|
||||
showSecretInput = !appId || (provider.key === OAuthProvider.Apple && !providerKeyId);
|
||||
if (provider.key === OAuthProvider.Oidc) {
|
||||
const raw = provider as Record<string, unknown>;
|
||||
initialOidcPrompt = Array.isArray(raw['prompt'])
|
||||
? ([...(raw['prompt'] as ProjectOAuth2OidcPrompt[])] as ProjectOAuth2OidcPrompt[])
|
||||
: [];
|
||||
initialOidcMaxAge =
|
||||
typeof raw['maxAge'] === 'number' && raw['maxAge'] > 0 ? raw['maxAge'] : null;
|
||||
} else {
|
||||
initialOidcPrompt = [];
|
||||
initialOidcMaxAge = null;
|
||||
}
|
||||
oidcPrompt = [...initialOidcPrompt];
|
||||
oidcMaxAge = initialOidcMaxAge;
|
||||
error = undefined;
|
||||
}
|
||||
|
||||
@@ -151,6 +182,11 @@
|
||||
return id !== 'wellKnownURL' && id.toLowerCase().includes('url');
|
||||
}
|
||||
|
||||
// prompt and maxAge get dedicated controls in the Advanced section
|
||||
function isOidcCustomParam(id: string): boolean {
|
||||
return id === 'prompt' || id === 'maxAge';
|
||||
}
|
||||
|
||||
async function handleP8FileUpload(id: string, event: Event) {
|
||||
const input = event.target as HTMLInputElement;
|
||||
const file = input.files?.[0];
|
||||
@@ -198,6 +234,8 @@
|
||||
appId,
|
||||
secret: buildSecret(),
|
||||
details: buildDetails(),
|
||||
promptValues: isOidc ? oidcPrompt : undefined,
|
||||
maxAge: isOidc ? (oidcMaxAge ?? 0) : undefined,
|
||||
enabled
|
||||
});
|
||||
|
||||
@@ -357,7 +395,7 @@
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
{#if advancedDetailParams.length > 0}
|
||||
{#if advancedDetailParams.length > 0 || isOidc}
|
||||
<Accordion title="Advanced" badge="Optional" hideDivider>
|
||||
<Layout.Stack gap="l">
|
||||
{#each advancedDetailParams as param}
|
||||
@@ -368,6 +406,17 @@
|
||||
helper={helperText(param.hint)}
|
||||
bind:value={fieldValues[param.$id]} />
|
||||
{/each}
|
||||
{#if isOidc}
|
||||
<OidcPromptPicker bind:value={oidcPrompt} />
|
||||
<InputNumber
|
||||
id="maxAge"
|
||||
label="Max age"
|
||||
placeholder="3600"
|
||||
min={0}
|
||||
nullable
|
||||
helper="Maximum authentication age in seconds. If exceeded, the user must re-authenticate. Leave empty to disable."
|
||||
bind:value={oidcMaxAge} />
|
||||
{/if}
|
||||
</Layout.Stack>
|
||||
</Accordion>
|
||||
{/if}
|
||||
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
<script lang="ts">
|
||||
import { ProjectOAuth2OidcPrompt } from '@appwrite.io/console';
|
||||
import { Layout, Tag, Typography } from '@appwrite.io/pink-svelte';
|
||||
|
||||
type Props = {
|
||||
value: ProjectOAuth2OidcPrompt[];
|
||||
onchange?: (value: ProjectOAuth2OidcPrompt[]) => void;
|
||||
};
|
||||
|
||||
let { value = $bindable([]), onchange }: Props = $props();
|
||||
|
||||
const options: { val: ProjectOAuth2OidcPrompt; label: string }[] = [
|
||||
{ val: ProjectOAuth2OidcPrompt.None, label: 'None' },
|
||||
{ val: ProjectOAuth2OidcPrompt.Login, label: 'Login' },
|
||||
{ val: ProjectOAuth2OidcPrompt.Consent, label: 'Consent' },
|
||||
{ val: ProjectOAuth2OidcPrompt.SelectAccount, label: 'Select account' }
|
||||
];
|
||||
|
||||
function toggle(opt: ProjectOAuth2OidcPrompt): void {
|
||||
let next: ProjectOAuth2OidcPrompt[];
|
||||
if (opt === ProjectOAuth2OidcPrompt.None) {
|
||||
next = value.includes(opt) ? [] : [opt];
|
||||
} else {
|
||||
next = value.includes(opt)
|
||||
? value.filter((v) => v !== opt)
|
||||
: [...value.filter((v) => v !== ProjectOAuth2OidcPrompt.None), opt];
|
||||
}
|
||||
value = next;
|
||||
onchange?.(next);
|
||||
}
|
||||
</script>
|
||||
|
||||
<Layout.Stack gap="xs">
|
||||
<Typography.Text variant="m-500">Prompt</Typography.Text>
|
||||
<Layout.Stack direction="row" gap="s" flexWrap="wrap">
|
||||
{#each options as option (option.val)}
|
||||
<Tag size="s" selected={value.includes(option.val)} on:click={() => toggle(option.val)}>
|
||||
{option.label}
|
||||
</Tag>
|
||||
{/each}
|
||||
</Layout.Stack>
|
||||
</Layout.Stack>
|
||||
@@ -7,6 +7,7 @@ import { sdk } from '$lib/stores/sdk';
|
||||
import {
|
||||
OAuthProvider,
|
||||
ProjectOAuth2GooglePrompt,
|
||||
ProjectOAuth2OidcPrompt,
|
||||
type Models as ConsoleModels
|
||||
} from '@appwrite.io/console';
|
||||
|
||||
@@ -25,7 +26,8 @@ type Args = {
|
||||
secret: string | null;
|
||||
details: Record<string, string>;
|
||||
enabled: boolean;
|
||||
promptValues?: ProjectOAuth2GooglePrompt[];
|
||||
promptValues?: ProjectOAuth2GooglePrompt[] | ProjectOAuth2OidcPrompt[];
|
||||
maxAge?: number;
|
||||
};
|
||||
|
||||
type Return = {
|
||||
@@ -51,7 +53,8 @@ async function updateProjectOAuth({
|
||||
secret,
|
||||
details,
|
||||
enabled,
|
||||
promptValues
|
||||
promptValues,
|
||||
maxAge
|
||||
}: Args) {
|
||||
const projectSdk = sdk.forProject(region, projectId).project;
|
||||
const parsedSecret = parseSecret(secret);
|
||||
@@ -86,6 +89,12 @@ async function updateProjectOAuth({
|
||||
p8File: getSecret('p8File'),
|
||||
enabled
|
||||
});
|
||||
case OAuthProvider.Appwrite:
|
||||
return projectSdk.updateOAuth2Appwrite({
|
||||
clientId: getAppId(),
|
||||
clientSecret: getSecret(),
|
||||
enabled
|
||||
});
|
||||
case OAuthProvider.Auth0:
|
||||
return projectSdk.updateOAuth2Auth0({
|
||||
clientId: getAppId(),
|
||||
@@ -190,7 +199,7 @@ async function updateProjectOAuth({
|
||||
return projectSdk.updateOAuth2Google({
|
||||
clientId: getAppId(),
|
||||
clientSecret: getSecret(),
|
||||
prompt: promptValues ?? [],
|
||||
prompt: (promptValues as ProjectOAuth2GooglePrompt[]) ?? [],
|
||||
enabled
|
||||
});
|
||||
case OAuthProvider.Keycloak:
|
||||
@@ -234,6 +243,8 @@ async function updateProjectOAuth({
|
||||
authorizationURL: getDetail('authorizationURL'),
|
||||
tokenURL: getDetail('tokenUrl'),
|
||||
userInfoURL: getDetail('userInfoUrl'),
|
||||
prompt: (promptValues as ProjectOAuth2OidcPrompt[]) ?? [],
|
||||
maxAge: maxAge ?? 0,
|
||||
enabled
|
||||
});
|
||||
case OAuthProvider.Okta:
|
||||
@@ -353,7 +364,8 @@ export async function updateOAuth({
|
||||
secret,
|
||||
details,
|
||||
enabled,
|
||||
promptValues
|
||||
promptValues,
|
||||
maxAge
|
||||
}: Args): Promise<Return> {
|
||||
try {
|
||||
if (!isValueOfStringEnum(OAuthProvider, provider.key)) {
|
||||
@@ -368,7 +380,8 @@ export async function updateOAuth({
|
||||
secret,
|
||||
details,
|
||||
enabled,
|
||||
promptValues
|
||||
promptValues,
|
||||
maxAge
|
||||
});
|
||||
await invalidate(Dependencies.PROJECT);
|
||||
|
||||
|
||||
Reference in new issue
Block a user