Fix up some Bootstrap and type issues

Author: Jacob Peddicord

browser/components/util/ErrorModal.tsx

@@ -26,7 +26,10 @@ export default class ErrorModal extends Component<Props, {}> {
   self = null;
 
   componentDidMount() {
-    $(this.self).modal();
+    // for some reason (bug in BS4.b2?) clicking the backdrop instead of close
+    // causes the modal to hang and not re-open. test this before removing
+    // 'static' below.
+    $(this.self).modal({backdrop: 'static'});
   }
 
   hideModal = () => {

browser/util/index.ts

@@ -19,24 +19,25 @@ import { ADMIN_SESSION_KEY } from '../modules/common';
 /**
  * Convenience function for sending/receiving JSON for API calls.
  */
-export function reqJSON(url: string, obj?: any, method: string = 'POST') {
+export async function reqJSON(url: string, obj?: any, method: string = 'POST') {
   const body = obj != null ? JSON.stringify(obj) : undefined;
-  return fetchAuth(url, {
+  const response = await fetchAuth(url, {
     method,
     headers: {
       'Accept': 'application/json',
       'Content-Type': 'application/json',
     },
     body,
-  }).then((response) => response.json());
+  });
+  return await response.json();
 }
 
 /**
  * A wrapper around fetch() to inject an authorization token.
  *
  * Will throw on non 2xx responses.
  */
-export function fetchAuth(url: string, options?: any) {
+export async function fetchAuth(url: string, options?: any) {
   options = options || {};
   const headers = options.headers || {};
 
@@ -45,28 +46,28 @@ export function fetchAuth(url: string, options?: any) {
     headers['X-Admin'] = '1';
   }
 
-  return fetch(url, {
+  const response = await fetch(url, {
     ...options,
     headers,
     credentials: 'same-origin',
-  }).then(async (response) => {
-    if (response.ok) {
-      return response;
-    } else {
-      let error;
+  });
 
-      // try to parse as json
-      try {
-        const json = await response.json();
-        error = new Error(json.error);
-      } catch (ex) {
-        // otherwise just use the HTTP status code
-        error = new Error(response.statusText);
-      }
+  if (response.ok) {
+    return response;
+  } else {
+    let error;
 
-      error.code = response.status;
-      error.response = response;
-      throw error;
+    // try to parse as json
+    try {
+      const json = await response.json();
+      error = new Error(json.error);
+    } catch (ex) {
+      // otherwise just use the HTTP status code
+      error = new Error(response.statusText);
     }
-  });
+
+    error.code = response.status;
+    error.response = response;
+    throw error;
+  }
 }