@vocollege/app 0.0.87 → 0.0.88

package/dist/interceptor.js

@@ -42,13 +42,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var axios_1 = __importDefault(require("axios"));
 var VoAuth_1 = __importDefault(require("./modules/VoAuth"));
 var VoRouter_1 = __importDefault(require("./modules/VoRouter"));
-// import VoApp from "./modules/VoApp";
 var react_toastify_1 = require("react-toastify");
 // Custom.
 var I18n_1 = __importDefault(require("./modules/Services/I18n"));
 (function () {
     var _this = this;
-    var retry = 0;
     function redirect() {
         return __awaiter(this, void 0, void 0, function () {
             var error_1;
@@ -79,55 +77,37 @@ var I18n_1 = __importDefault(require("./modules/Services/I18n"));
     axios_1.default.interceptors.response.use(function (res) {
         return res;
     }, function (error) { return __awaiter(_this, void 0, void 0, function () {
-        var status, _a, token, error_2;
+        var config, isTokeRequest, token, error_2;
+        var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    status = error.response ? error.response.status : null;
-                    if (!(status && retry < 2)) return [3 /*break*/, 5];
-                    retry++;
-                    _a = status;
-                    switch (_a) {
-                        case 400: return [3 /*break*/, 1];
-                        case 401: return [3 /*break*/, 1];
-                    }
-                    return [3 /*break*/, 5];
+                    config = error.config;
+                    isTokeRequest = config.url.includes("oauth/token");
+                    _b.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
+                    _b.trys.push([1, 4, , 5]);
+                    if (!(!isTokeRequest &&
+                        [400, 401, 403].indexOf((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) > -1)) return [3 /*break*/, 3];
                     return [4 /*yield*/, VoAuth_1.default.refreshToken()];
                 case 2:
                     _b.sent();
                     token = VoAuth_1.default.getToken();
-                    // Update the failed request with the new access token
-                    // in order to redo the call.
                     if (token) {
-                        retry = 0;
-                        error.config.headers["Authorization"] =
-                            // token.token_type + " " + token.access_token;
-                            "Bearer " + token.access_token;
+                        config.headers["Authorization"] = "Bearer " + token.access_token;
+                        return [2 /*return*/, axios_1.default.request(config)];
                     }
-                    return [2 /*return*/, axios_1.default.request(error.config)];
-                case 3:
+                    _b.label = 3;
+                case 3: return [3 /*break*/, 5];
+                case 4:
                     error_2 = _b.sent();
-                    redirect();
-                    console.error("Interceptor", error_2);
-                    return [3 /*break*/, 4];
-                case 4: return [3 /*break*/, 5];
-                case 5: return [2 /*return*/, new Promise(function (resolve, reject) {
-                        switch (status) {
-                            case 419:
-                                react_toastify_1.toast.error(I18n_1.default.get.messages.sessionExpired);
-                                // setTimeout(() => {
-                                redirect();
-                                reject(error);
-                                // }, 5000);
-                                break;
-                            default:
-                                reject(error);
-                                break;
-                        }
-                        console.error("Interceptor", error);
-                    })];
+                    return [3 /*break*/, 5];
+                case 5:
+                    if (isTokeRequest) {
+                        react_toastify_1.toast.error(I18n_1.default.get.messages.sessionExpired, { autoClose: false });
+                        redirect();
+                    }
+                    return [2 /*return*/, Promise.reject(error)];
             }
         });
     }); });

package/dist/modules/Services/I18n/strings.json

@@ -666,7 +666,7 @@
         "newVersionAvailable": "En ny version av denna applikation är tillgänglig och sidan kommer att laddas om...",
         "certifiedSince": "Certifierat sedan ::date",
         "adminDashboard01": "Välkommen till",
-        "adminDashboard02": "Här kan du bl a hantera artiklar och dokumentbanken. Högst upp till höger väljer du vilken VoSida du vill hantera, i fall ditt konto har behörighet att hantera flera olika VoSidor.",
+        "adminDashboard02": "Här kan du bl a hantera artiklar och dokumentbanken. Högst upp till höger väljer du vilken VoSida/Grupp du vill hantera, i fall ditt konto har behörighet att hantera flera olika VoSidor/Grupper.",
         "adminDashboard03": "Vid frågor, vänligen kontakta oss på"
     },
     "toolbar": {

package/dist/modules/VoAuth.d.ts

@@ -13,7 +13,7 @@ declare class VoAuth extends VoBase {
     auth(): Promise<unknown>;
     get getAuthUrl(): string;
     logout(): Promise<unknown>;
-    setSession(token: any): void;
+    setSession(token: any, updateCookie?: boolean): void;
     resetSession(): void;
     refreshToken(): Promise<void | VoTokenType>;
     check(forceRedirect?: boolean, forceLoad?: boolean): Promise<any>;

package/dist/modules/VoAuth.js

@@ -196,23 +196,27 @@ var VoAuth = /** @class */ (function (_super) {
             });
         }); });
     };
-    VoAuth.prototype.setSession = function (token) {
+    VoAuth.prototype.setSession = function (token, updateCookie) {
+        if (updateCookie === void 0) { updateCookie = true; }
         // const { token_type, access_token, refresh_token, expires_in } = token;
         var access_token = token.access_token, refresh_token = token.refresh_token;
-        var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-        // Helpers.localStorage.set(refreshTokenKey, refresh_token);
-        js_cookie_1.default.set(refreshTokenKey, refresh_token, {
-            expires: 11,
-            sameSite: "Lax",
-            domain: VoConfig_1.default.get.AUTH_DOMAIN,
-        });
-        var accessTokenKey = VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "";
-        // Helpers.localStorage.set(accessTokenKey, access_token);
-        js_cookie_1.default.set(accessTokenKey, access_token, {
-            expires: 1,
-            sameSite: "Lax",
-            domain: VoConfig_1.default.get.AUTH_DOMAIN,
-        });
+        if (updateCookie) {
+            var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
+            // Helpers.localStorage.set(refreshTokenKey, refresh_token);
+            js_cookie_1.default.set(refreshTokenKey, refresh_token, {
+                expires: 21,
+                sameSite: "Lax",
+                domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            });
+            var expires = new Date(new Date().getTime() + 4 * 60 * 60 * 1000);
+            var accessTokenKey = VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "";
+            // Helpers.localStorage.set(accessTokenKey, access_token);
+            js_cookie_1.default.set(accessTokenKey, access_token, {
+                expires: expires,
+                sameSite: "Lax",
+                domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            });
+        }
         // let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
         // // Helpers.localStorage.set(tokenTypeKey, token_type);
         // JsCookies.set(tokenTypeKey, token_type, {
@@ -329,7 +333,7 @@ var VoAuth = /** @class */ (function (_super) {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        this.setSession(token);
+                        this.setSession(token, forceLoad);
                         return [4 /*yield*/, this.loadUser(forceLoad)];
                     case 2:
                         _a.sent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocollege/app",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/interceptor.ts

@@ -1,15 +1,12 @@
 import axios from "axios";
 import VoAuth from "./modules/VoAuth";
 import VoRouter from "./modules/VoRouter";
-// import VoApp from "./modules/VoApp";
 import { toast } from "react-toastify";
 
 // Custom.
 import I18n from "./modules/Services/I18n";
 
 (function () {
-  let retry = 0;
-
   async function redirect() {
     try {
       await VoAuth.logout();
@@ -32,50 +29,26 @@ import I18n from "./modules/Services/I18n";
       return res;
     },
     async (error) => {
-      const status = error.response ? error.response.status : null;
-
-      if (status && retry < 2) {
-        retry++;
-        switch (status) {
-          case 400:
-          case 401:
-            try {
-              await VoAuth.refreshToken();
-              const token: any = VoAuth.getToken();
-
-              // Update the failed request with the new access token
-              // in order to redo the call.
-              if (token) {
-                retry = 0;
-                error.config.headers["Authorization"] =
-                  // token.token_type + " " + token.access_token;
-                  "Bearer " + token.access_token;
-              }
-
-              return axios.request(error.config);
-            } catch (error) {
-              redirect();
-              console.error("Interceptor", error);
-            }
-            break;
+      const { config } = error;
+      let isTokeRequest = config.url.includes("oauth/token");
+      try {
+        if (
+          !isTokeRequest &&
+          [400, 401, 403].indexOf(error.response?.status) > -1
+        ) {
+          await VoAuth.refreshToken();
+          const token: any = VoAuth.getToken();
+          if (token) {
+            config.headers["Authorization"] = "Bearer " + token.access_token;
+            return axios.request(config);
+          }
         }
+      } catch (error) {}
+      if (isTokeRequest) {
+        toast.error(I18n.get.messages.sessionExpired, { autoClose: false });
+        redirect();
       }
-
-      return new Promise((resolve, reject) => {
-        switch (status) {
-          case 419:
-            toast.error(I18n.get.messages.sessionExpired);
-            // setTimeout(() => {
-            redirect();
-            reject(error);
-            // }, 5000);
-            break;
-          default:
-            reject(error);
-            break;
-        }
-        console.error("Interceptor", error);
-      });
+      return Promise.reject(error);
     }
   );
 })();

package/src/modules/Services/I18n/strings.json

@@ -666,7 +666,7 @@
     "newVersionAvailable": "En ny version av denna applikation är tillgänglig och sidan kommer att laddas om...",
     "certifiedSince": "Certifierat sedan ::date",
     "adminDashboard01": "Välkommen till",
-    "adminDashboard02": "Här kan du bl a hantera artiklar och dokumentbanken. Högst upp till höger väljer du vilken VoSida du vill hantera, i fall ditt konto har behörighet att hantera flera olika VoSidor.",
+    "adminDashboard02": "Här kan du bl a hantera artiklar och dokumentbanken. Högst upp till höger väljer du vilken VoSida/Grupp du vill hantera, i fall ditt konto har behörighet att hantera flera olika VoSidor/Grupper.",
     "adminDashboard03": "Vid frågor, vänligen kontakta oss på"
   },
   "toolbar": {

package/src/modules/VoAuth.ts

@@ -98,25 +98,28 @@ class VoAuth extends VoBase {
     });
   }
 
-  setSession(token: any) {
+  setSession(token: any, updateCookie = true) {
     // const { token_type, access_token, refresh_token, expires_in } = token;
     const { access_token, refresh_token } = token;
 
-    let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-    // Helpers.localStorage.set(refreshTokenKey, refresh_token);
-    JsCookies.set(refreshTokenKey, refresh_token, {
-      expires: 11,
-      sameSite: "Lax",
-      domain: VoConfig.get.AUTH_DOMAIN,
-    });
+    if (updateCookie) {
+      let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
+      // Helpers.localStorage.set(refreshTokenKey, refresh_token);
+      JsCookies.set(refreshTokenKey, refresh_token, {
+        expires: 21,
+        sameSite: "Lax",
+        domain: VoConfig.get.AUTH_DOMAIN,
+      });
 
-    let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
-    // Helpers.localStorage.set(accessTokenKey, access_token);
-    JsCookies.set(accessTokenKey, access_token, {
-      expires: 1,
-      sameSite: "Lax",
-      domain: VoConfig.get.AUTH_DOMAIN,
-    });
+      let expires = new Date(new Date().getTime() + 4 * 60 * 60 * 1000);
+      let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
+      // Helpers.localStorage.set(accessTokenKey, access_token);
+      JsCookies.set(accessTokenKey, access_token, {
+        expires,
+        sameSite: "Lax",
+        domain: VoConfig.get.AUTH_DOMAIN,
+      });
+    }
 
     // let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
     // // Helpers.localStorage.set(tokenTypeKey, token_type);
@@ -228,7 +231,7 @@ class VoAuth extends VoBase {
 
       if (token) {
         try {
-          this.setSession(token);
+          this.setSession(token, forceLoad);
           await this.loadUser(forceLoad);
           resolve(this.user);
         } catch (error) {