Modify error handling

Author: bnjmnt4n

src/commons/api/index.ts

@@ -34,20 +34,19 @@ export const customFetch = async (
   const shouldRefresh = opts.shouldRefresh ?? true;
   const shouldAutoLogout = opts.shouldAutoLogout ?? true;
 
+  const resp = await fetch(url, opts as RequestInit);
   try {
-    const resp = await fetch(url, opts as RequestInit);
-
     // response.ok is (200 <= response.status <= 299)
     // response.status of > 299 does not raise error; so deal with in in the try clause
 
     // Refresh the user's tokens if a response status of 401 was obtained.
-    if (shouldRefresh && resp && resp.status === 401) {
+    if (shouldRefresh && resp.status === 401) {
       const newTokens = await Cadet.auth.refresh({ refresh_token: opts.refreshToken! });
       const tokens = newTokens.data!;
       store.dispatch(
         actions.setTokens({
-          accessToken: tokens.access_token!,
-          refreshToken: tokens.refresh_token!
+          accessToken: tokens.access_token,
+          refreshToken: tokens.refresh_token
         })
       );
       const newOpts = {
@@ -58,14 +57,14 @@ export const customFetch = async (
       return customFetch(url, newOpts);
     }
 
-    if (resp && !resp.ok && !shouldAutoLogout) {
+    if (!resp.ok && !shouldAutoLogout) {
       // this clause is mostly for SUBMIT_ANSWER; show an error message instead
       // and ask student to manually logout, so that they have a chance to save
       // their answers
       return resp;
     }
 
-    if (!resp || !resp.ok) {
+    if (!resp.ok) {
       throw new Error('API call failed or got non-OK response');
     }
 
@@ -75,7 +74,7 @@ export const customFetch = async (
     store.dispatch(actions.logOut());
     showWarningMessage(opts.errorMessage ? opts.errorMessage : 'Please login again.');
 
-    return null;
+    return resp;
   }
 };
 

src/commons/sagas/RequestsSaga.ts

@@ -85,7 +85,7 @@ export const postAuth = async (
       shouldRefresh: false
     }
   );
-  if (!resp) {
+  if (!resp.ok) {
     return null;
   }
 
@@ -101,7 +101,7 @@ export const postAuth = async (
  */
 const postRefresh = async (refreshToken: string): Promise<Tokens | null> => {
   const resp = await Cadet.auth.refresh({ refresh_token: refreshToken });
-  if (!resp) {
+  if (!resp.ok) {
     return null;
   }
 
@@ -118,7 +118,7 @@ const postRefresh = async (refreshToken: string): Promise<Tokens | null> => {
 export const getUser = async (tokens: Tokens): Promise<User | null> => {
   const resp = await Cadet.user.index({ ...tokens });
   // TODO
-  return resp && resp.ok ? (resp.data as User) : null;
+  return resp.ok ? (resp.data as User) : null;
 };
 
 /**
@@ -129,7 +129,7 @@ export const getUser = async (tokens: Tokens): Promise<User | null> => {
 export const getAchievements = async (tokens: Tokens): Promise<AchievementItem[] | null> => {
   const resp = await Cadet.incentives.indexAchievements({ ...tokens });
 
-  if (!resp || !resp.ok) {
+  if (!resp.ok) {
     return null; // invalid accessToken _and_ refreshToken
   }
 
@@ -195,7 +195,7 @@ export const getGoals = async (
 export const getOwnGoals = async (tokens: Tokens): Promise<AchievementGoal[] | null> => {
   const resp = await Cadet.incentives.indexGoals({ ...tokens });
 
-  if (!resp || !resp.ok) {
+  if (!resp.ok) {
     return null; // invalid accessToken _and_ refreshToken
   }
 
@@ -316,7 +316,7 @@ export const getAssessmentOverviews = async (
   tokens: Tokens
 ): Promise<AssessmentOverview[] | null> => {
   const resp = await Cadet.assessments.index({ ...tokens });
-  if (!resp || !resp.ok) {
+  if (!resp.ok) {
     return null; // invalid accessToken _and_ refreshToken
   }
   const assessmentOverviews = resp.data;
@@ -369,7 +369,7 @@ export const getAssessment = async (id: number, tokens: Tokens): Promise<Assessm
     resp = await Cadet.assessments.unlock(id, { password: input }, { ...tokens });
   }
 
-  if (!resp || !resp.ok) {
+  if (!resp.ok) {
     return null;
   }
 
@@ -420,17 +420,15 @@ export const postAnswer = async (
   answer: string | number,
   tokens: Tokens
 ): Promise<Response | null> => {
-  const resp = await Cadet.answer.submit(id, { answer }, tokens);
+  const resp = await Cadet.answer.submit(id, { answer }, { ...tokens });
   return resp;
 };
 
 /**
  * POST /assessments/{assessmentId}/submit
  */
 export const postAssessment = async (id: number, tokens: Tokens): Promise<Response | null> => {
-  const resp = await Cadet.assessments.submit(id, tokens);
-  // shouldAutoLogout: false, // 400 if some questions unattempted
-
+  const resp = await Cadet.assessments.submit(id, { ...tokens });
   return resp;
 };
 
@@ -442,7 +440,7 @@ export const getGradingOverviews = async (
   group: boolean
 ): Promise<GradingOverview[] | null> => {
   const resp = await Cadet.adminGrading.index({ group }, { ...tokens });
-  if (!resp) {
+  if (!resp.ok) {
     return null; // invalid accessToken _and_ refreshToken
   }
   const gradingOverviews = resp.data;
@@ -495,7 +493,7 @@ export const getGradingOverviews = async (
 export const getGrading = async (submissionId: number, tokens: Tokens): Promise<Grading | null> => {
   const resp = await Cadet.adminGrading.show(submissionId, { ...tokens });
 
-  if (!resp) {
+  if (!resp.ok) {
     return null;
   }
 
@@ -608,7 +606,7 @@ export const getNotifications = async (tokens: Tokens): Promise<Notification[]>
 
   let notifications: Notification[] = [];
 
-  if (!resp || !resp.ok) {
+  if (!resp.ok) {
     return notifications;
   }
 
@@ -651,7 +649,7 @@ export const postAcknowledgeNotifications = async (
 export const getSourcecastIndex = async (tokens: Tokens): Promise<SourcecastData[] | null> => {
   const resp = await Cadet.sourcecast.index({ ...tokens });
   // TODO
-  return resp && resp.ok ? ((resp.data as unknown) as SourcecastData[]) : null;
+  return resp.ok ? ((resp.data as unknown) as SourcecastData[]) : null;
 };
 
 /**
@@ -733,15 +731,15 @@ export const uploadAssessment = async (
  */
 export const getGradingSummary = async (tokens: Tokens): Promise<GradingSummary | null> => {
   const resp = await Cadet.adminGrading.gradingSummary({ ...tokens });
-  return resp && resp.ok ? resp.data : null;
+  return resp.ok ? resp.data : null;
 };
 
 /**
  * GET /settings/sublanguage
  */
 export const getSublanguage = async (): Promise<SourceLanguage | null> => {
   const resp = await Cadet.settings.index();
-  if (!resp || !resp.ok) {
+  if (!resp.ok) {
     return null;
   }
 
@@ -774,7 +772,7 @@ export const postSublanguage = async (
  */
 export async function fetchDevices(tokens: Tokens): Promise<Device[] | null> {
   const resp = await Cadet.devices.index({ ...tokens });
-  return resp && resp.ok ? resp.data : null;
+  return resp.ok ? resp.data : null;
 }
 
 /**
@@ -785,7 +783,7 @@ export async function getDeviceWSEndpoint(
   tokens: Tokens
 ): Promise<WebSocketEndpointInformation | null> {
   const resp = await Cadet.devices.getWsEndpoint(device.id, { ...tokens });
-  return resp && resp.ok ? resp.data : null;
+  return resp.ok ? resp.data : null;
 }
 
 /**
@@ -795,12 +793,8 @@ export async function registerDevice(device: Omit<Device, 'id'>, tokens?: Tokens
   tokens = fillTokens(tokens);
   const resp = await Cadet.devices.register(device, { ...tokens });
 
-  if (!resp) {
-    throw new Error('Unknown error occurred.');
-  }
-
   if (!resp.ok) {
-    const message = resp.text();
+    const message = await resp.text();
     throw new Error(`Failed to register: ${message}`);
   }
 
@@ -817,10 +811,6 @@ export async function editDevice(
   tokens = fillTokens(tokens);
   const resp = await Cadet.devices.edit(device.id, device, { ...tokens });
 
-  if (!resp) {
-    throw new Error('Unknown error occurred.');
-  }
-
   if (!resp.ok) {
     const message = await resp.text();
     throw new Error(`Failed to edit: ${message}`);
@@ -836,10 +826,6 @@ export async function deleteDevice(device: Pick<Device, 'id'>, tokens?: Tokens):
   tokens = fillTokens(tokens);
   const resp = await Cadet.devices.deregister(device.id, { ...tokens });
 
-  if (!resp) {
-    throw new Error('Unknown error occurred.');
-  }
-
   if (!resp.ok) {
     const message = await resp.text();
     throw new Error(`Failed to delete: ${message}`);