+
+
-
-
-
-
-
-
-
-
-
+ {:else}
+
+
+
+
+
+
+
+ {#if $$slots.subtitle}
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+ {/if}
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 12ef33acb1..bd6b2881b2 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -24,8 +24,6 @@ import { BillingPlan } from '$lib/constants';
import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte';
import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte';
import LimitReached from '$lib/components/billing/alerts/limitReached.svelte';
-import { wizard } from './wizard';
-import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
import { trackEvent } from '$lib/actions/analytics';
export type Tier = 'tier-0' | 'tier-1' | 'tier-2';
@@ -239,7 +237,7 @@ export async function checkForUsageLimit(org: Organization) {
{
name: 'Upgrade plan',
method: () => {
- wizard.start(ChangeOrganizationTierCloud);
+ goto(`${base}/console/organization-${org.$id}/change-plan`);
trackEvent('click_organization_upgrade', {
from: 'button',
source: 'limit_reached_notification'
@@ -364,3 +362,10 @@ export async function checkForMissingPaymentMethod() {
});
}
}
+
+export const upgradeURL = derived(
+ page,
+ ($page) => `${base}/console/organization-${$page.data?.organization?.$id}/change-plan`
+);
+
+export const hideBillingHeaderRoutes = ['/console/create-organization', '/console/account'];
diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts
index 19f590a16d..7fe6e514e1 100644
--- a/src/lib/stores/marketplace.ts
+++ b/src/lib/stores/marketplace.ts
@@ -1762,6 +1762,46 @@ export const marketplace: MarketplaceTemplate[] = [
}
]
},
+ {
+ icon: 'icon-chip',
+ id: 'chat-with-anyscale',
+ name: 'Chat with AnyScale',
+ tagline: 'Create a chatbot using the AnyScale API.',
+ permissions: ['any'],
+ cron: '',
+ events: [],
+ timeout: 15,
+ usecases: ['AI'],
+ runtimes: [
+ ...getRuntimes(
+ TemplateRuntimes.NODE,
+ 'npm install',
+ 'src/main.js',
+ 'node/chat-with-anyscale'
+ )
+ ],
+ instructions: `For documentation and instructions check out
file.`,
+ vcsProvider: 'github',
+ providerRepositoryId: 'templates',
+ providerOwner: 'appwrite',
+ providerBranch: 'main',
+ variables: [
+ {
+ name: 'ANYSCALE_API_KEY',
+ description: `A unique key used to authenticate with the AnyScale API.
Learn more.`,
+ placeholder: 'd03xxxxxxxx26',
+ required: true,
+ type: 'password'
+ },
+ {
+ name: 'ANYSCALE_MAX_TOKENS',
+ description: `The maximum number of tokens that Anyscale responses should contain.
Learn more.`,
+ placeholder: '',
+ required: false,
+ type: 'number'
+ }
+ ]
+ },
{
icon: 'icon-music-note',
id: 'music-generation-with-huggingface',
diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index 8d08dffdb9..2cb2ddd3fd 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -1,6 +1,4 @@
-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/(providers)/appleOAuth.svelte';
import Auth0 from '../../routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte';
import Authentik from '../../routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte';
@@ -11,176 +9,240 @@ import Microsoft from '../../routes/console/project-[project]/auth/(providers)/m
import Oidc from '../../routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte';
import Okta from '../../routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte';
-export type Provider = Models.AuthProvider & {
+export type Provider = {
+ name: string;
icon: string;
docs?: string;
- component?: typeof SvelteComponent
;
+ component: typeof SvelteComponent;
};
-export type Providers = {
- providers: Provider[];
+export const oAuthProviders: Record = {
+ amazon: {
+ name: 'Amazon',
+ icon: 'amazon',
+ docs: 'https://developer.amazon.com/apps-and-games/services-and-apis',
+ component: Main
+ },
+ apple: {
+ name: 'Apple',
+ icon: 'apple',
+ docs: 'https://developer.apple.com/',
+ component: Apple
+ },
+ auth0: {
+ name: 'Auth0',
+ icon: 'auth0',
+ docs: 'https://auth0.com/developers',
+ component: Auth0
+ },
+ authentik: {
+ name: 'Authentik',
+ icon: 'authentik',
+ docs: 'https://goauthentik.io/integrations/sources/oauth/',
+ component: Authentik
+ },
+ autodesk: {
+ name: 'Autodesk',
+ icon: 'autodesk',
+ docs: 'https://forge.autodesk.com/en/docs/oauth/v2/developers_guide/overview/',
+ component: Main
+ },
+ bitbucket: {
+ name: 'Bitbucket',
+ icon: 'bitbucket',
+ docs: 'https://developer.atlassian.com/bitbucket',
+ component: Main
+ },
+ bitly: {
+ name: 'Bitly',
+ icon: 'bitly',
+ docs: 'https://dev.bitly.com/v4_documentation.html',
+ component: Main
+ },
+ box: {
+ name: 'Box',
+ icon: 'box',
+ docs: 'https://developer.box.com/reference/',
+ component: Main
+ },
+ dailymotion: {
+ name: 'Dailymotion',
+ icon: 'dailymotion',
+ docs: 'https://developers.dailymotion.com/api/',
+ component: Main
+ },
+ discord: {
+ name: 'Discord',
+ icon: 'discord',
+ docs: 'https://discordapp.com/developers/docs/topics/oauth2',
+ component: Main
+ },
+ disqus: {
+ name: 'Disqus',
+ icon: 'disqus',
+ docs: 'https://disqus.com/api/docs/auth/',
+ component: Main
+ },
+ dropbox: {
+ name: 'Dropbox',
+ icon: 'dropbox',
+ docs: 'https://www.dropbox.com/developers/documentation',
+ component: Main
+ },
+ etsy: {
+ name: 'Etsy',
+ icon: 'etsy',
+ docs: 'https://developers.etsy.com/',
+ component: Main
+ },
+ facebook: {
+ name: 'Facebook',
+ icon: 'facebook',
+ docs: 'https://developers.facebook.com/',
+ component: Main
+ },
+ github: {
+ name: 'GitHub',
+ icon: 'github',
+ docs: 'https://developer.github.com',
+ component: Main
+ },
+ gitlab: {
+ name: 'GitLab',
+ icon: 'gitlab',
+ docs: 'https://docs.gitlab.com/ee/api/',
+ component: GitLab
+ },
+ google: {
+ name: 'Google',
+ icon: 'google',
+ docs: 'https://support.google.com/googleapi/answer/6158849',
+ component: Google
+ },
+ linkedin: {
+ name: 'LinkedIn',
+ icon: 'linkedin',
+ docs: 'https://developer.linkedin.com/',
+ component: Main
+ },
+ microsoft: {
+ name: 'Microsoft',
+ icon: 'microsoft',
+ docs: 'https://developer.microsoft.com/en-us/',
+ component: Microsoft
+ },
+ notion: {
+ name: 'Notion',
+ icon: 'notion',
+ docs: 'https://developers.notion.com/docs',
+ component: Main
+ },
+ oidc: {
+ name: 'OIDC',
+ icon: 'oidc',
+ docs: 'https://openid.net/connect/faq/',
+ component: Oidc
+ },
+ okta: {
+ name: 'Okta',
+ icon: 'okta',
+ docs: 'https://developer.okta.com',
+ component: Okta
+ },
+ paypal: {
+ name: 'Paypal',
+ icon: 'paypal',
+ docs: 'https://developer.paypal.com/docs/api/overview/',
+ component: Main
+ },
+ paypalsandbox: {
+ name: 'Paypal Sandbox',
+ icon: 'paypal',
+ docs: 'https://developer.paypal.com/docs/api/overview/',
+ component: Main
+ },
+ podio: {
+ name: 'Podio',
+ icon: 'podio',
+ docs: 'https://developers.podio.com/doc/oauth-authorization',
+ component: Main
+ },
+ salesforce: {
+ name: 'Salesforce',
+ icon: 'salesforce',
+ docs: 'https://developer.salesforce.com/docs/',
+ component: Main
+ },
+ slack: {
+ name: 'Slack',
+ icon: 'slack',
+ docs: 'https://api.slack.com/',
+ component: Main
+ },
+ spotify: {
+ name: 'Spotify',
+ icon: 'spotify',
+ docs: 'https://developer.spotify.com/documentation/general/guides/authorization-guide/',
+ component: Main
+ },
+ stripe: {
+ name: 'Stripe',
+ icon: 'stripe',
+ docs: 'https://stripe.com/docs/api',
+ component: Main
+ },
+ tradeshift: {
+ name: 'Tradeshift',
+ icon: 'tradeshift',
+ docs: 'https://developers.tradeshift.com/docs/api',
+ component: Main
+ },
+ tradeshiftBox: {
+ name: 'Tradeshift Sandbox',
+ icon: 'tradeshift',
+ docs: 'https://developers.tradeshift.com/docs/api',
+ component: Main
+ },
+ twitch: {
+ name: 'Twitch',
+ icon: 'twitch',
+ docs: 'https://dev.twitch.tv/docs/auth',
+ component: Main
+ },
+ wordpress: {
+ name: 'Wordpress',
+ icon: 'wordpress',
+ docs: 'https://developer.wordpress.com/docs/oauth2/',
+ component: Main
+ },
+ yahoo: {
+ name: 'Yahoo',
+ icon: 'yahoo',
+ docs: 'https://developer.yahoo.com/oauth2/guide/flows_authcode/',
+ component: Main
+ },
+ yammer: {
+ name: 'Yammer',
+ icon: 'yammer',
+ docs: 'https://developer.yammer.com/docs/oauth-2',
+ component: Main
+ },
+ yandex: {
+ name: 'Yandex',
+ icon: 'yandex',
+ docs: 'https://tech.yandex.com/oauth/',
+ component: Main
+ },
+ zoho: {
+ name: 'Zoho',
+ icon: 'zoho',
+ docs: 'https://www.zoho.com/crm/developer/docs/api/oauth-overview.html',
+ component: Main
+ },
+ zoom: {
+ name: 'Zoom',
+ icon: 'zoom',
+ docs: 'https://marketplace.zoom.us/docs/guides/auth/oauth/',
+ component: Main
+ }
};
-
-const setProviders = (project: Models.Project): Provider[] => {
- return (
- project?.oAuthProviders.map((n) => {
- let docs: Provider['docs'];
- let icon: Provider['icon'] = n.key.toLowerCase();
- let component: Provider['component'] = Main;
-
- switch (n.key.toLowerCase()) {
- case 'amazon':
- docs = 'https://developer.amazon.com/apps-and-games/services-and-apis';
- break;
- case 'apple':
- docs = 'https://developer.apple.com/';
- component = Apple;
- break;
- case 'auth0':
- docs = 'https://auth0.com/developers';
- component = Auth0;
- break;
- case 'authentik':
- docs = 'https://goauthentik.io/integrations/sources/oauth/';
- component = Authentik;
- break;
- case 'autodesk':
- docs = 'https://forge.autodesk.com/en/docs/oauth/v2/developers_guide/overview/';
- break;
- case 'bitbucket':
- docs = 'https://developer.atlassian.com/bitbucket';
- break;
- case 'bitly':
- docs = 'https://dev.bitly.com/v4_documentation.html';
- break;
- case 'box':
- docs = 'https://developer.box.com/reference/';
- break;
- case 'dailymotion':
- docs = 'https://developers.dailymotion.com/api/';
- break;
- case 'discord':
- docs = 'https://discordapp.com/developers/docs/topics/oauth2';
- break;
- case 'disqus':
- docs = 'https://disqus.com/api/docs/auth/';
- break;
- case 'dropbox':
- docs = 'https://www.dropbox.com/developers/documentation';
- break;
- case 'etsy':
- docs = 'https://developers.etsy.com/';
- break;
- case 'facebook':
- docs = 'https://developers.facebook.com/';
- break;
- case 'github':
- docs = 'https://developer.github.com';
- break;
- case 'gitlab':
- docs = 'https://docs.gitlab.com/ee/api/';
- component = GitLab;
- break;
- case 'google':
- docs = 'https://support.google.com/googleapi/answer/6158849';
- component = Google;
- break;
- case 'linkedin':
- docs = 'https://developer.linkedin.com/';
- break;
- case 'microsoft':
- docs = 'https://developer.microsoft.com/en-us/';
- component = Microsoft;
- break;
- 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;
- break;
- case 'paypal':
- docs = 'https://developer.paypal.com/docs/api/overview/';
- break;
- case 'paypalsandbox':
- icon = 'paypal';
- docs = 'https://developer.paypal.com/docs/api/overview/';
- break;
- case 'podio':
- docs = 'https://developers.podio.com/doc/oauth-authorization';
- break;
- case 'salesforce':
- docs = 'https://developer.salesforce.com/docs/';
- break;
- case 'slack':
- docs = 'https://api.slack.com/';
- break;
- case 'spotify':
- docs =
- 'https://developer.spotify.com/documentation/general/guides/authorization-guide/';
- break;
- case 'stripe':
- docs = 'https://stripe.com/docs/api';
- break;
- case 'tradeshift':
- docs = 'https://developers.tradeshift.com/docs/api';
- break;
- case 'tradeshiftbox':
- icon = 'tradeshift';
- docs = 'https://developers.tradeshift.com/docs/api';
- break;
- case 'twitch':
- docs = 'https://dev.twitch.tv/docs/auth';
- break;
- case 'wordpress':
- docs = 'https://developer.wordpress.com/docs/oauth2/';
- break;
- case 'yahoo':
- docs = 'https://developer.yahoo.com/oauth2/guide/flows_authcode/';
- break;
- case 'yammer':
- docs = 'https://developer.yammer.com/docs/oauth-2';
- break;
- case 'yandex':
- docs = 'https://tech.yandex.com/oauth/';
- break;
- case 'zoho':
- docs = 'https://www.zoho.com/accounts/protocol/oauth/sign-in-using-zoho.html';
- break;
- case 'zoom':
- docs = 'https://marketplace.zoom.us/docs/guides/auth/oauth/';
- break;
- default:
- break;
- }
-
- return {
- ...n,
- icon,
- docs,
- component
- };
- }) ?? []
- );
-};
-
-function createOAuthProviders() {
- const { subscribe, set } = writable({
- providers: setProviders(null)
- });
- return {
- subscribe,
- set,
- load: (project: Models.Project) => {
- const providers = setProviders(project);
-
- set({ providers });
- }
- };
-}
-
-export const OAuthProviders = createOAuthProviders();
diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index bcc19f123e..08a18f1195 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -7,10 +7,6 @@
variables[variable.name] = variable.value ?? '';
});
- if (!runtime) {
- runtime = template.runtimes[0].name;
- }
-
templateStore.set(template);
templateConfig.set({
$id: null,
diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte
index 7da879c825..536d32b949 100644
--- a/src/lib/wizards/functions/steps/templateConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte
@@ -57,7 +57,7 @@
id="runtime"
placeholder="Select runtime"
required
- disabled={options.length <= 1}
+ disabled={options.length < 1}
{options}
bind:value={$templateConfig.runtime} />
{/await}
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index bbd662525f..85ad4e83d9 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -42,12 +42,13 @@ export const load: LayoutLoad = async ({ depends, url }) => {
const path = url.search ? `${url.search}&${redirectUrl}` : `?${redirectUrl}`;
if (error.type === 'user_more_factors_required') {
- if (url.pathname === '/mfa') return;
+ if (url.pathname === '/mfa') return {}; // Ensure any previous account/organizations are cleared
redirect(303, `/mfa${path}`);
}
if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) {
redirect(303, `/login${path}`);
}
+ return {}; // Ensure any previous account/organizations are cleared
}
};
diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/console/(migration-wizard)/resource-form.svelte
index 41d39cee0a..66a2fadb6b 100644
--- a/src/routes/console/(migration-wizard)/resource-form.svelte
+++ b/src/routes/console/(migration-wizard)/resource-form.svelte
@@ -193,8 +193,8 @@
isStandalone
buttons={[
{
- name: 'Learn more',
- method() {
+ slot: 'Learn more',
+ onClick() {
wizard.updateStep((p) => p - 1);
}
}
@@ -213,8 +213,8 @@
isStandalone
buttons={[
{
- name: 'Edit credentials',
- method() {
+ slot: 'Edit credentials',
+ onClick() {
wizard.updateStep((p) => p - 1);
}
}
diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts
index 3c2496e846..c1de917107 100644
--- a/src/routes/console/+layout.ts
+++ b/src/routes/console/+layout.ts
@@ -5,7 +5,9 @@ import { sdk } from '$lib/stores/sdk';
import { isCloud } from '$lib/system';
import type { LayoutLoad } from './$types';
-export const load: LayoutLoad = async ({ fetch, depends }) => {
+export const load: LayoutLoad = async ({ fetch, depends, parent }) => {
+ await parent(); // ensure user is authenticated before proceeding
+
depends(Dependencies.RUNTIMES);
depends(Dependencies.CONSOLE_VARIABLES);
diff --git a/src/routes/console/account/+layout.ts b/src/routes/console/account/+layout.ts
index 2341ee3c08..1c993bedf2 100644
--- a/src/routes/console/account/+layout.ts
+++ b/src/routes/console/account/+layout.ts
@@ -6,9 +6,18 @@ import { Dependencies } from '$lib/constants';
export const load: LayoutLoad = async ({ depends }) => {
depends(Dependencies.FACTORS);
+ depends(Dependencies.IDENTITIES);
+
+ const promises = [
+ sdk.forConsole.account.listMfaFactors(),
+ sdk.forConsole.account.listIdentities()
+ ];
+
+ const [factors, identities] = await Promise.all(promises);
return {
- factors: await sdk.forConsole.account.listMfaFactors(),
+ factors,
+ identities,
header: Header,
breadcrumbs: Breadcrumbs
};
diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte
index 1006770d86..b3cbe4f572 100644
--- a/src/routes/console/account/+page.svelte
+++ b/src/routes/console/account/+page.svelte
@@ -5,12 +5,14 @@
import UpdateEmail from './updateEmail.svelte';
import DeleteAccount from './deleteAccount.svelte';
import UpdateMfa from './updateMfa.svelte';
+ import Identities from './identities.svelte';
+
diff --git a/src/routes/console/account/identities.svelte b/src/routes/console/account/identities.svelte
new file mode 100644
index 0000000000..44ad5b772e
--- /dev/null
+++ b/src/routes/console/account/identities.svelte
@@ -0,0 +1,101 @@
+
+
+
+ Identities
+
+ Identities are your connected GitHub accounts. You can sign in using these accounts.
+
+
+
+ {#if $identities.length === 0}
+
+
+ No identities are currently available. Once you sign in via GitHub, you'll see
+ it here.
+
+
+ {:else}
+
+
+ Provider
+ Email
+ Created At
+ Expiry Date
+
+
+
+ {#each $identities as identity (identity.$id)}
+ {@const provider = oAuthProviders[identity.provider]}
+
+
+
+
+
+
+ {provider.name}
+
+ {/if}
+
+
diff --git a/src/routes/console/account/mfaRecoveryCodes.svelte b/src/routes/console/account/mfaRecoveryCodes.svelte
index a3a22c22ee..63ec5d0fa4 100644
--- a/src/routes/console/account/mfaRecoveryCodes.svelte
+++ b/src/routes/console/account/mfaRecoveryCodes.svelte
@@ -27,7 +27,7 @@