Use single method to update session (#16)

* Use single method to update session * Remove unused cookie lib
polldo · May 21, 2023 · 7654dc5 · 7654dc5
1 parent c2ee1cb
commit 7654dc5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 62 deletions.
diff --git a/core/auth/handler.go b/core/auth/handler.go
@@ -167,14 +167,11 @@ func HandleOauthCallback(db *sqlx.DB, session *scs.SessionManager, provs map[str
 
 func HandleLogout(session *scs.SessionManager) web.Handler {
 	return func(ctx context.Context, w http.ResponseWriter, r *http.Request) error {
-		session.Remove(ctx, userKey)
-		session.Remove(ctx, roleKey)
-
-		if err := session.RenewToken(ctx); err != nil {
+		if err := session.Destroy(ctx); err != nil {
 			return err
 		}
 
-		return nil
+		return web.Respond(ctx, w, nil, http.StatusNoContent)
 	}
 }
 

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -10,14 +10,12 @@
     },
     "dependencies": {
         "@next/font": "13.1.6",
-        "@types/js-cookie": "^3.0.3",
         "@types/node": "18.11.18",
         "@types/react": "18.0.27",
         "@types/react-dom": "18.0.10",
         "buffer": "^6.0.3",
         "eslint": "8.33.0",
         "eslint-config-next": "13.1.6",
-        "js-cookie": "^3.0.5",
         "next": "13.1.6",
         "react": "18.2.0",
         "react-dom": "18.2.0",

diff --git a/frontend/pages/login.tsx b/frontend/pages/login.tsx
@@ -7,16 +7,20 @@ import { useSession } from '@/session/context'
 import { useFetch } from '@/services/fetch'
 
 export default function Login() {
-    const router = useRouter()
     const [email, setEmail] = useState('')
     const [password, setPassword] = useState('')
     const [error, setError] = useState('')
-
-    const { isLoggedIn, isLoading, login } = useSession()
+    const { isLoggedIn, isLoading, updateSession } = useSession()
+    const router = useRouter()
     const fetch = useFetch()
 
+    if (isLoading) {
+        return null
+    }
+
     if (isLoggedIn) {
-        router.push('activate')
+        router.push('dashboard')
+        return null
     }
 
     const handleSubmit = async (e: React.FormEvent) => {
@@ -41,8 +45,7 @@ export default function Login() {
             if (!res.ok) {
                 throw new Error('Something went wrong')
             }
-
-            login()
+            updateSession()
         } catch (err) {
             if (err instanceof Error) {
                 setError(err.message)

diff --git a/frontend/pages/signup.tsx b/frontend/pages/signup.tsx
@@ -4,11 +4,11 @@ import { useState } from 'react'
 import { useRouter } from 'next/router'
 
 export default function Signup() {
-    const router = useRouter()
     const [name, setName] = useState('')
     const [email, setEmail] = useState('')
     const [password, setPassword] = useState('')
     const [error, setError] = useState<string>('')
+    const router = useRouter()
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault()

diff --git a/frontend/services/fetch.tsx b/frontend/services/fetch.tsx
@@ -4,7 +4,7 @@ import { useSession } from '@/session/context'
 // - adds the 'credentials' header, to allow sending the session cookie to the backend.
 // - calls the logout function when a 401 error is returned.
 export function useFetch() {
-    const { logout } = useSession()
+    const { updateSession } = useSession()
 
     async function customFetch(url: RequestInfo, options: RequestInit = {}): Promise<Response> {
         if (options.method !== 'OPTIONS') {
@@ -13,7 +13,7 @@ export function useFetch() {
 
         const response = await fetch(url, options)
         if (response.status === 401) {
-            logout()
+            updateSession()
         }
 
         return response

diff --git a/frontend/session/context.tsx b/frontend/session/context.tsx
@@ -3,20 +3,17 @@ import { ReactNode } from 'react'
 import { useEffect } from 'react'
 import { createContext } from 'react'
 import { useContext } from 'react'
-import Cookies from 'js-cookie'
 
 type Session = {
     isLoggedIn: boolean
     isLoading: boolean
-    login: () => void
-    logout: () => void
+    updateSession: () => void
 }
 
 export const SessionContext = createContext<Session>({
     isLoggedIn: false,
     isLoading: true,
-    login: () => {},
-    logout: () => {},
+    updateSession: () => {},
 })
 
 export function useSession() {
@@ -27,36 +24,26 @@ export function SessionProvider(props: { children: ReactNode }) {
     const [isLoggedIn, setIsLoggedIn] = useState<boolean>(false)
     const [isLoading, setIsLoading] = useState<boolean>(true)
 
-    // When the user wants to logout or the session expires, this function must be called.
-    function logout() {
-        Cookies.remove('session')
-        setIsLoggedIn(false)
-    }
-
-    // Upon login, the state is automatically added in cookies,
-    // so we only need to set the session state to true.
-    function login() {
-        setIsLoggedIn(true)
-    }
-
-    useEffect(() => {
+    function sync() {
         const user = async () => {
             const response = await fetch('http://mylocal.com:8000/users/current', { credentials: 'include' })
             setIsLoggedIn(response.ok)
             setIsLoading(false)
         }
 
         user().catch(() => {
-            setIsLoggedIn(false)
             setIsLoading(false)
         })
+    }
+
+    useEffect(() => {
+        sync()
     }, [])
 
     const session: Session = {
         isLoggedIn: isLoggedIn,
         isLoading: isLoading,
-        login: login,
-        logout: logout,
+        updateSession: sync,
     }
 
     return <SessionContext.Provider value={session}>{props.children}</SessionContext.Provider>