From 1ab0b4c989fb18af6d706716ef68627baa375cf9 Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Tue, 29 Sep 2020 17:23:52 +1000 Subject: [PATCH 1/3] Fix not redirecting to no access page on signin or init item when the user has no access in new interfaces --- packages-next/auth/src/pages/InitPage.tsx | 8 +------- packages-next/auth/src/pages/SigninPage.tsx | 10 ++-------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/packages-next/auth/src/pages/InitPage.tsx b/packages-next/auth/src/pages/InitPage.tsx index 262709d9bd5..4901e922470 100644 --- a/packages-next/auth/src/pages/InitPage.tsx +++ b/packages-next/auth/src/pages/InitPage.tsx @@ -77,14 +77,8 @@ export const InitPage = ({ ), }, }); - if (adminMeta.state === 'error') { - adminMeta.refetch(); - } - if (authenticatedItem.state !== 'loading') { - authenticatedItem.refetch(); - } - await router.push('/'); + window.location.reload(); }} > {error && {error.message}} diff --git a/packages-next/auth/src/pages/SigninPage.tsx b/packages-next/auth/src/pages/SigninPage.tsx index 60f4aca46d2..433e8e978b9 100644 --- a/packages-next/auth/src/pages/SigninPage.tsx +++ b/packages-next/auth/src/pages/SigninPage.tsx @@ -49,17 +49,11 @@ export const SigninPage = ({ mutation }: { mutation: DocumentNode }) => { secret: state.secret, }, }); - if (adminMeta.state === 'error') { - adminMeta.refetch(); - } - if (authenticatedItem.state !== 'loading') { - authenticatedItem.refetch(); - } } catch (err) { return; } - - router.push('/'); + await router.push('/'); + window.location.reload(); } }} > From d75df5654286d550dd920bd08443a76f47ad5e5e Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Tue, 29 Sep 2020 17:29:20 +1000 Subject: [PATCH 2/3] Linting --- packages-next/auth/src/pages/InitPage.tsx | 2 +- packages-next/auth/src/pages/SigninPage.tsx | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages-next/auth/src/pages/InitPage.tsx b/packages-next/auth/src/pages/InitPage.tsx index 4901e922470..454402c87dd 100644 --- a/packages-next/auth/src/pages/InitPage.tsx +++ b/packages-next/auth/src/pages/InitPage.tsx @@ -21,7 +21,7 @@ export const InitPage = ({ mutation: DocumentNode; showKeystoneSignup: boolean; }) => { - const { fieldViews, adminMeta, authenticatedItem } = useRawKeystone(); + const { fieldViews } = useRawKeystone(); const fields = useMemo(() => { const fields: Record = {}; Object.keys(serializedFields).forEach(fieldPath => { diff --git a/packages-next/auth/src/pages/SigninPage.tsx b/packages-next/auth/src/pages/SigninPage.tsx index 433e8e978b9..86b5abf0f45 100644 --- a/packages-next/auth/src/pages/SigninPage.tsx +++ b/packages-next/auth/src/pages/SigninPage.tsx @@ -28,8 +28,6 @@ export const SigninPage = ({ mutation }: { mutation: DocumentNode }) => { identityFieldRef.current?.focus(); }, [mode]); - const { adminMeta, authenticatedItem } = useRawKeystone(); - const [mutate, { error, loading }] = useMutation(mutation); return ( From 278f8eb11fca8808f66738aa8690c0f21ea33e3e Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Tue, 29 Sep 2020 17:32:21 +1000 Subject: [PATCH 3/3] Linting --- packages-next/auth/src/pages/SigninPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages-next/auth/src/pages/SigninPage.tsx b/packages-next/auth/src/pages/SigninPage.tsx index 86b5abf0f45..babf6cd54b4 100644 --- a/packages-next/auth/src/pages/SigninPage.tsx +++ b/packages-next/auth/src/pages/SigninPage.tsx @@ -6,7 +6,6 @@ import { jsx, H1, Stack } from '@keystone-ui/core'; import { Button } from '@keystone-ui/button'; import { TextInput } from '@keystone-ui/fields'; import { Notice } from '@keystone-ui/notice'; -import { useRawKeystone } from '@keystone-spike/admin-ui'; import { SigninContainer } from '../components/SigninContainer'; import { useMutation, DocumentNode } from '@keystone-spike/admin-ui/apollo';