Merge pull request #1521 from appwrite/fix-invite-base-path

fix: invite base path
appwrite · Nov 18, 2024 · b497728 · b497728
2 parents 9565113 + 697f574
commit b497728
Show file tree

Hide file tree

Showing 9 changed files with 508 additions and 525 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",
-        "@sentry/sveltekit": "^8.36.0",
+        "@sentry/sveltekit": "^8.38.0",
         "@stripe/stripe-js": "^3.5.0",
         "ai": "^2.2.37",
         "analytics": "^0.8.14",
@@ -42,9 +42,9 @@
     "devDependencies": {
         "@melt-ui/pp": "^0.3.2",
         "@melt-ui/svelte": "^0.83.0",
-        "@playwright/test": "^1.48.2",
+        "@playwright/test": "^1.49.0",
         "@sveltejs/adapter-static": "^3.0.6",
-        "@sveltejs/kit": "^2.7.4",
+        "@sveltejs/kit": "^2.8.1",
         "@sveltejs/vite-plugin-svelte": "^3.1.2",
         "@testing-library/dom": "^10.4.0",
         "@testing-library/jest-dom": "^6.6.3",
@@ -61,16 +61,16 @@
         "jsdom": "^22.1.0",
         "kleur": "^4.1.5",
         "prettier": "^3.3.3",
-        "prettier-plugin-svelte": "^3.2.7",
-        "sass": "^1.80.6",
+        "prettier-plugin-svelte": "^3.2.8",
+        "sass": "^1.81.0",
         "svelte": "^4.2.19",
         "svelte-check": "^3.8.6",
         "svelte-jester": "^2.3.2",
         "svelte-preprocess": "^6.0.3",
         "svelte-sequential-preprocessor": "^2.0.2",
         "tslib": "^2.8.1",
         "typescript": "^5.6.3",
-        "vite": "^5.4.10",
+        "vite": "^5.4.11",
         "vitest": "^1.6.0"
     },
     "type": "module",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
@@ -140,7 +140,7 @@
                         collaborator,
                         undefined,
                         undefined,
-                        `${$page.url.origin}/${base}/organization-${org.$id}`
+                        `${$page.url.origin}${base}/invite`
                     );
                 });
             }

diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
@@ -130,7 +130,7 @@
                             collaborator,
                             undefined,
                             undefined,
-                            `${$page.url.origin}/${base}/organization-${org.$id}`
+                            `${$page.url.origin}${base}/invite`
                         );
                     });
                 }

diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -204,7 +204,7 @@
                         collaborator,
                         undefined,
                         undefined,
-                        `${$page.url.origin}/${base}/organization-${org.$id}`
+                        `${$page.url.origin}${base}/invite`
                     );
                 });
             }

diff --git a/src/routes/(console)/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte
@@ -19,8 +19,6 @@
 
     const dispatch = createEventDispatcher();
 
-    const url = `${$page.url.origin}${base}/invite`;
-
     let email: string,
         name: string,
         error: string,
@@ -34,7 +32,7 @@
                 email,
                 undefined,
                 undefined,
-                url,
+                `${$page.url.origin}${base}/invite`,
                 name || undefined
             );
             await invalidate(Dependencies.ACCOUNT);

diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -33,7 +33,7 @@
     let showEdit = false;
     let showDropdown = [];
     let showPopover = false;
-    const url = `${$page.url.origin}/${base}/`;
+
     const resend = async (member: Models.Membership) => {
         try {
             await sdk.forConsole.teams.createMembership(
@@ -42,7 +42,7 @@
                 member.userEmail,
                 undefined,
                 undefined,
-                url,
+                `${$page.url.origin}${base}/invite`,
                 member.userName || undefined
             );
             addNotification({

diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte
@@ -17,16 +17,14 @@
     let error: string;
 
     async function create() {
-        const url = `${$page.url.origin}/${base}/project-${$page.params.project}/auth/teams/team-${$page.params.team}/members`;
-
         try {
             const user = await sdk.forProject.teams.createMembership(
                 teamId,
                 roles,
                 email || undefined,
                 undefined,
                 undefined,
-                url,
+                `${$page.url.origin}${base}/invite`,
                 name || undefined
             );
             addNotification({

diff --git a/src/routes/(public)/invite/+page.svelte b/src/routes/(public)/invite/+page.svelte
@@ -61,7 +61,7 @@
                 <Button href={`${base}/register`}>Sign up to Appwrite</Button>
             </div>
         {:else}
-            <p class="text">You have been invited to join a team project on Appwrite</p>
+            <p class="text">You have been invited to join an organization on Appwrite</p>
             <Form onSubmit={acceptInvite}>
                 <FormList>
                     <InputChoice