Add auth to all slices

ethyca · Feb 17, 2023 · 5ff58ae · 5ff58ae
1 parent 69ecb30
commit 5ff58ae
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 1 deletion.
diff --git a/clients/admin-ui/src/features/common/health.slice.ts b/clients/admin-ui/src/features/common/health.slice.ts
@@ -2,12 +2,19 @@ import { createSelector } from "@reduxjs/toolkit";
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
 import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { CoreHealthCheck } from "~/types/api";
 
 export const healthApi = createApi({
   reducerPath: "healthApi",
   baseQuery: fetchBaseQuery({
     baseUrl: `/`,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   tagTypes: ["Health"],
   endpoints: (build) => ({

diff --git a/clients/admin-ui/src/features/config-wizard/scanner.slice.ts b/clients/admin-ui/src/features/config-wizard/scanner.slice.ts
@@ -1,11 +1,19 @@
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
+import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { GenerateRequestPayload, GenerateResponse } from "~/types/api";
 
 export const scannerApi = createApi({
   reducerPath: "scannerApi",
   baseQuery: fetchBaseQuery({
     baseUrl: process.env.NEXT_PUBLIC_FIDESCTL_API,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   endpoints: (build) => ({
     generate: build.mutation<GenerateResponse, GenerateRequestPayload>({

diff --git a/clients/admin-ui/src/features/data-qualifier/data-qualifier.slice.ts b/clients/admin-ui/src/features/data-qualifier/data-qualifier.slice.ts
@@ -2,12 +2,19 @@ import { createSelector, createSlice } from "@reduxjs/toolkit";
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
 import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { DataQualifier } from "~/types/api";
 
 export const dataQualifierApi = createApi({
   reducerPath: "dataQualifierApi",
   baseQuery: fetchBaseQuery({
     baseUrl: process.env.NEXT_PUBLIC_FIDESCTL_API,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   tagTypes: ["Data Qualifiers"],
   endpoints: (build) => ({

diff --git a/clients/admin-ui/src/features/data-subjects/data-subject.slice.ts b/clients/admin-ui/src/features/data-subjects/data-subject.slice.ts
@@ -2,12 +2,19 @@ import { createSelector, createSlice } from "@reduxjs/toolkit";
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
 import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { DataSubject } from "~/types/api";
 
 export const dataSubjectsApi = createApi({
   reducerPath: "dataSubjectsApi",
   baseQuery: fetchBaseQuery({
     baseUrl: process.env.NEXT_PUBLIC_FIDESCTL_API,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   tagTypes: ["Data Subjects"],
   endpoints: (build) => ({

diff --git a/clients/admin-ui/src/features/data-use/data-use.slice.ts b/clients/admin-ui/src/features/data-use/data-use.slice.ts
@@ -2,12 +2,19 @@ import { createSelector, createSlice } from "@reduxjs/toolkit";
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
 import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { DataUse } from "~/types/api";
 
 export const dataUseApi = createApi({
   reducerPath: "dataUseApi",
   baseQuery: fetchBaseQuery({
     baseUrl: process.env.NEXT_PUBLIC_FIDESCTL_API,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   tagTypes: ["Data Uses"],
   endpoints: (build) => ({

diff --git a/clients/admin-ui/src/features/organization/organization.slice.ts b/clients/admin-ui/src/features/organization/organization.slice.ts
@@ -1,14 +1,21 @@
 import { createSlice } from "@reduxjs/toolkit";
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
+import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { Organization } from "~/types/api";
 
 // Organization API
 export const organizationApi = createApi({
   reducerPath: "organizationApi",
   baseQuery: fetchBaseQuery({
     baseUrl: process.env.NEXT_PUBLIC_FIDESCTL_API,
-    prepareHeaders: (headers) => headers,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   tagTypes: ["Organization"],
   endpoints: (build) => ({

diff --git a/clients/admin-ui/src/features/system/system.slice.ts b/clients/admin-ui/src/features/system/system.slice.ts
@@ -2,6 +2,8 @@ import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
 import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { System } from "~/types/api";
 
 interface SystemDeleteResponse {
@@ -19,6 +21,11 @@ export const systemApi = createApi({
   reducerPath: "systemApi",
   baseQuery: fetchBaseQuery({
     baseUrl: process.env.NEXT_PUBLIC_FIDESCTL_API,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   tagTypes: ["System"],
   endpoints: (build) => ({

diff --git a/clients/admin-ui/src/features/taxonomy/taxonomy.slice.ts b/clients/admin-ui/src/features/taxonomy/taxonomy.slice.ts
@@ -2,12 +2,19 @@ import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
 import type { RootState } from "~/app/store";
+import { selectToken } from "~/features/auth";
+import { addCommonHeaders } from "~/features/common/CommonHeaders";
 import { DataCategory } from "~/types/api";
 
 export const taxonomyApi = createApi({
   reducerPath: "taxonomyApi",
   baseQuery: fetchBaseQuery({
     baseUrl: process.env.NEXT_PUBLIC_FIDESCTL_API,
+    prepareHeaders: (headers, { getState }) => {
+      const token: string | null = selectToken(getState() as RootState);
+      addCommonHeaders(headers, token);
+      return headers;
+    },
   }),
   tagTypes: ["Data Categories"],
   endpoints: (build) => ({