Merge pull request #5 from pesca-dev/add-registration-email

Auth: add user verification and improve session handling
pesca-dev · Nov 5, 2024 · 2a9857f · 2a9857f
2 parents fa6ac0a + 222616c
commit 2a9857f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/components/navbar.tsx b/src/components/navbar.tsx
@@ -32,17 +32,18 @@ export function NavBar() {
     <AppBar>
       <Container maxWidth="lg">
         <Toolbar disableGutters>
-          <Box sx={{ flexGrow: 1, display: "flex", alignItems: "center" }}>
-            <LocalBar sx={{ mr: 1 }} />
+          <Box sx={{ flexGrow: 1, display: "flex" }}>
             <Typography
               variant="h6"
               noWrap
               component="a"
+              href="/"
               sx={{
                 display: {
                   xs: "none",
                   md: "inline-flex",
                 },
+                alignItems: "center",
                 mr: 2,
                 fontFamily: "monospace",
                 fontWeight: 700,
@@ -51,6 +52,7 @@ export function NavBar() {
                 textDecoration: "none",
               }}
             >
+              <LocalBar sx={{ mr: 1 }} />
               Kneipolympics
             </Typography>
           </Box>

diff --git a/src/contexts/appwrite.tsx b/src/contexts/appwrite.tsx
@@ -13,7 +13,9 @@ type Props = PropsWithChildren;
 
 export function AppwriteContextProvider({ children }: Props) {
   const client = new Client();
-  client.setProject("67257b8d001f6f36d0be");
+  client
+    .setEndpoint("https://cloud.appwrite.io/v1")
+    .setProject("67257b8d001f6f36d0be");
 
   const value = {
     client,

diff --git a/src/contexts/auth.tsx b/src/contexts/auth.tsx
@@ -1,6 +1,7 @@
 import {
   createContext,
   PropsWithChildren,
+  useCallback,
   useEffect,
   useMemo,
   useState,
@@ -28,7 +29,21 @@ export function AuthContextProvider({ children }: PropsWithChildren) {
     Models.User<Models.Preferences> | undefined
   >();
 
+  const verifyUser = useCallback(async () => {
+    const params = new URLSearchParams(window.location.search);
+    const userId = params.get("userId");
+    const secret = params.get("secret");
+
+    if (!(userId && secret)) {
+      return;
+    }
+
+    await account.updateVerification(userId, secret).catch(() => {});
+  }, [account]);
+
   useEffect(() => {
+    verifyUser();
+
     account
       .getSession("current")
       .then((session) => {
@@ -41,7 +56,7 @@ export function AuthContextProvider({ children }: PropsWithChildren) {
           .catch(() => account.deleteSession("current"));
       })
       .catch(() => {});
-  }, [account]);
+  }, [account, verifyUser]);
 
   async function login(email: string, password: string): Promise<void> {
     const session = await account.createEmailPasswordSession(email, password);
@@ -76,6 +91,9 @@ export function AuthContextProvider({ children }: PropsWithChildren) {
     name: string,
   ): Promise<void> {
     await account.create(ID.unique(), email, password, name);
+    await account.createEmailPasswordSession(email, password);
+    await account.createVerification(window.location.origin.toString());
+    await account.deleteSession("current");
   }
 
   const value = {