Revert "fix(headless): use axios instead of apollo for auth"

This reverts commit 644480182d.

src/auth/actions.js

@@ -1,68 +1,40 @@
 import * as Device from "expo-device";
 
 import network from "~/network";
-import env from "~/env";
 
 import {
+  REGISTER_USER_MUTATION,
+  LOGIN_USER_TOKEN_MUTATION,
   STORE_FCM_TOKEN_MUTATION,
-  REGISTER_USER_MUTATION_STRING,
-  LOGIN_USER_TOKEN_MUTATION_STRING,
 } from "~/auth/gql";
 
 import { getDeviceUuid } from "./deviceUuid";
 
-// to support refresh auth in headless mode we'll use axios instead of apollo
-// read more https://github.com/transistorsoft/react-native-background-fetch/issues/562
-
 export async function registerUser() {
-  const { data } = await network.axios.post(
-    env.GRAPHQL_URL,
-    {
-      query: REGISTER_USER_MUTATION_STRING,
+  const { data } = await network.apolloClient.mutate({
+    mutation: REGISTER_USER_MUTATION,
+    context: {
+      skipAuth: true, // Skip adding Authorization header
     },
-    {
-      headers: {
-        // Skip adding Authorization header for this request
-        Authorization: undefined,
-      },
-    },
-  );
-
-  if (data.errors && data.errors.length > 0) {
-    const message = data.errors.map((err) => err.message).join("; ");
-    throw new Error(`GraphQL Error: ${message}`);
-  }
-
-  const authToken = data.data.addOneAuthInitToken.authTokenJwt;
+  });
+  const authToken = data.addOneAuthInitToken.authTokenJwt;
   return { authToken };
 }
 
 export async function loginUserToken({ authToken }) {
   const deviceUuid = await getDeviceUuid();
-  const { data } = await network.axios.post(
-    env.GRAPHQL_URL,
-    {
-      query: LOGIN_USER_TOKEN_MUTATION_STRING,
-      variables: {
-        authTokenJwt: authToken,
-        phoneModel: Device.modelName,
-        deviceUuid,
-      },
+  const { data } = await network.apolloClient.mutate({
+    mutation: LOGIN_USER_TOKEN_MUTATION,
+    variables: {
+      authTokenJwt: authToken,
+      phoneModel: Device.modelName,
+      deviceUuid,
     },
-    {
-      headers: {
-        // Skip adding Authorization header for this request
-        Authorization: undefined,
-      },
+    context: {
+      skipAuth: true, // Skip adding Authorization header
     },
-  );
-
-  if (data.errors && data.errors.length > 0) {
-    const message = data.errors.map((err) => err.message).join("; ");
-    throw new Error(`GraphQL Error: ${message}`);
-  }
-
-  const userToken = data.data.doAuthLoginToken.userBearerJwt;
+  });
+  const userToken = data.doAuthLoginToken.userBearerJwt;
   return { userToken };
 }
 

src/auth/gql.js

@@ -1,5 +1,4 @@
 import { gql } from "@apollo/client";
-import { print } from "graphql";
 
 export const REGISTER_USER_MUTATION = gql`
   mutation registerUser {
@@ -37,9 +36,3 @@ export const STORE_FCM_TOKEN_MUTATION = gql`
     }
   }
 `;
-
-// Convert GraphQL documents to strings for Axios requests
-export const REGISTER_USER_MUTATION_STRING = print(REGISTER_USER_MUTATION);
-export const LOGIN_USER_TOKEN_MUTATION_STRING = print(
-  LOGIN_USER_TOKEN_MUTATION,
-);

src/network/NetworkProviders.js

@@ -5,7 +5,7 @@ import { ApolloProvider } from "@apollo/client";
 
 import createApolloClient from "~/network/apollo";
 
-import createAxios from "~/network/axios";
+// import createAxios from "~/network/axios";
 import createKy from "~/network/ky";
 
 import network from "~/network";
@@ -41,8 +41,6 @@ initializeNewApolloClient();
 const oaFilesKy = createKy({ prefixUrl: env.OA_FILES_URL + "/" }, { store });
 network.oaFilesKy = oaFilesKy;
 
-network.axios = createAxios();
-
 export default function NetworkProviders({ children }) {
   const [key, setKey] = useState(0);
 

src/network/axios.js

@@ -24,19 +24,8 @@ export default function createAxios(baseOptions = {}) {
           "Content-Type": "application/json",
         },
       };
-
-      // Only add bearer token if Authorization header is not explicitly set to undefined
-      if (config.headers.Authorization !== undefined) {
-        setBearerHeader(defaultConfig.headers, getAuthState().userToken);
-      }
-
+      setBearerHeader(defaultConfig.headers, getAuthState().userToken);
       defaultsDeep(config, defaultConfig);
-
-      // Clean up undefined Authorization header
-      if (config.headers.Authorization === undefined) {
-        delete config.headers.Authorization;
-      }
-
       return config;
     },
     function (error) {