Revert "Next fix (#219)" (#220)

This reverts commit 3b2d0d5.

Author: ZainabImadulla

frontend/actions/auth.ts

@@ -4,8 +4,8 @@ import { revalidatePath } from "next/cache";
 import { createSupabaseClient } from "@/utils/supabase/server";
 import { loginInitialState, requiredOnboardingProgress, signupInitialState } from "@/types/user";
 import { createClient } from "@supabase/supabase-js";
-import { getCompanyServerSide } from "@/api/company-server";
-import { importQuickbooksDataServerSide } from "../api/quickbooks-server";
+import { importQuickbooksData } from "@/api/quickbooks";
+import { getCompany } from "@/api/company";
 
 export async function login(prevState: loginInitialState, formData: FormData) {
     const supabase = await createSupabaseClient();
@@ -21,9 +21,9 @@ export async function login(prevState: loginInitialState, formData: FormData) {
         };
     }
 
-    const company = await getCompanyServerSide();
+    const company = await getCompany();
     if (company?.externals) {
-        importQuickbooksDataServerSide();
+        importQuickbooksData();
     }
 
     revalidatePath("/", "layout");

frontend/api/business-profile.ts

@@ -1,5 +1,6 @@
+"use server";
 import { DocumentResponse, PresignedUploadResponse, DocumentCategories, DocumentTypes } from "@/types/documents";
-import { authHeader, clientAuthWrapper, getClient } from "./client";
+import { authHeader, authWrapper, getClient } from "./client";
 import { getCompany } from "./company";
 import { gzip } from "pako";
 
@@ -27,7 +28,7 @@ export const getAllDocuments = async (): Promise<DocumentResponse[]> => {
         return data;
     };
 
-    return clientAuthWrapper<DocumentResponse[]>()(req);
+    return authWrapper<DocumentResponse[]>()(req);
 };
 
 export async function getBusinessDocumentUploadUrl(
@@ -55,7 +56,7 @@ export async function getBusinessDocumentUploadUrl(
         return data;
     };
 
-    return clientAuthWrapper<PresignedUploadResponse>()(req);
+    return authWrapper<PresignedUploadResponse>()(req);
 }
 
 export async function confirmBusinessDocumentUpload(
@@ -83,7 +84,7 @@ export async function confirmBusinessDocumentUpload(
         }
     };
 
-    return clientAuthWrapper<void>()(req);
+    return authWrapper<void>()(req);
 }
 
 export async function updateDocumentCategory(documentId: string, category: DocumentCategories): Promise<void> {
@@ -100,7 +101,7 @@ export async function updateDocumentCategory(documentId: string, category: Docum
         }
     };
 
-    return clientAuthWrapper<void>()(req);
+    return authWrapper<void>()(req);
 }
 
 export async function deleteBusinessDocument(key: string, documentId: string): Promise<void> {
@@ -117,7 +118,7 @@ export async function deleteBusinessDocument(key: string, documentId: string): P
         }
     };
 
-    return clientAuthWrapper<void>()(req);
+    return authWrapper<void>()(req);
 }
 
 export async function uploadToS3(uploadUrl: string, file: File): Promise<void> {

frontend/api/claim-location.ts

@@ -1,4 +1,6 @@
-import { authHeader, clientAuthWrapper, getClient } from "./client";
+"use server";
+
+import { authHeader, authWrapper, getClient } from "./client";
 import { CreateClaimLocationRequest, CreateClaimLocationResponse } from "@/types/claim-location";
 
 export const createClaimLocationLink = async (
@@ -16,5 +18,5 @@ export const createClaimLocationLink = async (
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<CreateClaimLocationResponse>()(req);
+    return authWrapper<CreateClaimLocationResponse>()(req);
 };

frontend/api/claim.ts

@@ -1,3 +1,4 @@
+"use server";
 import {
     ConfirmDocumentUploadRequest,
     ConfirmDocumentUploadResponse,
@@ -16,7 +17,7 @@ import {
     UploadClaimRelatedDocumentsRequest,
     UploadClaimRelatedDocumentsResponse,
 } from "@/types/claim";
-import { authHeader, clientAuthWrapper, getClient } from "./client";
+import { authHeader, authWrapper, getClient } from "./client";
 
 export const createClaim = async (payload: CreateClaimRequest): Promise<CreateClaimResponse> => {
     const req = async (token: string): Promise<CreateClaimResponse> => {
@@ -31,7 +32,7 @@ export const createClaim = async (payload: CreateClaimRequest): Promise<CreateCl
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<CreateClaimResponse>()(req);
+    return authWrapper<CreateClaimResponse>()(req);
 };
 
 export const getClaims = async (input: GetCompanyClaimRequest): Promise<GetCompanyClaimResponse> => {
@@ -47,7 +48,7 @@ export const getClaims = async (input: GetCompanyClaimRequest): Promise<GetCompa
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<GetCompanyClaimResponse>()(req);
+    return authWrapper<GetCompanyClaimResponse>()(req);
 };
 
 export const getPurchaseLineItemsFromClaim = async (params: {
@@ -71,7 +72,7 @@ export const getPurchaseLineItemsFromClaim = async (params: {
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<GetClaimLineItemsResponse>()(req);
+    return authWrapper<GetClaimLineItemsResponse>()(req);
 };
 
 export const getClaimById = async (claimId: string): Promise<GetClaimByIdResponse> => {
@@ -89,7 +90,7 @@ export const getClaimById = async (claimId: string): Promise<GetClaimByIdRespons
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<GetClaimByIdResponse>()(req);
+    return authWrapper<GetClaimByIdResponse>()(req);
 };
 
 export const updateClaimStatus = async (
@@ -111,7 +112,7 @@ export const updateClaimStatus = async (
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<UpdateClaimStatusResponse>()(req);
+    return authWrapper<UpdateClaimStatusResponse>()(req);
 };
 
 export const uploadAndConfirmDocumentRelation = async (
@@ -157,7 +158,7 @@ export const uploadClaimRelatedDocuments = async (
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<UploadClaimRelatedDocumentsResponse>()(req);
+    return authWrapper<UploadClaimRelatedDocumentsResponse>()(req);
 };
 
 export const conformUploadedDocument = async (
@@ -176,7 +177,7 @@ export const conformUploadedDocument = async (
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<ConfirmDocumentUploadResponse>()(req);
+    return authWrapper<ConfirmDocumentUploadResponse>()(req);
 };
 
 export const linkLineItemToClaim = async (claimId: string, purchaseLineItemId: string) => {
@@ -192,7 +193,7 @@ export const linkLineItemToClaim = async (claimId: string, purchaseLineItemId: s
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<LinkLineItemToClaimResponse>()(req);
+    return authWrapper<LinkLineItemToClaimResponse>()(req);
 };
 
 export const linkPurchaseToClaim = async (claimId: string, purchaseId: string) => {
@@ -208,7 +209,7 @@ export const linkPurchaseToClaim = async (claimId: string, purchaseId: string) =
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<LinkPurchaseToClaimResponse>()(req);
+    return authWrapper<LinkPurchaseToClaimResponse>()(req);
 };
 
 export const createClaimPDF = async (claimId: string) => {
@@ -226,7 +227,7 @@ export const createClaimPDF = async (claimId: string) => {
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<CreateClaimPDFResponse>()(req);
+    return authWrapper<CreateClaimPDFResponse>()(req);
 };
 
 export const deleteClaim = async (claimId: string) => {
@@ -244,5 +245,5 @@ export const deleteClaim = async (claimId: string) => {
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<DeleteClaimResponse>()(req);
+    return authWrapper<DeleteClaimResponse>()(req);
 };

frontend/api/client.ts

@@ -37,14 +37,3 @@ export const authWrapper =
 export const getClientAuthToken = async (): Promise<string> => {
     return await getAuthToken();
 };
-
-/**
- * Client-side: Wraps a function that needs authentication token
- * Uses getAuthToken() which reads from browser cookies/storage
- */
-export const clientAuthWrapper =
-    <T>() =>
-    async (fn: (token: string) => Promise<T>) => {
-        const token = await getAuthToken();
-        return fn(token);
-    };

frontend/api/company-server.ts

@@ -1,3 +1,4 @@
+"use server";
 import {
     Company,
     CompanyHasDataResponse,
@@ -7,7 +8,7 @@ import {
     UpdateCompanyRequest,
     UpdateCompanyResponse,
 } from "@/types/company";
-import { authHeader, clientAuthWrapper, getClient } from "./client";
+import { authHeader, authWrapper, getClient } from "./client";
 
 export const createCompany = async (payload: CreateCompanyRequest): Promise<Company> => {
     const req = async (token: string): Promise<Company> => {
@@ -22,7 +23,7 @@ export const createCompany = async (payload: CreateCompanyRequest): Promise<Comp
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<Company>()(req);
+    return authWrapper<Company>()(req);
 };
 
 export const getCompanyLocations = async (): Promise<GetCompanyLocationsResponse> => {
@@ -37,7 +38,7 @@ export const getCompanyLocations = async (): Promise<GetCompanyLocationsResponse
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<GetCompanyLocationsResponse>()(req);
+    return authWrapper<GetCompanyLocationsResponse>()(req);
 };
 
 export const getCompany = async (): Promise<Company> => {
@@ -52,7 +53,7 @@ export const getCompany = async (): Promise<Company> => {
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<Company>()(req);
+    return authWrapper<Company>()(req);
 };
 
 export const getClaimInProgress = async (): Promise<GetClaimInProgressForCompanyResponse> => {
@@ -67,7 +68,7 @@ export const getClaimInProgress = async (): Promise<GetClaimInProgressForCompany
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<GetClaimInProgressForCompanyResponse>()(req);
+    return authWrapper<GetClaimInProgressForCompanyResponse>()(req);
 };
 
 export const companyHasData = async (): Promise<CompanyHasDataResponse> => {
@@ -82,7 +83,7 @@ export const companyHasData = async (): Promise<CompanyHasDataResponse> => {
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<CompanyHasDataResponse>()(req);
+    return authWrapper<CompanyHasDataResponse>()(req);
 };
 
 export const updateCompany = async (payload: UpdateCompanyRequest): Promise<UpdateCompanyResponse> => {
@@ -98,5 +99,5 @@ export const updateCompany = async (payload: UpdateCompanyRequest): Promise<Upda
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<UpdateCompanyResponse>()(req);
+    return authWrapper<UpdateCompanyResponse>()(req);
 };

frontend/api/company.ts

@@ -1,3 +1,4 @@
+"use server";
 import { BannerData } from "@/types/user";
 import { getNotifications } from "./notifications";
 import { getClaimInProgress } from "./company";

frontend/api/dashboard.ts

@@ -1,5 +1,7 @@
+"use server";
+
 import { FemaRisKIndexCountiesFemaDisaster } from "@/types/fema-risk-index";
-import { authHeader, clientAuthWrapper, getClient } from "./client";
+import { authHeader, authWrapper, getClient } from "./client";
 
 export const getFemaRiskIndexData = async (): Promise<FemaRisKIndexCountiesFemaDisaster> => {
     const req = async (token: string): Promise<FemaRisKIndexCountiesFemaDisaster> => {
@@ -13,7 +15,7 @@ export const getFemaRiskIndexData = async (): Promise<FemaRisKIndexCountiesFemaD
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<FemaRisKIndexCountiesFemaDisaster>()(req);
+    return authWrapper<FemaRisKIndexCountiesFemaDisaster>()(req);
 };
 
 export const refreshFemaRiskIndexData = async (): Promise<void> => {
@@ -26,5 +28,5 @@ export const refreshFemaRiskIndexData = async (): Promise<void> => {
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<void>()(req);
+    return authWrapper<void>()(req);
 };

frontend/api/fema-risk-index.ts

@@ -1,3 +1,4 @@
+"use server";
 import {
     CreateInsurancePolicyBulkRequest,
     CreateInsurancePolicyRequest,
@@ -8,7 +9,7 @@ import {
     UpdateInsurancePolicyRequest,
     UpdateInsurancePolicyResponse,
 } from "@/types/insurance-policy";
-import { getClient, authHeader, clientAuthWrapper } from "./client";
+import { getClient, authHeader, authWrapper } from "./client";
 
 export const createInsurancePolicy = async (payload: CreateInsurancePolicyRequest): Promise<InsurancePolicy> => {
     const req = async (token: string): Promise<InsurancePolicy> => {
@@ -23,7 +24,7 @@ export const createInsurancePolicy = async (payload: CreateInsurancePolicyReques
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<InsurancePolicy>()(req);
+    return authWrapper<InsurancePolicy>()(req);
 };
 
 export const createInsurancePolicyBulk = async (
@@ -41,7 +42,7 @@ export const createInsurancePolicyBulk = async (
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<InsurancePolicy[]>()(req);
+    return authWrapper<InsurancePolicy[]>()(req);
 };
 
 export const getInsurancePolicies = async (): Promise<GetInsurancePoliciesResponseType> => {
@@ -56,7 +57,7 @@ export const getInsurancePolicies = async (): Promise<GetInsurancePoliciesRespon
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<GetInsurancePoliciesResponseType>()(req);
+    return authWrapper<GetInsurancePoliciesResponseType>()(req);
 };
 
 export const updateInsurancePolicy = async (
@@ -74,7 +75,7 @@ export const updateInsurancePolicy = async (
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<UpdateInsurancePolicyResponse>()(req);
+    return authWrapper<UpdateInsurancePolicyResponse>()(req);
 };
 
 export const updateInsurancePolicyBulk = async (
@@ -92,7 +93,7 @@ export const updateInsurancePolicyBulk = async (
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<UpdateInsurancePolicyBulkResponse>()(req);
+    return authWrapper<UpdateInsurancePolicyBulkResponse>()(req);
 };
 
 export const deleteInsurancePolicy = async (insurancePolicyId: string): Promise<void> => {
@@ -110,5 +111,5 @@ export const deleteInsurancePolicy = async (insurancePolicyId: string): Promise<
             throw Error(error?.error);
         }
     };
-    return clientAuthWrapper<void>()(req);
+    return authWrapper<void>()(req);
 };