Merge pull request #3620 from openstax/fx3

only attempt to parse body if it's present

shared/src/api/request.ts

@@ -87,13 +87,12 @@ async function request<RetT>(methodUrl: MethodUrl, options?: any): Promise<RetT|
         }
         const origin = options?.origin || baseUrl
         const resp = await fetch(`${origin}/${url}`, req)
-
         if (resp.ok) {
-            if (resp.status == 204) { // no content
-                return {} as RetT
+            const body = await resp.text()
+            if (body) {
+                return JSON.parse(body) as RetT
             }
-            const respJson = await resp.json()
-            return await respJson as RetT
+            return {} as RetT
         } else {
             const err = ApiError.fromError(`${method} api/${url}`, resp, options)
             try {

tutor/src/helpers/payments.tsx

@@ -7,7 +7,7 @@ import { readonly } from 'core-decorators';
 import invariant from 'invariant';
 import { NotificationActions, Logging } from 'shared';
 import type { Course, User } from '../models'
-import { Purchase } from '../models'
+import { Purchase, currentUser } from '../models'
 import { SUPPORT_EMAIL } from '../config'
 import { Chat } from './chat';
 
@@ -40,6 +40,7 @@ export class Payments extends BaseModel {
         super();
         modelize(this);
         this.options = merge({
+            user: currentUser,
             timeoutLength: 60000,
             messageHandlers: {
                 timeout: this.onTimeout,