fixed alipay mini-program of bug

Author: jonnyshao

exmaple/package-lock.json

@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "wefetch": "^1.2.5"
+    "wefetch": "^1.2.6"
   }
 }

exmaple/package.json

@@ -2,7 +2,7 @@ import utils from "../utils";
 import WeFetch from "./Wefetch";
 import {UPLOAD_CONTENT_TYPE, DOWNLOAD_CONTENT_TYPE} from '../defaults'
 import platform from "./platform";
-
+import promisify from "./promisify";
 ['options', 'get', 'head', 'post', 'put', 'delete', 'trace', 'connect', 'postJson'].forEach(function (method) {
     WeFetch.prototype[method] = function (url, config) {
         return this.request(utils.merge(config || {}, {
@@ -14,8 +14,6 @@ import platform from "./platform";
 WeFetch.prototype.download = function (url, config) {
     // init
     config = config || {};
-    config.createRequest = platform.getDownload();
-
     // check user is input header param
     if (config.header) {
         config.header['Content-Type'] = config.header['Content-Type'] || DOWNLOAD_CONTENT_TYPE
@@ -25,18 +23,18 @@ WeFetch.prototype.download = function (url, config) {
 
     // wf.download({}) support
     if (utils.type.isObject(url)) {
-        return this.request(utils.merge(config, url))
+        return this.request(utils.merge(config, url,{ method: 'download' }))
     }
     // default
     return this.request(utils.merge(config,{
-        url: url
+        url: url,
+        method: 'download'
     }))
 };
 
 WeFetch.prototype.upload = function (url, config) {
     // init
     config = config || {};
-    config.createRequest = platform.getUpload();
     // check user is input header param
     if (config.header) {
         config.header['Content-Type'] = config.header['Content-Type'] || UPLOAD_CONTENT_TYPE;
@@ -46,9 +44,13 @@ WeFetch.prototype.upload = function (url, config) {
 
     // upload({}) support
     if (utils.type.isObject(url)) {
-        return this.request(config, url)
+        return this.request(config, url,{ method: 'upload' })
     }
     return this.request(utils.merge(config, {
-        url: url
+        url: url,
+        method: 'upload'
     }))
 };
+WeFetch.prototype.login = function () {
+  return promisify(platform.getPlatform().login)();
+};

src/lib/core/addMethods.js

@@ -1,5 +1,18 @@
+import platform from "./platform";
 
 function dispatchRequest(config) {
+    if (platform.platform === 'my' && config.method !== 'download' && config.method !== 'upload') {
+      config.headers = config.header;
+      delete config.header
+    }
+    if (config.method === 'download') {
+      config.method = 'get';
+      config.createRequest = platform.getDownload()
+    }
+    if (config.method === 'upload'){
+      config.method = 'post';
+      config.createRequest = platform.getUpload()
+    }
     var request = config.createRequest;
     return request(config).then(function (response) {
         return response;
@@ -8,4 +21,4 @@ function dispatchRequest(config) {
     })
 }
 
-export default dispatchRequest;
+export default dispatchRequest;

src/lib/core/dispatchRequest.js

@@ -1,3 +1,5 @@
+import platform from'./platform'
+import promisify from "./promisify";
 export function retry(times,request,timeout) {
   timeout = timeout || 1000;
   if (!times && times !== 0 || !request)throw new Error('request and times params is required');
@@ -16,4 +18,16 @@ export function retry(times,request,timeout) {
   }
   return p;
 }
-
+export function getUserInfo(type) {
+  var p = platform.getPlatform();
+  var get_setting = promisify(p.getSetting);
+  var get_user_info = promisify(p.getUserInfo);
+  if (type){
+    return get_setting().then(function (res) {
+      if (res.authSetting['scope.userInfo']) {
+        return get_user_info()
+      }
+    })
+  }
+  return get_user_info()
+}

src/lib/core/functional.js

@@ -6,14 +6,17 @@ function Platform() {
 Platform.prototype.getRequest = function () {
     try {
         if (wx.request) {
-            this.platform = 'wechat';
+            this.platform = 'wx';
             return promisify(wx.request)
         }
     } catch (e) {
         try {
-            if (my.httpRequest) {
-                this.platform = 'ali';
-                return promisify(my.httpRequest)
+            if (my.request) {
+              this.platform = 'my';
+              return promisify(my.request)
+            } else if (my.httpRequest){
+              this.platform = 'my';
+              return promisify(my.httpRequest)
             }
         }catch (e) {
             if (swan.request) {
@@ -22,15 +25,16 @@ Platform.prototype.getRequest = function () {
             }
         }
     }
-}
+};
 Platform.prototype.getUpload = function () {
-    if (this.platform === 'wechat')return promisify(wx.uploadFile);
-    if (this.platform === 'ali')return promisify(my.uploadFile);
-    if (this.platform === 'swan')return promisify(swan.uploadFile);
-}
+  return promisify(this.getPlatform().uploadFile);
+};
 Platform.prototype.getDownload = function () {
-    if (this.platform === 'wechat')return promisify(wx.downloadFile)
-    if (this.platform === 'ali')return promisify(my.downloadFile)
-    if (this.platform === 'swan')return promisify(swan.downloadFile)
-}
+  return promisify(this.getPlatform().downloadFile);
+};
+Platform.prototype.getPlatform = function () {
+  if (this.platform === 'wx')return wx;
+  if (this.platform === 'my')return my;
+  if (this.platform === 'swan')return swan;
+};
 export default new Platform();

src/lib/core/platform.js

@@ -2,6 +2,7 @@ import e from './Events'
 function promisify (api) {
     return  function (options) {
         options = options || {};
+        options.config = options.config || {};
         for (var len = arguments.length, params = Array(len > 1 ? len - 1 : 0), key = 1; key < len; key++) {
             params[key - 1] = arguments[key];
         }
@@ -12,4 +13,4 @@ function promisify (api) {
     };
 };
 
-export default promisify;
+export default promisify;

src/lib/core/promisify.js

@@ -1,5 +1,4 @@
 import utils from "../utils";
-import platform from './platform.js'
 import {JSON_CONTENT_TYPE} from "../defaults";
 
 import dispatchRequest from "./dispatchRequest";
@@ -22,14 +21,6 @@ function request (config) {
         config.url = config.baseUrl + config.url
       }
     }
-    if (config.method === 'download') {
-        config.method = 'get';
-        config.createRequest = platform.getDownload()
-    }
-    if (config.method === 'upload'){
-        config.method = 'post';
-        config.createRequest = platform.getUpload()
-    }
     var chain = [dispatchRequest, undefined];
     config.config = config.config || {};
     var promise = Promise.resolve(config);

src/lib/core/request.js

@@ -3,7 +3,7 @@ import {defaults} from './defaults'
 import utils from './utils'
 import WeFetch from './core/Wefetch'
 import bind from './core/bind'
-import {retry} from './core/functional'
+import {retry, getUserInfo} from './core/functional'
 Promise.prototype.finally = function (cb) {
     var p = this.constructor;
     return this.then(function (value) {
@@ -29,6 +29,7 @@ var wf = createInstance(defaults);
 wf.all = function (promises) {
     return Promise.all(promises)
 };
+wf.getUserInfo = getUserInfo;
 wf.retry = retry;
 wf.create = function (instanceConfig) {
     return createInstance(utils.merge(defaults, instanceConfig))