andoncloud-sdk 1.4.15 → 1.4.16

package/dist/andoncloud-sdk.js

@@ -381,31 +381,51 @@ var acFetch = function acFetch(url, options) {
   }
 
   try {
+    var _temp4 = function _temp4() {
+      return Promise.resolve(fetch(url, options).catch(function (e) {
+        sessionStore.setNetworkError(e.message);
+      })).then(function (response) {
+        if (!(response != null && response.ok)) {
+          if (!response || response.status === 500) {
+            if (!sessionStore.networkError) {
+              sessionStore.setNetworkError(languageStore.translations.unexpectedErrorMessage);
+            }
+          } else if (response.status !== 400) {
+            sessionStore.removeSession();
+            sessionStore.removeCurrentUser();
+            sessionStore.setNotAuthorizedLoginStatus();
+          }
+        } else {
+          andoncloudFetch.callback(response, false);
+        }
+
+        return response;
+      });
+    };
+
     var headers = sessionStore.requestHeaders();
 
     if (headers !== null) {
       options.headers = Object.assign({}, headers, options.headers);
     }
 
-    return Promise.resolve(fetch(url, options).catch(function (e) {
-      sessionStore.setNetworkError(e.message);
-    })).then(function (response) {
-      if (!(response != null && response.ok)) {
-        if (!response || response.status === 500) {
-          if (!sessionStore.networkError) {
-            sessionStore.setNetworkError(languageStore.translations.unexpectedErrorMessage);
+    var _temp5 = function () {
+      if (sessionStore.isLoggedIn() && !options.refresh) {
+        var _sessionStore$session = sessionStore.session,
+            createdAt = _sessionStore$session.createdAt,
+            expiresIn = _sessionStore$session.expiresIn;
+
+        var _temp6 = function () {
+          if (createdAt + expiresIn < Math.round(+new Date() / 1000)) {
+            return Promise.resolve(sessionStore.refresh()).then(function () {});
           }
-        } else if (response.status !== 400) {
-          sessionStore.removeSession();
-          sessionStore.removeCurrentUser();
-          sessionStore.setNotAuthorizedLoginStatus();
-        }
-      } else {
-        andoncloudFetch.callback(response, false);
+        }();
+
+        if (_temp6 && _temp6.then) return _temp6.then(function () {});
       }
+    }();
 
-      return response;
-    });
+    return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp4) : _temp4(_temp5));
   } catch (e) {
     return Promise.reject(e);
   }
@@ -661,7 +681,9 @@ function _catch(body, recover) {
 var Session = function Session() {
   this.user = {};
   this.accessToken = null;
+  this.refreshToken = null;
   this.tokenType = null;
+  this.createdAt = null;
   this.expiresIn = null;
 };
 
@@ -685,6 +707,7 @@ var SessionAPI = /*#__PURE__*/function () {
 
       var formData = new FormData();
       var scope = credentials.scope,
+          refresh = credentials.refresh,
           code = credentials.code,
           username = credentials.username,
           password = credentials.password;
@@ -694,7 +717,11 @@ var SessionAPI = /*#__PURE__*/function () {
         formData.append("scope", scope);
       }
 
-      if (code) {
+      if (refresh) {
+        formData.append("grant_type", "refresh_token");
+        formData.append("refresh_token", refresh);
+        formData.append("redirect_uri", _this2.redirectUri);
+      } else if (code) {
         formData.append("grant_type", "authorization_code");
         formData.append("code", code);
         formData.append("redirect_uri", _this2.redirectUri);
@@ -706,7 +733,8 @@ var SessionAPI = /*#__PURE__*/function () {
 
       var fetchParams = {
         method: "POST",
-        body: formData
+        body: formData,
+        refresh: !!refresh
       };
       var session;
       return Promise.resolve(acFetch(_this2.baseUrl + "/v2/oauth2/token", fetchParams).then(function (response) {
@@ -716,18 +744,31 @@ var SessionAPI = /*#__PURE__*/function () {
           var data;
           return Promise.resolve(function () {
             if (response) {
-              var _temp3 = function _temp3(_result) {
+              var _temp5 = function _temp5(_result) {
                 if (_exit2) return _result;
-                session = new Session();
-                return Promise.resolve(_this2.getUserData(data)).then(function (_this2$getUserData) {
-                  session.user = _this2$getUserData;
+
+                function _temp2() {
                   session.accessToken = data.access_token;
+                  session.refreshToken = data.refresh_token;
                   session.tokenType = data.token_type;
+                  session.createdAt = data.created_at;
                   session.expiresIn = data.expires_in;
-                });
+                }
+
+                session = new Session();
+
+                var _temp = function () {
+                  if (!refresh) {
+                    return Promise.resolve(_this2.getUserData(data)).then(function (_this2$getUserData) {
+                      session.user = _this2$getUserData;
+                    });
+                  }
+                }();
+
+                return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
               };
 
-              var _temp4 = _catch(function () {
+              var _temp6 = _catch(function () {
                 return Promise.resolve(response.json()).then(function (_response$json) {
                   data = _response$json;
 
@@ -741,7 +782,7 @@ var SessionAPI = /*#__PURE__*/function () {
                 _exit2 = 1;
               });
 
-              return _temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4);
+              return _temp6 && _temp6.then ? _temp6.then(_temp5) : _temp5(_temp6);
             }
           }());
         } catch (e) {
@@ -776,7 +817,7 @@ var SessionAPI = /*#__PURE__*/function () {
       return Promise.resolve(acFetch(_this4.baseUrl + "/v2/me", fetchParams)).then(function (response) {
         var _exit3;
 
-        var _temp5 = function () {
+        var _temp7 = function () {
           if (response != null && response.ok) {
             return Promise.resolve(response.json()).then(function (_ref2) {
               var user = _ref2.user;
@@ -794,9 +835,9 @@ var SessionAPI = /*#__PURE__*/function () {
           }
         }();
 
-        return _temp5 && _temp5.then ? _temp5.then(function (_result3) {
+        return _temp7 && _temp7.then ? _temp7.then(function (_result3) {
           return _exit3 ? _result3 : null;
-        }) : _exit3 ? _temp5 : null;
+        }) : _exit3 ? _temp7 : null;
       });
     } catch (e) {
       return Promise.reject(e);
@@ -851,7 +892,9 @@ var SessionStore = /*#__PURE__*/function () {
       authResponse: {
         user: this.session.user,
         accessToken: this.session.accessToken,
+        refreshToken: this.session.refreshToken,
         tokenType: this.session.tokenType,
+        createdAt: this.session.createdAt,
         expiresIn: this.session.expiresIn
       }
     };
@@ -922,28 +965,60 @@ var SessionStore = /*#__PURE__*/function () {
     }
   };
 
-  _proto2.recover = function recover() {
+  _proto2.refresh = function refresh() {
     try {
       var _this10 = this;
 
-      if (_this10.session) {
+      var _temp9 = function () {
+        if (_this10.session) {
+          return Promise.resolve(_this10.api.authorize({
+            refresh: _this10.session.refreshToken
+          })).then(function (session) {
+            if (session) {
+              _this10.session = _extends({}, _this10.session, session);
+
+              _this10.storeSession();
+
+              _this10.setConnectedLoginStatus();
+            } else {
+              _this10.removeSession();
+
+              _this10.removeCurrentUser();
+
+              _this10.setNotAuthorizedLoginStatus();
+            }
+          });
+        }
+      }();
+
+      return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  _proto2.recover = function recover() {
+    try {
+      var _this12 = this;
+
+      if (_this12.session) {
         return Promise.resolve();
       }
 
-      return Promise.resolve(_this10.restoreSession()).then(function () {
-        var _temp6 = function () {
-          if (_this10.session) {
-            return Promise.resolve(_this10.api.getUserData()).then(function (user) {
-              _this10.setCurrentUser(user);
+      return Promise.resolve(_this12.restoreSession()).then(function () {
+        var _temp10 = function () {
+          if (_this12.session) {
+            return Promise.resolve(_this12.api.getUserData()).then(function (user) {
+              _this12.setCurrentUser(user);
 
-              _this10.setConnectedLoginStatus();
+              _this12.setConnectedLoginStatus();
             });
           } else {
-            _this10.setNotAuthorizedLoginStatus();
+            _this12.setNotAuthorizedLoginStatus();
           }
         }();
 
-        if (_temp6 && _temp6.then) return _temp6.then(function () {});
+        if (_temp10 && _temp10.then) return _temp10.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -952,21 +1027,21 @@ var SessionStore = /*#__PURE__*/function () {
 
   _proto2.logout = function logout() {
     try {
-      var _this12 = this;
+      var _this14 = this;
 
-      var _temp8 = function () {
-        if (_this12.session) {
-          return Promise.resolve(_this12.api.signOut()).then(function () {
-            _this12.removeSession();
+      var _temp12 = function () {
+        if (_this14.session) {
+          return Promise.resolve(_this14.api.signOut()).then(function () {
+            _this14.removeSession();
 
-            _this12.removeCurrentUser();
+            _this14.removeCurrentUser();
 
-            _this12.setNotAuthorizedLoginStatus();
+            _this14.setNotAuthorizedLoginStatus();
           });
         }
       }();
 
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -974,12 +1049,14 @@ var SessionStore = /*#__PURE__*/function () {
 
   _proto2.storeSession = function storeSession() {
     try {
-      var _this14 = this;
+      var _this16 = this;
 
       var session_cookie = {};
-      session_cookie["access-token"] = _this14.session.accessToken;
-      session_cookie["token-type"] = _this14.session.tokenType;
-      session_cookie["expires-in"] = _this14.session.expiresIn;
+      session_cookie["access-token"] = _this16.session.accessToken;
+      session_cookie["refresh-token"] = _this16.session.refreshToken;
+      session_cookie["token-type"] = _this16.session.tokenType;
+      session_cookie["created-at"] = _this16.session.createdAt;
+      session_cookie["expires-in"] = _this16.session.expiresIn;
       var authHeaders = JSON.stringify(session_cookie);
       CookiesManager.set("authHeaders", authHeaders);
       return Promise.resolve();
@@ -990,7 +1067,7 @@ var SessionStore = /*#__PURE__*/function () {
 
   _proto2.restoreSession = function restoreSession() {
     try {
-      var _this16 = this;
+      var _this18 = this;
 
       var cookie = CookiesManager.get("authHeaders");
 
@@ -1001,12 +1078,14 @@ var SessionStore = /*#__PURE__*/function () {
       var json = JSON.parse(cookie);
       var session = new Session();
       session.accessToken = json["access-token"];
+      session.refreshToken = json["refresh-token"];
       session.tokenType = json["token-type"];
+      session.createdAt = json["created-at"];
       session.expiresIn = json["expires-in"];
-      _this16.session = session;
-      return Promise.resolve(_this16.api.getUserData()).then(function (user) {
+      _this18.session = session;
+      return Promise.resolve(_this18.api.getUserData()).then(function (user) {
         if (user) {
-          _this16.session.user = user;
+          _this18.session.user = user;
         }
       });
     } catch (e) {
@@ -3089,6 +3168,7 @@ var setLocale = function setLocale(locale) {
 
 exports.App = App;
 exports.Container = Container;
+exports.fetch = andoncloudFetch;
 exports.logout = logout;
 exports.notify = _t;
 exports.setLocale = setLocale;