Skip to content

Commit f8b015f

Browse files
HarshMN2345HarshMN2345
authored
Merge pull request #2965 from appwrite/chore-upgrade-sdk
Chore: Upgrade SDK to new platforms API
2 parents 14613f6 + e66d1a4 commit f8b015f

40 files changed

+443
-748
lines changed

‎bun.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"dependencies": {
2222
"@ai-sdk/svelte": "^1.1.24",
23-
"@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@24e07fc",
23+
"@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@67539a6",
2424
"@appwrite.io/pink-icons": "0.25.0",
2525
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bfe7ce3",
2626
"@appwrite.io/pink-legacy": "^1.0.3",

‎pnpm-lock.yaml‎

Lines changed: 12 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/helpers/platform.ts‎

Lines changed: 50 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,59 @@
1+
import type { Models } from '@appwrite.io/console';
2+
3+
export type AnyPlatform =
4+
| Models.PlatformWeb
5+
| Models.PlatformApple
6+
| Models.PlatformAndroid
7+
| Models.PlatformWindows
8+
| Models.PlatformLinux;
9+
110
export function isMac(): boolean {
211
return window.navigator.platform.toUpperCase().indexOf('MAC') >= 0;
312
}
413

514
export const getPlatformInfo = (platform: string) => {
615
let name: string, icon: string;
7-
if (platform.includes('flutter')) {
8-
name = 'Flutter';
9-
icon = 'flutter';
10-
} else if (platform.includes('react-native')) {
11-
name = 'React Native';
12-
icon = 'react-native';
13-
} else if (platform.includes('apple')) {
14-
name = 'Apple';
15-
icon = 'apple';
16-
} else if (platform.includes('android')) {
17-
name = 'Android';
18-
icon = 'android';
19-
} else if (platform.includes('unity')) {
20-
name = 'Unity';
21-
icon = 'unity';
22-
} else if (platform.includes('web')) {
23-
name = 'Web';
24-
icon = 'code';
25-
} else {
26-
name = 'Unknown';
27-
icon = 'unknown';
16+
switch (platform) {
17+
case 'apple':
18+
name = 'Apple';
19+
icon = 'apple';
20+
break;
21+
case 'android':
22+
name = 'Android';
23+
icon = 'android';
24+
break;
25+
case 'web':
26+
name = 'Web';
27+
icon = 'code';
28+
break;
29+
case 'windows':
30+
name = 'Windows';
31+
icon = 'windows';
32+
break;
33+
case 'linux':
34+
name = 'Linux';
35+
icon = 'linux';
36+
break;
37+
default:
38+
name = 'Unknown';
39+
icon = 'unknown';
2840
}
2941
return { name, icon };
3042
};
43+
44+
export function getPlatformIdentifier(platform: AnyPlatform): string {
45+
switch (platform.type) {
46+
case 'web':
47+
return (platform as Models.PlatformWeb).hostname;
48+
case 'android':
49+
return (platform as Models.PlatformAndroid).applicationId;
50+
case 'apple':
51+
return (platform as Models.PlatformApple).bundleIdentifier;
52+
case 'windows':
53+
return (platform as Models.PlatformWindows).packageIdentifierName;
54+
case 'linux':
55+
return (platform as Models.PlatformLinux).packageName;
56+
default:
57+
return '';
58+
}
59+
}

‎src/routes/(console)/organization-[organization]/settings/BAA.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@
152152
try {
153153
const result: Models.Addon | Models.PaymentAuthentication =
154154
await sdk.forConsole.organizations.createBaaAddon({
155-
organizationId: $organization.$id,
156-
key: 'baa'
155+
organizationId: $organization.$id
157156
});
158157
159158
if ('clientSecret' in result) {

‎src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
try {
3232
const result: Models.Addon | Models.PaymentAuthentication =
3333
await sdk.forConsole.organizations.createBaaAddon({
34-
organizationId: $organization.$id,
35-
key: 'baa'
34+
organizationId: $organization.$id
3635
});
3736
3837
if ('clientSecret' in result) {

‎src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
import { addNotification } from '$lib/stores/notifications';
1515
import { writable } from 'svelte/store';
1616
import Scopes from '../api-keys/scopes.svelte';
17-
import { type Scopes as ScopesType } from '@appwrite.io/console';
17+
import { ID, type Scopes as ScopesType } from '@appwrite.io/console';
1818
import { page } from '$app/state';
1919
import { copy } from '$lib/helpers/copy';
2020
21-
const projectId = page.params.project;
22-
2321
let showExitModal = false;
2422
let formComponent: Form;
2523
let isSubmitting = writable(false);
@@ -30,12 +28,14 @@
3028
3129
async function create() {
3230
try {
33-
const { $id, secret } = await sdk.forConsole.projects.createKey({
34-
projectId,
35-
name,
36-
scopes,
37-
expire: expire || undefined
38-
});
31+
const { $id, secret } = await sdk
32+
.forProject(page.params.region, page.params.project)
33+
.project.createKey({
34+
keyId: ID.unique(),
35+
name,
36+
scopes,
37+
expire: expire || undefined
38+
});
3939
4040
if ($onboarding) {
4141
await invalidate(Dependencies.PROJECT);

‎src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
async function handleDelete() {
2727
try {
2828
isApiKey
29-
? await sdk.forConsole.projects.deleteKey({
30-
projectId,
29+
? await sdk.forProject(page.params.region, page.params.project).project.deleteKey({
3130
keyId: key.$id
3231
})
3332
: await sdk.forConsole.projects.deleteDevKey({

‎src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
await Promise.all(
2828
keyIds.map((key) =>
2929
isApiKey
30-
? sdk.forConsole.projects.deleteKey({
31-
projectId,
32-
keyId: key
33-
})
30+
? sdk
31+
.forProject(page.params.region, page.params.project)
32+
.project.deleteKey({
33+
keyId: key
34+
})
3435
: sdk.forConsole.projects.deleteDevKey({
3536
projectId,
3637
keyId: key

‎src/routes/(console)/project-[region]-[project]/overview/(components)/keyDetails.svelte‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
async function updateName() {
4444
try {
4545
if (isApiKey) {
46-
await sdk.forConsole.projects.updateKey({
47-
projectId: $project.$id,
46+
await sdk.forProject($project.region, $project.$id).project.updateKey({
4847
keyId: key.$id,
4948
name,
5049
scopes,
@@ -76,8 +75,7 @@
7675
7776
async function updateScopes() {
7877
try {
79-
await sdk.forConsole.projects.updateKey({
80-
projectId: $project.$id,
78+
await sdk.forProject($project.region, $project.$id).project.updateKey({
8179
keyId: key.$id,
8280
name: key.name,
8381
scopes,

0 commit comments

Comments
 (0)