瀏覽代碼

Had to take into account the different ways the response data was structured.

jalbr74 7 年之前
父節點
當前提交
72fa4135f0
共有 2 個文件被更改,包括 23 次插入4 次删除
  1. 3 3
      client/src/services/helpdesk.service.ts
  2. 20 1
      client/src/services/pwm.service.ts

+ 3 - 3
client/src/services/helpdesk.service.ts

@@ -118,8 +118,8 @@ export default class HelpDeskService implements IHelpDeskService {
 
         return this.pwmService
             .httpRequest(url, { data: data })
-            .then((result: IVerificationStatus) => {
-                return this.$q.resolve(result);
+            .then((result: any) => {
+                return this.$q.resolve(result.data);
             });
     }
 
@@ -180,7 +180,7 @@ export default class HelpDeskService implements IHelpDeskService {
         return this.pwmService
             .httpRequest(url, {})
             .then((result: any) => {
-                return this.$q.resolve(result);
+                return this.$q.resolve(result.data);
             });
     }
 

+ 20 - 1
client/src/services/pwm.service.ts

@@ -111,7 +111,26 @@ export default class PwmService implements IPwmService {
                     return this.handlePwmError(response);
                 }
 
-                return this.$q.resolve(response.data['data']);
+                // Note: sometimes response.data looks like this:
+                // {
+                //     "error": false,
+                //     "errorCode": 0,
+                //     "data": {
+                //         "foo": "1",
+                //         "bar": "2"
+                //     }
+                // }
+
+                // Note: other times, response.data looks like this:
+                // {
+                //     "error": false,
+                //     "errorCode": 0,
+                //     "successMessage": "The operation has been successfully completed."
+                // }
+
+                // Since we can't make assumptions about the structure, we just need to return the whole response.data
+                // payload:
+                return this.$q.resolve(response.data);
             });
 
         return promise;