diff --git a/package.json b/package.json index 19eabd338..44d91fb0f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@fcbaa54", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c0da899", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c05481375..d2f724444 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.1.24 version: 1.1.24(svelte@5.25.3)(zod@3.24.3) '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@fcbaa54 - version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@fcbaa54 + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c0da899 + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c0da899 '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 @@ -260,8 +260,8 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@fcbaa54': - resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@fcbaa54} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c0da899': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c0da899} version: 1.10.0 '@appwrite.io/pink-icons-svelte@2.0.0-RC.1': @@ -3696,7 +3696,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@fcbaa54': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c0da899': {} '@appwrite.io/pink-icons-svelte@2.0.0-RC.1(svelte@5.25.3)': dependencies: diff --git a/src/routes/(authenticated)/git/authorize-contributor/+page.svelte b/src/routes/(authenticated)/git/authorize-contributor/+page.svelte index 0c1717dc4..9a5d8e99e 100644 --- a/src/routes/(authenticated)/git/authorize-contributor/+page.svelte +++ b/src/routes/(authenticated)/git/authorize-contributor/+page.svelte @@ -38,11 +38,11 @@ success = ''; try { - await vcs.updateExternalDeployments( + await vcs.updateExternalDeployments({ installationId, repositoryId, providerPullRequestId - ); + }); success = 'Deployment approved successfully! Build will start soon.'; } catch (e) { error = e.message; diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts index 0f9806e08..5aa188f90 100644 --- a/src/routes/(console)/+layout.ts +++ b/src/routes/(console)/+layout.ts @@ -34,10 +34,9 @@ export const load: LayoutLoad = async ({ depends, parent }) => { if (currentOrgId) { try { projectsCount = ( - await sdk.forConsole.projects.list([ - Query.equal('teamId', currentOrgId), - Query.limit(1) - ]) + await sdk.forConsole.projects.list({ + queries: [Query.equal('teamId', currentOrgId), Query.limit(1)] + }) ).total; } catch (e) { projectsCount = 0; diff --git a/src/routes/(console)/account/+layout.ts b/src/routes/(console)/account/+layout.ts index 5056d0391..901bf8a83 100644 --- a/src/routes/(console)/account/+layout.ts +++ b/src/routes/(console)/account/+layout.ts @@ -9,7 +9,7 @@ export const load: LayoutLoad = async ({ depends }) => { depends(Dependencies.IDENTITIES); const [factors, identities] = await Promise.all([ - sdk.forConsole.account.listMfaFactors(), + sdk.forConsole.account.listMFAFactors(), sdk.forConsole.account.listIdentities() ]); diff --git a/src/routes/(console)/onboarding/create-project/+page.svelte b/src/routes/(console)/onboarding/create-project/+page.svelte index 8da8315ce..326a3b74a 100644 --- a/src/routes/(console)/onboarding/create-project/+page.svelte +++ b/src/routes/(console)/onboarding/create-project/+page.svelte @@ -38,12 +38,12 @@ try { const teamId = data.organization.$id; - const project = await sdk.forConsole.projects.create( - id ?? ID.unique(), - projectName, + const project = await sdk.forConsole.projects.create({ + projectId: id ?? ID.unique(), + name: projectName, teamId, - isCloud ? region : undefined - ); + region: isCloud ? region : undefined + }); markOnboardingComplete(); diff --git a/src/routes/(console)/onboarding/create-project/+page.ts b/src/routes/(console)/onboarding/create-project/+page.ts index 808f43366..6413f6e74 100644 --- a/src/routes/(console)/onboarding/create-project/+page.ts +++ b/src/routes/(console)/onboarding/create-project/+page.ts @@ -52,10 +52,10 @@ export const load: PageLoad = async ({ parent }) => { } else { return { accountPrefs, - organization: await sdk.forConsole.teams.create( - ID.unique(), - 'Personal projects' - ) + organization: await sdk.forConsole.teams.create({ + teamId: ID.unique(), + name: 'Personal projects' + }) }; } } catch (e) { diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 313430fe3..53f17ed0e 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -98,12 +98,12 @@ const importProject = async () => { try { loading.set(true); - const project = await sdk.forConsole.projects.create( - ID.unique(), - `Imported project ${new Date().toISOString()}`, - page.params.organization, - Region.Fra // default - ); + const project = await sdk.forConsole.projects.create({ + projectId: ID.unique(), + name: `Imported project ${new Date().toISOString()}`, + teamId: page.params.organization, + region: Region.Fra + }); trackEvent(Submit.ProjectCreate, { teamId: page.params.organization }); diff --git a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte index 1b43c1492..c6953c2e3 100644 --- a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte @@ -19,10 +19,10 @@ async function addDomain() { try { - domain = await sdk.forConsole.domains.create( - page.params.organization, - domainName.toLocaleLowerCase() - ); + domain = await sdk.forConsole.domains.create({ + teamId: page.params.organization, + domain: domainName.toLocaleLowerCase() + }); invalidate(Dependencies.DOMAINS); } catch (error) { addNotification({ diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+layout.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+layout.ts index fed93acca..319621000 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+layout.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+layout.ts @@ -7,8 +7,10 @@ export const load = async ({ depends, params }) => { depends(Dependencies.DOMAIN); return { - domain: await sdk.forConsole.domains.get(params.domain), header: Header, - breadcrumbs: Breadcrumbs + breadcrumbs: Breadcrumbs, + domain: await sdk.forConsole.domains.get({ + domainId: params.domain + }) }; }; diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte index c42983377..39e799b87 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte @@ -37,7 +37,9 @@ async function downloadRecords() { try { - const zone = await sdk.forConsole.domains.getZone(data.domain.$id); + const zone = await sdk.forConsole.domains.getZone({ + domainId: data.domain.$id + }); if ('message' in zone) { const blob = new Blob([zone.message as string], { type: 'text/plain' }); diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index abc2360b3..4a9f16b99 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -53,15 +53,14 @@ const resend = async (member: Models.Membership) => { try { - await sdk.forConsole.teams.createMembership( - $organization.$id, - member.roles, - member.userEmail, - undefined, - undefined, - `${page.url.origin}${base}/invite`, - member.userName || undefined - ); + await sdk.forConsole.teams.createMembership({ + teamId: $organization.$id, + roles: member.roles, + email: member.userEmail, + url: `${page.url.origin}${base}/invite`, + name: member.userName || undefined + }); + addNotification({ type: 'success', message: `Invite has been sent to ${member.userEmail}` diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts index aa1aceede..93d6cd24e 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts @@ -17,12 +17,10 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { offset, search, limit, - memberships: await sdk - .forProject(params.region, params.project) - .teams.listMemberships( - teamId, - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search - ) + memberships: await sdk.forProject(params.region, params.project).teams.listMemberships({ + teamId, + queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search + }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/+page.svelte index f69a3ae53..da7178906 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/templates/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/+page.svelte @@ -1,22 +1,25 @@ diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts index 480c7be2e..a5b0e529b 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts @@ -10,8 +10,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - provider: await sdk - .forProject(params.region, params.project) - .messaging.getProvider(params.provider) + provider: await sdk.forProject(params.region, params.project).messaging.getProvider({ + providerId: params.provider + }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts index 2697e3618..260b53444 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/+page.ts @@ -5,6 +5,6 @@ import { Dependencies } from '$lib/constants'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.DEV_KEYS); return { - devKeys: await sdk.forConsole.projects.listDevKeys(params.project) + devKeys: await sdk.forConsole.projects.listDevKeys({ projectId: params.project }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page.ts index d54a142ca..9ceedaee4 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/+page.ts @@ -7,7 +7,10 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.DEV_KEY); - const key = await sdk.forConsole.projects.getDevKey(params.project, params.key); + const key = await sdk.forConsole.projects.getDevKey({ + projectId: params.project, + keyId: params.key + }); if (key.expire) { key.expire = new Date(key.expire).toISOString().slice(0, 23); } else { diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts index 1148a392e..7dc75078e 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts @@ -5,6 +5,6 @@ import { Dependencies } from '$lib/constants'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.PLATFORMS); return { - platforms: await sdk.forConsole.projects.listPlatforms(params.project) + platforms: await sdk.forConsole.projects.listPlatforms({ projectId: params.project }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts index f102df440..eaec6e7c5 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts @@ -10,6 +10,9 @@ export const load: PageLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - platform: await sdk.forConsole.projects.getPlatform(params.project, params.platform) + platform: await sdk.forConsole.projects.getPlatform({ + projectId: params.project, + platformId: params.platform + }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/+page.svelte index 3a3228fbf..edf09b92f 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.svelte @@ -58,7 +58,7 @@ async function sdkCreateVariable(key: string, value: string, secret: boolean) { await sdk .forProject(page.params.region, page.params.project) - .projectApi.createVariable(key, value, secret); + .projectApi.createVariable({ key, value, secret }); await invalidate(Dependencies.PROJECT_VARIABLES); } @@ -70,14 +70,14 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .projectApi.updateVariable(variableId, key, value, secret); + .projectApi.updateVariable({ variableId, key, value, secret }); await invalidate(Dependencies.PROJECT_VARIABLES); } async function sdkDeleteVariable(variableId: string) { await sdk .forProject(page.params.region, page.params.project) - .projectApi.deleteVariable(variableId); + .projectApi.deleteVariable({ variableId }); await invalidate(Dependencies.PROJECT_VARIABLES); } diff --git a/src/routes/(console)/project-[region]-[project]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/+page.ts index e6f31e223..33685ac28 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.ts @@ -11,9 +11,9 @@ export const load: PageLoad = async ({ depends, url, params }) => { const [variables, installations] = await Promise.all([ sdk.forProject(params.region, params.project).projectApi.listVariables(), - sdk - .forProject(params.region, params.project) - .vcs.listInstallations([Query.limit(limit), Query.offset(offset)]) + sdk.forProject(params.region, params.project).vcs.listInstallations({ + queries: [Query.limit(limit), Query.offset(offset)] + }) ]); return { diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts index 4ca5a72c5..82847bb0a 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts @@ -23,12 +23,13 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { queries.set(parsedQueries); return { - rules: await sdk - .forProject(params.region, params.project) - .proxy.listRules( - [Query.equal('type', RuleType.API), Query.equal('trigger', RuleTrigger.MANUAL)], - search || undefined - ), + rules: await sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [ + Query.equal('type', RuleType.API), + Query.equal('trigger', RuleTrigger.MANUAL) + ], + search: search || undefined + }), offset, limit, query, diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte index 0ae3718ef..90d5a2159 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte @@ -54,7 +54,7 @@ try { const rule = await sdk .forProject(page.params.region, page.params.project) - .proxy.createAPIRule(domainName.toLocaleLowerCase()); + .proxy.createAPIRule({ domain: domainName.toLocaleLowerCase() }); if (rule?.status === 'verified') { await goto(routeBase); await invalidate(Dependencies.DOMAINS); diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts index b22b0ad83..f9c2ecb50 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts @@ -11,10 +11,12 @@ export const load = async ({ depends, params, parent }) => { const [rules, domains] = await Promise.all([ sdk .forProject(params.region, params.project) - .proxy.listRules([ - Query.equal('type', RuleType.API), - Query.equal('trigger', RuleTrigger.MANUAL) - ]), + .proxy.listRules({ + queries: [ + Query.equal('type', RuleType.API), + Query.equal('trigger', RuleTrigger.MANUAL) + ] + }), isCloud ? sdk.forConsole.domains.list({ queries: [Query.equal('teamId', organization.$id)] }) : Promise.resolve(null) diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte index 18883e72d..a6c23790f 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte @@ -57,13 +57,13 @@ if (selectedTab !== 'nameserver') { const ruleData = await sdk .forProject(page.params.region, page.params.project) - .proxy.updateRuleVerification(ruleId); + .proxy.updateRuleVerification({ ruleId }); verified = ruleData.status === 'verified'; } else if (isNewDomain && isCloud) { - const domainData = await sdk.forConsole.domains.create( - $organization.$id, - page.params.domain - ); + const domainData = await sdk.forConsole.domains.create({ + teamId: $organization.$id, + domain: page.params.domain + }); verified = domainData.nameservers.toLowerCase() === 'appwrite'; } else if (!isNewDomain && isCloud) { const domain = await sdk.forConsole.domains.updateNameservers({ diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte index 7be93b6e3..b6f8083bc 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte @@ -88,10 +88,10 @@ const deployToCloud = async () => { const currEndpoint = getCurrentEndpoint(); // Create API key - const { secret } = await sdk.forConsole.projects.createKey( - $project.$id, - `[AUTO-GENERATED] Migration ${new Date().toISOString()}`, - [ + const { secret } = await sdk.forConsole.projects.createKey({ + projectId: $project.$id, + name: `[AUTO-GENERATED] Migration ${new Date().toISOString()}`, + scopes: [ 'users.read', 'teams.read', 'databases.read', @@ -109,9 +109,8 @@ 'locale.read', 'avatars.read', 'health.read' - ], - undefined - ); + ] + }); const migrationData = { endpoint: currEndpoint, diff --git a/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte index 7df564ceb..322525df3 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte @@ -60,18 +60,18 @@ password = undefined; } - await sdk.forConsole.projects.updateSmtp( - $project.$id, + await sdk.forConsole.projects.updateSMTP({ + projectId: $project.$id, enabled, - senderName ? senderName : undefined, - senderEmail ? senderEmail : undefined, - replyTo ? replyTo : undefined, - host ? host : undefined, - port ? port : undefined, - username ? username : undefined, - password ? password : undefined, - secure ? (secure as SMTPSecure) : undefined - ); + senderName: senderName || undefined, + senderEmail: senderEmail || undefined, + replyTo: replyTo || undefined, + host: host || undefined, + port: port || undefined, + username: username || undefined, + password: password || undefined, + secure: secure ? (secure as SMTPSecure) : undefined + }); invalidate(Dependencies.PROJECT); addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts index 7cfa65995..c92a17c27 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts @@ -10,6 +10,6 @@ export const load: PageLoad = async ({ params, url, depends }) => { return { page, - webhooks: await sdk.forConsole.projects.listWebhooks(params.project) + webhooks: await sdk.forConsole.projects.listWebhooks({ projectId: params.project }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts index a38c24efb..ce9bf4f03 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts @@ -10,6 +10,9 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - webhook: await sdk.forConsole.projects.getWebhook(params.project, params.webhook) + webhook: await sdk.forConsole.projects.getWebhook({ + projectId: params.project, + webhookId: params.webhook + }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte index 4b21c8848..354abe781 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte @@ -25,16 +25,16 @@ export let data; async function create() { try { - const webhook = await sdk.forConsole.projects.createWebhook( - data.project.$id, + const webhook = await sdk.forConsole.projects.createWebhook({ + projectId: data.project.$id, name, events, url, security, - true, - httpUser || undefined, - httpPass || undefined - ); + enabled: true, + httpUser: httpUser || undefined, + httpPass: httpPass || undefined + }); addNotification({ message: 'Webhook has been created', type: 'success' diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/+page.ts index 63289aaa4..e1cc8f1b6 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -33,12 +33,10 @@ export const load = async ({ url, depends, route, params, parent }) => { offset, limit, search, - siteList: await sdk - .forProject(params.region, params.project) - .sites.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search || undefined - ), + siteList: await sdk.forProject(params.region, params.project).sites.list({ + queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search: search || undefined + }), view }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts index 7ad810fb4..27a57600e 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts @@ -19,15 +19,15 @@ export const load: PageLoad = async ({ url, depends, params }) => { siteId, deploymentId }), - sdk - .forProject(params.region, params.project) - .proxy.listRules([ + sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [ Query.equal('type', RuleType.DEPLOYMENT), Query.equal('deploymentResourceType', DeploymentResourceType.SITE), Query.equal('deploymentResourceId', siteId), Query.equal('deploymentId', deploymentId), Query.equal('trigger', RuleTrigger.MANUAL) - ]) + ] + }) ]); return { @@ -35,9 +35,10 @@ export const load: PageLoad = async ({ url, depends, params }) => { deployment, proxyRuleList, repository: site?.installationId - ? await sdk - .forProject(params.region, params.project) - .vcs.getRepository(site.installationId, site.providerRepositoryId) + ? await sdk.forProject(params.region, params.project).vcs.getRepository({ + installationId: site.installationId, + providerRepositoryId: site.providerRepositoryId + }) : undefined }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte index 871611f73..23e7a2d51 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte @@ -37,28 +37,23 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk - .forProject(page.params.region, page.params.project) - .sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk.forProject(page.params.region, page.params.project).sites.update({ + siteId: data.site.$id, + name: data.site.name, + framework: data.site.framework as Framework, + enabled: data.site.enabled, + logging: data.site.logging || undefined, + timeout: data.site.timeout, + installCommand: data.site.installCommand, + buildCommand: data.site.buildCommand, + outputDirectory: data.site.outputDirectory, + buildRuntime: data.site.buildRuntime as BuildRuntime, + adapter: data.site.adapter as Adapter, + fallbackFile: data.site.fallbackFile, + installationId: selectedInstallationId, + providerRepositoryId: selectedRepository, + providerBranch: 'main' + }); invalidate(Dependencies.SITE); } catch { return; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte index 2a88dc960..281b68314 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte @@ -63,59 +63,43 @@ const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk - .forProject(page.params.region, page.params.project) - .sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - installCommand || undefined, - buildCommand || undefined, - outputDirectory || undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined - ); + let site = await sdk.forProject(page.params.region, page.params.project).sites.create({ + siteId: id || ID.unique(), + name, + framework: fr, + buildRuntime, + installCommand: installCommand || undefined, + buildCommand: buildCommand || undefined, + outputDirectory: outputDirectory || undefined + }); // Add domain - await sdk - .forProject(page.params.region, page.params.project) - .proxy.createSiteRule( - `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk.forProject(page.params.region, page.params.project).proxy.createSiteRule({ + domain: `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + siteId: site.$id + }); //Add variables const promises = variables.map((variable) => - sdk - .forProject(page.params.region, page.params.project) - .sites.createVariable( - site.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk.forProject(page.params.region, page.params.project).sites.createVariable({ + siteId: site.$id, + key: variable.key, + value: variable.value, + secret: variable?.secret ?? false + }) ); await Promise.all(promises); const deployment = await sdk .forProject(page.params.region, page.params.project) - .sites.createDeployment( - site.$id, - files[0], - true, - installCommand || undefined, - buildCommand || undefined, - outputDirectory || undefined - ); + .sites.createDeployment({ + siteId: site.$id, + code: files[0], + activate: true, + installCommand: installCommand || undefined, + buildCommand: buildCommand || undefined, + outputDirectory: outputDirectory || undefined + }); trackEvent(Submit.SiteCreate, { source: 'manual', diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts index 584877a05..cb0416b8b 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts @@ -18,6 +18,6 @@ export const load = async ({ parent, params }) => { frameworks, template: await sdk .forProject(params.region, params.project) - .sites.getTemplate('starter-for-js') + .sites.getTemplate({ templateId: 'starter-for-js' }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte index d13dfd98c..7657aa9a5 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte @@ -60,12 +60,12 @@ try { const response = await sdk .forProject(page.params.region, page.params.project) - .vcs.createRepositoryDetection( - $installation.$id, - page.params.repository, - VCSDetectionType.Framework, - rootDir - ); + .vcs.createRepositoryDetection({ + installationId: $installation.$id, + providerRepositoryId: page.params.repository, + type: VCSDetectionType.Framework, + providerRootDirectory: rootDir + }); framework = data.frameworks.frameworks.find((f) => f.key === response.framework); adapter = framework?.adapters[0]; installCommand = adapter?.installCommand; @@ -94,47 +94,37 @@ const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk - .forProject(page.params.region, page.params.project) - .sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - installCommand, - buildCommand, - outputDirectory, - undefined, - data.installation.$id, - undefined, - data.repository.id, - branch, - silentMode, - rootDir - ); + let site = await sdk.forProject(page.params.region, page.params.project).sites.create({ + siteId: id || ID.unique(), + name, + framework: fr, + buildRuntime, + installCommand, + buildCommand, + outputDirectory, + installationId: data.installation.$id, + providerRepositoryId: data.repository.id, + providerBranch: branch, + providerSilentMode: silentMode, + providerRootDirectory: rootDir + }); // Add domain - await sdk - .forProject(page.params.region, page.params.project) - .proxy.createSiteRule( - `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk.forProject(page.params.region, page.params.project).proxy.createSiteRule({ + domain: `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + siteId: site.$id + }); - //Add variables + // Add variables const promises = variables.map((variable) => - sdk - .forProject(page.params.region, page.params.project) - .sites.createVariable( - site.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk.forProject(page.params.region, page.params.project).sites.createVariable({ + siteId: site.$id, + key: variable.key, + value: variable.value, + secret: variable?.secret ?? false + }) ); + await Promise.all(promises); const deployment = await sdk diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte index 86e81b895..7a2184e79 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte @@ -77,7 +77,11 @@ isCreatingRepository = true; const repo = await sdk .forProject(page.params.region, page.params.project) - .vcs.createRepository($installation.$id, repositoryName, repositoryPrivate); + .vcs.createRepository({ + installationId: $installation.$id, + name: repositoryName, + xprivate: repositoryPrivate + }); repository.set(repo); selectedRepository = repo.id; showSiteConfig = true; @@ -112,59 +116,52 @@ ); let site = await sdk .forProject(page.params.region, page.params.project) - .sites.create( - id || ID.unique(), + .sites.create({ + siteId: id || ID.unique(), name, - fr, + framework: fr, buildRuntime, - undefined, - undefined, - undefined, - framework.installCommand, - framework.buildCommand, - framework.outputDirectory, - framework.adapter as unknown as Adapter, - connectBehaviour === 'later' - ? undefined - : selectedInstallationId || undefined, - framework?.fallbackFile || undefined, - selectedRepository || undefined, - branch || undefined, - selectedRepository ? silentMode : undefined, - rootDir || undefined - ); + installCommand: framework.installCommand, + buildCommand: framework.buildCommand, + outputDirectory: framework.outputDirectory, + adapter: framework.adapter as unknown as Adapter, + installationId: + connectBehaviour === 'later' ? undefined : selectedInstallationId, + fallbackFile: framework?.fallbackFile, + providerRepositoryId: selectedRepository, + providerBranch: branch, + providerSilentMode: selectedRepository ? silentMode : undefined, + providerRootDirectory: rootDir + }); // Add domain - await sdk - .forProject(page.params.region, page.params.project) - .proxy.createSiteRule( - `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk.forProject(page.params.region, page.params.project).proxy.createSiteRule({ + domain: `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + siteId: site.$id + }); - //Add variables + // Add variables const promises = variables.map((variable) => - sdk - .forProject(page.params.region, page.params.project) - .sites.createVariable( - site.$id, - variable.name, - variable.value, - variable?.secret ?? false - ) + sdk.forProject(page.params.region, page.params.project).sites.createVariable({ + siteId: site.$id, + key: variable.name, + value: variable.value, + secret: variable?.secret ?? false + }) ); + await Promise.all(promises); const deployment = await sdk .forProject(page.params.region, page.params.project) - .sites.createTemplateDeployment( - site.$id, - data.template.providerRepositoryId || undefined, - data.template.providerOwner || undefined, - framework.providerRootDirectory || undefined, - data.template.providerVersion || undefined, - true - ); + .sites.createTemplateDeployment({ + siteId: site.$id, + repository: data.template.providerRepositoryId, + owner: data.template.providerOwner, + rootDirectory: framework.providerRootDirectory, + version: data.template.providerVersion, + activate: true + }); trackEvent(Submit.SiteCreate, { source: 'template', diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts index d8fd8c41a..5a9948ba6 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts @@ -7,7 +7,7 @@ export const load = async ({ parent, params }) => { await parent(); const template = await sdk .forProject(params.region, params.project) - .sites.getTemplate(params.template); + .sites.getTemplate({ templateId: params.template }); const domain = await buildVerboseDomain( regionalConsoleVariables._APP_DOMAIN_SITES, template.name, diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts index 82fd60f63..e0899259a 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts @@ -10,31 +10,35 @@ export const load = async ({ params, depends, parent }) => { const { site } = await parent(); const [deploymentList, prodReadyDeployments, proxyRuleList] = await Promise.all([ - sdk - .forProject(params.region, params.project) - .sites.listDeployments(params.site, [Query.limit(4), Query.orderDesc('')]), - sdk - .forProject(params.region, params.project) - .sites.listDeployments(params.site, [ + sdk.forProject(params.region, params.project).sites.listDeployments({ + siteId: params.site, + queries: [Query.limit(4), Query.orderDesc('')] + }), + sdk.forProject(params.region, params.project).sites.listDeployments({ + siteId: params.site, + queries: [ Query.equal('status', 'ready'), Query.equal('activate', true), Query.orderDesc('') - ]), + ] + }), sdk .forProject(params.region, params.project) - .proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', site.$id), - Query.equal('deploymentId', site.deploymentId), - Query.orderDesc('') - ]) + .proxy.listRules({ + queries: [ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', site.$id), + Query.equal('deploymentId', site.deploymentId), + Query.orderDesc('') + ] + }) ]); const deployment = deploymentList?.total ? await sdk .forProject(params.region, params.project) - .sites.getDeployment(params.site, site.deploymentId) + .sites.getDeployment({ siteId: params.site, deploymentId: site.deploymentId }) : null; return { site, diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte index f49af0544..60bfba3a4 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte @@ -45,28 +45,23 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk - .forProject(page.params.region, page.params.project) - .sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk.forProject(page.params.region, page.params.project).sites.update({ + siteId: data.site.$id, + name: data.site.name, + framework: data.site.framework as Framework, + enabled: data.site.enabled, + logging: data.site.logging || undefined, + timeout: data.site.timeout, + installCommand: data.site.installCommand, + buildCommand: data.site.buildCommand, + outputDirectory: data.site.outputDirectory, + buildRuntime: data.site.buildRuntime as BuildRuntime, + adapter: data.site.adapter as Adapter, + fallbackFile: data.site.fallbackFile, + installationId: selectedInstallationId, + providerRepositoryId: selectedRepository, + providerBranch: 'main' + }); invalidate(Dependencies.SITE); } catch { return; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts index 097387117..72c5a16c2 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts @@ -16,14 +16,15 @@ export const load = async ({ params, depends, url, route, parent }) => { queries.set(parsedQueries); const [deploymentList, installations] = await Promise.all([ - sdk - .forProject(params.region, params.project) - .sites.listDeployments(params.site, [ + sdk.forProject(params.region, params.project).sites.listDeployments({ + siteId: params.site, + queries: [ Query.limit(limit), Query.offset(offset), Query.orderDesc(''), ...parsedQueries.values() - ]), + ] + }), sdk.forProject(params.region, params.project).vcs.listInstallations() ]); @@ -36,7 +37,7 @@ export const load = async ({ params, depends, url, route, parent }) => { site.deploymentId && deploymentList?.total ? await sdk .forProject(params.region, params.project) - .sites.getDeployment(params.site, site.deploymentId) + .sites.getDeployment({ siteId: params.site, deploymentId: site.deploymentId }) : null, installations }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts index 44d1e0a2c..5bb734783 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts @@ -11,17 +11,18 @@ export const load: PageLoad = async ({ params, depends, parent }) => { const { site } = await parent(); const [deployment, proxyRuleList] = await Promise.all([ - sdk - .forProject(params.region, params.project) - .sites.getDeployment(params.site, params.deployment), - sdk - .forProject(params.region, params.project) - .proxy.listRules([ + sdk.forProject(params.region, params.project).sites.getDeployment({ + siteId: params.site, + deploymentId: params.deployment + }), + sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [ Query.equal('type', RuleType.DEPLOYMENT), Query.equal('deploymentId', params.deployment), Query.equal('deploymentResourceType', DeploymentResourceType.SITE), Query.equal('deploymentResourceId', params.site) - ]) + ] + }) ]); return { diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts index a00f0c4b8..3de7856f0 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts @@ -22,20 +22,18 @@ export const load = async ({ params, depends, url, route }) => { limit, query, search, - proxyRules: await sdk - .forProject(params.region, params.project) - .proxy.listRules( - [ - Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', params.site), - Query.equal('trigger', RuleTrigger.MANUAL), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - ) + proxyRules: await sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [ + Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', params.site), + Query.equal('trigger', RuleTrigger.MANUAL), + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search: search || undefined + }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte index 1d2aa5569..f0b6df34a 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -85,21 +85,28 @@ if (behaviour === 'BRANCH') { rule = await sdk .forProject(page.params.region, page.params.project) - .proxy.createSiteRule(domainName, page.params.site, branch); + .proxy.createSiteRule({ + domain: domainName, + siteId: page.params.site, + branch + }); } else if (behaviour === 'REDIRECT') { rule = await sdk .forProject(page.params.region, page.params.project) - .proxy.createRedirectRule( - domainName, - redirect, + .proxy.createRedirectRule({ + domain: domainName, + url: redirect, statusCode, - page.params.site, - ProxyResourceType.Site - ); + resourceId: page.params.site, + resourceType: ProxyResourceType.Site + }); } else if (behaviour === 'ACTIVE') { rule = await sdk .forProject(page.params.region, page.params.project) - .proxy.createSiteRule(domainName, page.params.site); + .proxy.createSiteRule({ + domain: domainName, + siteId: page.params.site + }); } if (rule?.status === 'verified') { await goto(routeBase); @@ -118,28 +125,24 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk - .forProject(page.params.region, page.params.project) - .sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk.forProject(page.params.region, page.params.project).sites.update({ + siteId: data.site.$id, + name: data.site.name, + framework: data.site.framework as Framework, + enabled: data.site.enabled, + logging: data.site.logging || undefined, + timeout: data.site.timeout, + installCommand: data.site.installCommand, + buildCommand: data.site.buildCommand, + outputDirectory: data.site.outputDirectory, + buildRuntime: data.site.buildRuntime as BuildRuntime, + adapter: data.site.adapter as Adapter, + fallbackFile: data.site.fallbackFile, + installationId: selectedInstallationId, + providerRepositoryId: selectedRepository, + providerBranch: 'main' + }); + invalidate(Dependencies.SITE); } catch { return; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts index ef6239640..91c30acbf 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts @@ -9,15 +9,17 @@ export const load = async ({ parent, depends, params }) => { depends(Dependencies.DOMAINS, Dependencies.SITES_DOMAINS); const [rules, installations, domains] = await Promise.all([ - sdk - .forProject(params.region, params.project) - .proxy.listRules([ + sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [ Query.equal('type', RuleType.DEPLOYMENT), Query.equal('trigger', RuleTrigger.MANUAL) - ]), + ] + }), sdk.forProject(params.region, params.project).vcs.listInstallations(), isCloud - ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]) + ? sdk.forConsole.domains.list({ + queries: [Query.equal('teamId', organization.$id)] + }) : Promise.resolve(null) ]); @@ -30,7 +32,10 @@ export const load = async ({ parent, depends, params }) => { site?.installationId && site?.providerRepositoryId ? await sdk .forProject(params.region, params.project) - .vcs.listRepositoryBranches(site.installationId, site.providerRepositoryId) + .vcs.listRepositoryBranches({ + installationId: site.installationId, + providerRepositoryId: site.providerRepositoryId + }) : undefined }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index eba843031..8422d783a 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -56,16 +56,16 @@ if (selectedTab !== 'nameserver') { const ruleData = await sdk .forProject(page.params.region, page.params.project) - .proxy.updateRuleVerification(ruleId); + .proxy.updateRuleVerification({ ruleId }); verified = ruleData.status === 'verified'; throw new Error( 'Domain verification failed. Please check your domain settings or try again later' ); } else if (isNewDomain && isCloud) { - const domainData = await sdk.forConsole.domains.create( - $organization.$id, - page.params.domain - ); + const domainData = await sdk.forConsole.domains.create({ + teamId: $organization.$id, + domain: page.params.domain + }); verified = domainData.nameservers.toLowerCase() === 'appwrite'; throw new Error( 'Domain verification failed. Please check your domain settings or try again later' diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts index e56bf02b9..570e1b27a 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts @@ -9,7 +9,9 @@ export const load = async ({ parent, depends }) => { let domainsList: Models.DomainsList; if (isCloud) { - domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]); + domainsList = await sdk.forConsole.domains.list({ + queries: [Query.equal('teamId', organization.$id)] + }); } return { diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts index 0fe9e14c8..2ea49d561 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts @@ -20,13 +20,14 @@ export const load = async ({ params, depends, url, route, parent }) => { limit, query, site, - logs: await sdk - .forProject(params.region, params.project) - .sites.listLogs(params.site, [ + logs: await sdk.forProject(params.region, params.project).sites.listLogs({ + siteId: params.site, + queries: [ Query.limit(limit), Query.offset(offset), Query.orderDesc(''), ...parsedQueries.values() - ]) + ] + }) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte index 472a7aa79..f672e2460 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte @@ -20,9 +20,12 @@ export let data; const sdkCreateVariable = async (key: string, value: string, secret: boolean) => { - await sdk - .forProject(page.params.region, page.params.project) - .sites.createVariable(page.params.site, key, value, secret); + await sdk.forProject(page.params.region, page.params.project).sites.createVariable({ + siteId: page.params.site, + key, + value, + secret + }); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; @@ -34,14 +37,14 @@ ) => { await sdk .forProject(page.params.region, page.params.project) - .sites.updateVariable(page.params.site, variableId, key, value, secret); + .sites.updateVariable({ siteId: page.params.site, variableId, key, value, secret }); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; const sdkDeleteVariable = async (variableId: string) => { await sdk .forProject(page.params.region, page.params.project) - .sites.deleteVariable(page.params.site, variableId); + .sites.deleteVariable({ siteId: page.params.site, variableId }); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte index 70acccf34..5aa634cf5 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte @@ -35,7 +35,12 @@ return ( sdk .forProject(page.params.region, page.params.project) - .storage.getFilePreview(bucketId, fileId, 128, 128) + .storage.getFilePreview({ + bucketId, + fileId, + height: 128, + width: 128 + }) .toString() + '&mode=admin' ); } @@ -50,7 +55,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .storage.deleteFile(file.bucketId, file.$id); + .storage.deleteFile({ bucketId: file.bucketId, fileId: file.$id }); await invalidate(Dependencies.FILES); await uploader.removeFile(file); trackEvent(Submit.FileDelete); diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index da788c16a..04f5219a4 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -53,12 +53,17 @@ const getPreview = (fileId: string) => sdk .forProject(page.params.region, page.params.project) - .storage.getFilePreview($file.bucketId, fileId, 640, 300) + .storage.getFilePreview({ + bucketId: $file.bucketId, + fileId, + width: 640, + height: 300 + }) .toString() + '&mode=admin'; const getView = (fileId: string) => sdk .forProject(page.params.region, page.params.project) - .storage.getFileView($file.bucketId, fileId) + .storage.getFileView({ bucketId: $file.bucketId, fileId }) .toString() + '&mode=admin'; $: if (filePermissions) { @@ -69,16 +74,20 @@ return ( sdk .forProject(page.params.region, page.params.project) - .storage.getFileDownload($file.bucketId, $file.$id) + .storage.getFileDownload({ bucketId: $file.bucketId, fileId: $file.$id }) .toString() + '&mode=admin' ); } async function updatePermissions() { try { - await sdk - .forProject(page.params.region, page.params.project) - .storage.updateFile($file.bucketId, $file.$id, $file.name, filePermissions); + await sdk.forProject(page.params.region, page.params.project).storage.updateFile({ + bucketId: $file.bucketId, + fileId: $file.$id, + name: $file.name, + permissions: filePermissions + }); + await invalidate(Dependencies.FILE); arePermsDisabled = true; addNotification({ @@ -119,11 +128,13 @@ } } - async function createFileToken(expiry: string) { + async function createFileToken(expire: string) { try { - await sdk - .forProject(page.params.region, page.params.project) - .tokens.createFileToken($file.bucketId, $file.$id, expiry); + await sdk.forProject(page.params.region, page.params.project).tokens.createFileToken({ + bucketId: $file.bucketId, + fileId: $file.$id, + expire + }); await invalidate(Dependencies.FILE_TOKENS); addNotification({ diff --git a/src/routes/(public)/(guest)/education/+page.svelte b/src/routes/(public)/(guest)/education/+page.svelte index 67a761bf9..88ce060a8 100644 --- a/src/routes/(public)/(guest)/education/+page.svelte +++ b/src/routes/(public)/(guest)/education/+page.svelte @@ -10,12 +10,12 @@ function onGithubLogin() { localStorage.setItem('githubEducationProgram', 'true'); - sdk.forConsole.account.createOAuth2Session( - OAuthProvider.Github, - window.location.origin + '/console/education?success', - window.location.origin + '/console/education?failure', - ['read:user', 'user:email'] - ); + sdk.forConsole.account.createOAuth2Session({ + provider: OAuthProvider.Github, + success: window.location.origin + '/console/education?success', + failure: window.location.origin + '/console/education?failure', + scopes: ['read:user', 'user:email'] + }); } diff --git a/src/routes/(public)/(guest)/login/+page.svelte b/src/routes/(public)/(guest)/login/+page.svelte index db965e912..e9f8f25b4 100644 --- a/src/routes/(public)/(guest)/login/+page.svelte +++ b/src/routes/(public)/(guest)/login/+page.svelte @@ -76,12 +76,12 @@ url = `${base}${page.url.search ?? ''}`; } } - sdk.forConsole.account.createOAuth2Session( - OAuthProvider.Github, - window.location.origin + url, - window.location.origin, - ['read:user', 'user:email'] - ); + sdk.forConsole.account.createOAuth2Session({ + provider: OAuthProvider.Github, + success: window.location.origin + url, + failure: window.location.origin, + scopes: ['read:user', 'user:email'] + }); } diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte index dd36f0e62..6dcd39cc2 100644 --- a/src/routes/(public)/(guest)/register/+page.svelte +++ b/src/routes/(public)/(guest)/register/+page.svelte @@ -81,12 +81,12 @@ } function onGithubLogin() { - sdk.forConsole.account.createOAuth2Session( - OAuthProvider.Github, - window.location.origin, - window.location.origin, - ['read:user', 'user:email'] - ); + sdk.forConsole.account.createOAuth2Session({ + provider: OAuthProvider.Github, + success: window.location.origin, + failure: window.location.origin, + scopes: ['read:user', 'user:email'] + }); } diff --git a/src/routes/(public)/auth/magic-url/+page.svelte b/src/routes/(public)/auth/magic-url/+page.svelte index c84424577..411e147e5 100644 --- a/src/routes/(public)/auth/magic-url/+page.svelte +++ b/src/routes/(public)/auth/magic-url/+page.svelte @@ -16,7 +16,12 @@ const userId = page.url.searchParams.get('userId'); const secret = page.url.searchParams.get('secret'); - await account.updateMagicURLSession(userId, secret); + // what's the replacement? + await account.updateMagicURLSession({ + userId, + secret + }); + window.location.href = `appwrite-callback-${projectId}://${page.url.search}`; }); diff --git a/src/routes/(public)/auth/preview/access/+page.svelte b/src/routes/(public)/auth/preview/access/+page.svelte index 33aa9b1b5..5cf3c2440 100644 --- a/src/routes/(public)/auth/preview/access/+page.svelte +++ b/src/routes/(public)/auth/preview/access/+page.svelte @@ -98,12 +98,12 @@ url = `${base}${page.url.search ?? ''}`; } } - sdk.forConsole.account.createOAuth2Session( - OAuthProvider.Github, - window.location.origin + url, - window.location.origin, - ['read:user', 'user:email'] - ); + sdk.forConsole.account.createOAuth2Session({ + provider: OAuthProvider.Github, + success: window.location.origin + url, + failure: window.location.origin, + scopes: ['read:user', 'user:email'] + }); } async function handleSubmit() { diff --git a/src/routes/(public)/template-[template]/+page.svelte b/src/routes/(public)/template-[template]/+page.svelte index b0e51481e..b82f6787c 100644 --- a/src/routes/(public)/template-[template]/+page.svelte +++ b/src/routes/(public)/template-[template]/+page.svelte @@ -45,12 +45,12 @@ } function onGithubLogin() { - sdk.forConsole.account.createOAuth2Session( - OAuthProvider.Github, - window.location.origin, - window.location.origin, - ['read:user', 'user:email'] - ); + sdk.forConsole.account.createOAuth2Session({ + provider: OAuthProvider.Github, + success: window.location.origin, + failure: window.location.origin, + scopes: ['read:user', 'user:email'] + }); } async function fetchProjects() { @@ -71,12 +71,12 @@ async function handleSubmit() { if (selectedProject === null) { try { - const p = await sdk.forConsole.projects.create( - id ?? ID.unique(), - projectName, - selectedOrg, - isCloud ? (region as Region) : undefined - ); + const p = await sdk.forConsole.projects.create({ + projectId: id ?? ID.unique(), + name: projectName, + teamId: selectedOrg, + region: isCloud ? (region as Region) : undefined + }); trackEvent(Submit.ProjectCreate, { customId: !!id, selectedOrg,