fix: dynamically inject fetchwrapper to only initialise after resolving

This fixes a bug causing Timetabl not to work until after refreshing the first time you log in

Author: debater-coder

apps/client/src/main.tsx

@@ -84,34 +84,35 @@ const oauthClient = new OAuth2Client({
   authorizationEndpoint: config.authorization_endpoint,
 });
 
-const fetchWrapper = new OAuth2Fetch({
-  client: oauthClient,
+const fetchWrapperInjector = () =>
+  new OAuth2Fetch({
+    client: oauthClient,
 
-  getNewToken: () => {
-    log("getNewToken invoked");
+    getNewToken: () => {
+      log("getNewToken invoked");
 
-    // Set the status to expired
-    useAuthStore.setState({ status: AuthStatus.EXPIRED });
+      // Set the status to expired
+      useAuthStore.setState({ status: AuthStatus.EXPIRED });
 
-    return null; // Fail this step, we don't want to log out until the user does so explicitly
-  },
+      return null; // Fail this step, we don't want to log out until the user does so explicitly
+    },
 
-  storeToken: (token) => {
-    useAuthStore.setState({
-      token,
-    });
-  },
+    storeToken: (token) => {
+      useAuthStore.setState({
+        token,
+      });
+    },
 
-  getStoredToken: () => {
-    return useAuthStore.getState().token;
-  },
-});
+    getStoredToken: () => {
+      return useAuthStore.getState().token;
+    },
+  });
 
 const authActions = new OAuth2Actions(
   useAuthStore,
   queryClient,
   oauthClient,
-  fetchWrapper,
+  fetchWrapperInjector,
   toast
 );
 

apps/client/src/services/OAuth2Actions/OAuth2Actions.ts

@@ -27,11 +27,13 @@ interface AuthStore {
 }
 
 class OAuth2Actions implements AuthActions {
+  private fetchWrapper?: FetchWrapper;
+
   constructor(
     private authStore: AuthStore,
     private queryClient: QueryClient,
     private oauthClient: OAuth2Client,
-    private fetchWrapper: FetchWrapper,
+    private fetchWrapperInject: () => FetchWrapper,
     private toast: Notifier
   ) {}
 
@@ -135,7 +137,15 @@ class OAuth2Actions implements AuthActions {
         pkceState: "",
         codeVerifier: "",
       });
+      return;
+    }
+
+    if (!this.authStore.getState().token) {
+      return;
     }
+
+    // Inject fetch wrapper
+    this.fetchWrapper = this.fetchWrapperInject();
   };
 
   public logout = async () => {
@@ -160,6 +170,10 @@ class OAuth2Actions implements AuthActions {
     endpoint: SbhsApiEndpoint,
     options?: Record<string, string>
   ) => {
+    if (!this.fetchWrapper) {
+      throw new Error("Fetch wrapper not set");
+    }
+
     let res: Response;
     try {
       res = await this.fetchWrapper.fetch(