set auth for coredomainclient requests

theopensystemslab · Feb 9, 2024 · 4798761 · 4798761
1 parent 91e3878
commit 4798761
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/editor.planx.uk/src/@planx/components/Confirmation/Public.tsx b/editor.planx.uk/src/@planx/components/Confirmation/Public.tsx
@@ -33,15 +33,20 @@ export type Props = PublicProps<Confirmation>;
 export default function ConfirmationComponent(props: Props) {
   const [data, setData] = useState<QuestionAndResponses[]>([]);
 
-  const [sessionId, $public] = useStore((state) => [
+  const [sessionId, saveToEmail, $public] = useStore((state) => [
     state.sessionId,
+    state.saveToEmail,
     state.$public,
   ]);
 
   useEffect(() => {
     const makeCsvData = async () => {
-      const csvData = await $public.export.csvData(sessionId);
-      setData(csvData);
+      if (sessionId && saveToEmail) {
+        const csvData = await $public({
+          session: { sessionId: sessionId, email: saveToEmail },
+        }).export.csvData(sessionId);
+        setData(csvData);
+      }
     };
 
     if (data?.length < 1) {

diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/shared.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/shared.ts
@@ -1,4 +1,5 @@
 import { CoreDomainClient } from "@opensystemslab/planx-core";
+import { Auth } from "@opensystemslab/planx-core/dist/requests/graphql";
 import { ROOT_NODE_KEY } from "@planx/graph";
 import { capitalize } from "lodash";
 import { removeSessionIdSearchParam } from "utils";
@@ -32,7 +33,7 @@ export interface SharedStore extends Store.Store {
   setPreviewEnvironment: (previewEnvironment: PreviewEnvironment) => void;
   setFlowSlug: (flowSlug: string) => void;
   setFlowNameFromSlug: (flowSlug: string) => void;
-  $public: CoreDomainClient;
+  $public: (auth?: Auth) => CoreDomainClient;
   $client: CoreDomainClient;
 }
 
@@ -111,9 +112,12 @@ export const sharedStore: StateCreator<
     set({ flowName });
   },
 
-  $public: new CoreDomainClient({
-    targetURL: process.env.REACT_APP_HASURA_URL!,
-  }),
+  $public(auth: Auth | undefined): CoreDomainClient {
+    return new CoreDomainClient({
+      targetURL: process.env.REACT_APP_HASURA_URL!,
+      auth: auth,
+    });
+  },
 
   /**
    * Authenticated client is re-instantiated upon user login

diff --git a/editor.planx.uk/src/pages/Pay/MakePayment.tsx b/editor.planx.uk/src/pages/Pay/MakePayment.tsx
@@ -175,7 +175,7 @@ export default function MakePayment({
 
     useEffect(() => {
       const fetchProjectType = async () => {
-        const projectType = await $public.formatRawProjectTypes(
+        const projectType = await $public().formatRawProjectTypes(
           rawProjectTypes,
         );
         setProjectType(projectType);

diff --git a/editor.planx.uk/src/pages/Preview/StatusPage.tsx b/editor.planx.uk/src/pages/Preview/StatusPage.tsx
@@ -36,15 +36,20 @@ const StatusPage: React.FC<Props> = ({
   const theme = useTheme();
   const [data, setData] = useState<QuestionAndResponses[]>([]);
 
-  const [sessionId, $public] = useStore((state) => [
+  const [sessionId, saveToEmail, $public] = useStore((state) => [
     state.sessionId,
+    state.saveToEmail,
     state.$public,
   ]);
 
   useEffect(() => {
     const makeCsvData = async () => {
-      const csvData = await $public.export.csvData(sessionId);
-      setData(csvData);
+      if (sessionId && saveToEmail) {
+        const csvData = await $public({
+          session: { sessionId: sessionId, email: saveToEmail },
+        }).export.csvData(sessionId);
+        setData(csvData);
+      }
     };
 
     if (data?.length < 1) {

diff --git a/hasura.planx.uk/metadata/tables.yaml b/hasura.planx.uk/metadata/tables.yaml
@@ -658,6 +658,7 @@
         columns:
           - created_at
           - data
+          - flow_id
           - has_user_saved
           - id
           - submitted_at