reload the page

tinacms · Nov 8, 2023 · 3e78100 · 3e78100
1 parent 49798cf
commit 3e78100
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/packages/tinacms-authjs/src/tinacms.ts b/packages/tinacms-authjs/src/tinacms.ts
@@ -13,10 +13,16 @@ export const TINA_CREDENTIALS_PROVIDER_NAME = 'TinaCredentials'
 export class DefaultAuthJSProvider extends AbstractAuthProvider {
   readonly callbackUrl: string
   readonly name: string
-  constructor(props?: { name?: string; callbackUrl?: string }) {
+  readonly redirect: boolean
+  constructor(props?: {
+    name?: string
+    callbackUrl?: string
+    redirect?: boolean
+  }) {
     super()
     this.name = props?.name || TINA_CREDENTIALS_PROVIDER_NAME
     this.callbackUrl = props?.callbackUrl || '/admin/index.html'
+    this.redirect = props?.redirect ?? false
     console.log('DefaultAuthJSProvider', this.name, this.callbackUrl)
   }
   async authenticate(props?: {}): Promise<any> {
@@ -34,7 +40,7 @@ export class DefaultAuthJSProvider extends AbstractAuthProvider {
   }
   logout() {
     console.log('DefaultAuthJSProvider.logout', this.callbackUrl)
-    return signOut({ redirect: false, callbackUrl: this.callbackUrl })
+    return signOut({ redirect: this.redirect, callbackUrl: this.callbackUrl })
   }
   async authorize(context?: any): Promise<any> {
     const user: any = (await getSession(context))?.user || {}

diff --git a/packages/tinacms/src/auth/TinaCloudProvider.tsx b/packages/tinacms/src/auth/TinaCloudProvider.tsx
@@ -283,11 +283,7 @@ export const AuthWallInner = ({
                   if (typeof client?.onLogout === 'function') {
                     await client.onLogout()
                   }
-                  const token = await authProvider.authenticate()
-                  if (typeof client?.onLogin === 'function') {
-                    await client?.onLogin({ token })
-                  }
-                  return onAuthenticated()
+                  window.location.href = new URL(window.location.href).pathname
                 } catch (e) {
                   console.error(e)
                   setActiveModal('error')

diff --git a/packages/tinacms/src/toolkit/components/account/update-password.tsx b/packages/tinacms/src/toolkit/components/account/update-password.tsx
@@ -52,6 +52,7 @@ export function UpdatePassword(props: {}) {
       // sleep for 1 second to allow the user to see the success message
       await new Promise((resolve) => setTimeout(resolve, 1000))
       client?.authProvider?.logout().catch((e) => console.error(e))
+      window.location.href = new URL(window.location.href).pathname
     }
     setFormState('idle')
   }

diff --git a/packages/tinacms/src/toolkit/react-sidebar/components/nav.tsx b/packages/tinacms/src/toolkit/react-sidebar/components/nav.tsx
@@ -130,6 +130,9 @@ export const Nav = ({
                               if (cms?.api?.tina?.onLogout) {
                                 await cms?.api?.tina?.onLogout()
                               }
+                              window.location.href = new URL(
+                                window.location.href
+                              ).pathname
                             }
                             setEdit(false)
                           } catch (e) {