@vocollege/app 0.0.171 → 0.0.173

package/dist/global.d.ts

@@ -1,39 +1,40 @@
-export declare type AuthStorageConfigType = {
+export type AuthStorageConfigType = {
     STATE: string;
     VERIFIER: string;
     REFRESH_TOKEN: string;
     ACCESS_TOKEN: string;
     TOKEN_TYPE: string;
 };
-export declare type AuthConfigType = {
+export type AuthConfigType = {
     BASE_URL: string;
     CLIENT_ID?: string;
     LOGIN?: string;
     ENDPOINT?: string;
     STORAGE?: AuthStorageConfigType;
 };
-export declare type ApiConfigType = {
+export type ApiConfigType = {
     BASE_URL: string;
     ENDPOINT?: string;
     GRAPHQL?: string;
 };
-export declare type AppConfigType = {
+export type AppConfigType = {
     BASE_URL: string;
     AUTH?: string;
     HOME?: string;
     LOGIN?: string;
 };
-export declare type VoAppType = {
+export type VoAppType = {
     configure: Function;
     config?: Function;
     auth: any;
     api: any;
 };
-export declare type VoTokenType = {
+export type VoTokenType = {
     access_token: string;
     refresh_token: string;
+    expiry_token: string;
 };
 export interface GeneralObject {
     [key: string]: any;
 }
-export declare type TypeNullObject = null | GeneralObject;
+export type TypeNullObject = null | GeneralObject;

package/dist/interceptor.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -46,76 +46,97 @@ var react_toastify_1 = require("react-toastify");
 var js_cookie_1 = __importDefault(require("js-cookie"));
 // Custom.
 var I18n_1 = __importDefault(require("./modules/Services/I18n"));
-(function () {
-    var _this = this;
-    function redirect() {
-        return __awaiter(this, void 0, void 0, function () {
-            var error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        //console.log("@vocollege/api->interceptor.ts->redirect()");
-                        js_cookie_1.default.set("voapp_redirectTo", window.location.origin, {
-                            domain: ".vo-college.se",
-                            sameSite: "Lax",
-                        });
-                        return [4 /*yield*/, VoAuth_1.default.logout()];
-                    case 1:
-                        _a.sent();
-                        VoRouter_1.default.redirectToLogout();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        error_1 = _a.sent();
-                        console.error("Interceptor", error_1);
-                        VoAuth_1.default.resetSession();
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
-                }
-            });
+var isRefreshingToken = false;
+var failedRequestQueue = [];
+function retryFailedRequests() {
+    if (failedRequestQueue.length && !isRefreshingToken) {
+        failedRequestQueue.forEach(function (request) {
+            axios_1.default.request(request);
         });
+        failedRequestQueue = [];
     }
-    //console.log("@vocollege/api->interceptor.ts");
+}
+function redirect() {
+    return __awaiter(this, void 0, void 0, function () {
+        var error_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    js_cookie_1.default.set("voapp_redirectTo", window.location.origin, {
+                        domain: ".vo-college.se",
+                        sameSite: "Lax",
+                    });
+                    return [4 /*yield*/, VoAuth_1.default.logout()];
+                case 1:
+                    _a.sent();
+                    VoRouter_1.default.redirectToLogout();
+                    return [3 /*break*/, 3];
+                case 2:
+                    error_1 = _a.sent();
+                    console.error("Interceptor", error_1);
+                    VoAuth_1.default.resetSession();
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+(function () {
+    var _this = this;
     axios_1.default.defaults.withCredentials = true;
     axios_1.default.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
     axios_1.default.interceptors.request.use(function (req) {
-        //console.log("Interceptor request", `${req.method} ${req.url}`);
+        var token = VoAuth_1.default.getToken();
+        if (!req.headers.Authorization && token) {
+            req.headers.Authorization = "Bearer ".concat(token.access_token);
+        }
         return req;
     });
     axios_1.default.interceptors.response.use(function (res) {
         return res;
     }, function (error) { return __awaiter(_this, void 0, void 0, function () {
-        var config, isTokenRequest, token, error_2;
+        var config, isTokenRequest, newToken, refreshError_1, error_2;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     config = error.config;
                     isTokenRequest = config.url.includes("oauth/token");
+                    if (isTokenRequest) {
+                        react_toastify_1.toast.error(I18n_1.default.get.messages.sessionExpired, { autoClose: false });
+                        redirect();
+                        return [2 /*return*/, Promise.reject(error)];
+                    }
                     _b.label = 1;
                 case 1:
-                    _b.trys.push([1, 4, , 5]);
-                    if (!(!isTokenRequest &&
-                        [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()];
+                    _b.trys.push([1, 7, , 8]);
+                    if (![400, 401, 403].includes((_a = error.response) === null || _a === void 0 ? void 0 : _a.status)) return [3 /*break*/, 6];
+                    if (!(!isRefreshingToken && !config._retry)) return [3 /*break*/, 6];
+                    isRefreshingToken = true;
+                    config._retry = true;
+                    _b.label = 2;
                 case 2:
-                    _b.sent();
-                    token = VoAuth_1.default.getToken();
-                    if (token) {
-                        config.headers["Authorization"] = "Bearer " + token.access_token;
-                        return [2 /*return*/, axios_1.default.request(config)];
-                    }
-                    _b.label = 3;
-                case 3: return [3 /*break*/, 5];
+                    _b.trys.push([2, 4, 5, 6]);
+                    return [4 /*yield*/, VoAuth_1.default.refreshToken()];
+                case 3:
+                    newToken = _b.sent();
+                    config.headers.Authorization = "Bearer ".concat(newToken === null || newToken === void 0 ? void 0 : newToken.access_token);
+                    retryFailedRequests();
+                    return [2 /*return*/, (0, axios_1.default)(config)];
                 case 4:
-                    error_2 = _b.sent();
-                    return [3 /*break*/, 5];
+                    refreshError_1 = _b.sent();
+                    redirect();
+                    return [2 /*return*/, Promise.reject(refreshError_1)];
                 case 5:
-                    if (isTokenRequest) {
-                        react_toastify_1.toast.error(I18n_1.default.get.messages.sessionExpired, { autoClose: false });
-                        redirect();
-                    }
-                    return [2 /*return*/, Promise.reject(error)];
+                    isRefreshingToken = false;
+                    return [7 /*endfinally*/];
+                case 6: return [3 /*break*/, 8];
+                case 7:
+                    error_2 = _b.sent();
+                    console.error("Interceptor error:", error_2);
+                    return [3 /*break*/, 8];
+                case 8: return [2 /*return*/, Promise.reject(error)];
             }
         });
     }); });

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

@@ -1054,7 +1054,8 @@
             "createLanguageRepresentativeDiploma": "Skapa diplom för språkombud",
             "place": "Region/Ort",
             "educator1": "Utbildare 1",
-            "educator2": "Utbildare 2"
+            "educator2": "Utbildare 2",
+            "educator3": "Utbildare 3"
         },
         "messages": {
             "intro": "För diplom till de som genomgått utbildning till språkombud.",

package/dist/modules/Services/Vapor/Vapor.js

@@ -28,7 +28,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -69,10 +69,10 @@ var Vapor = /** @class */ (function () {
     /**
      * Store a file in S3 and return its UUID, key, and other information.
      */
-    Vapor.prototype.store = function (file, options) {
-        if (options === void 0) { options = {}; }
-        return __awaiter(this, void 0, void 0, function () {
+    Vapor.prototype.store = function (file_1) {
+        return __awaiter(this, arguments, void 0, function (file, options) {
             var response, instance, headers, cancelToken;
+            if (options === void 0) { options = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, axios_1.default.post(

package/dist/modules/VoApi/GraphClient.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/modules/VoApi/VoApi.d.ts

@@ -6,7 +6,7 @@ declare class VoApi extends VoBase {
     init(params?: GeneralObject): void;
     get getGraphqlUrl(): string;
     get getGraphqlSubscriptionUrl(): string;
-    getUser(): Promise<import("axios").AxiosResponse<any>>;
+    getUser(): Promise<import("axios").AxiosResponse<any, any>>;
     logout(): Promise<boolean>;
 }
 declare const _default: VoApi;

package/dist/modules/VoApi/VoApi.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/modules/VoAuth.d.ts

@@ -8,6 +8,7 @@ declare class VoAuth extends VoBase {
     user: any;
     ability: AnyMongoAbility;
     globalAbility: AnyMongoAbility;
+    tokenRefreshTimeout: any;
     constructor(key: string);
     get getAppLoginUrl(): string;
     auth(): Promise<unknown>;
@@ -16,6 +17,7 @@ declare class VoAuth extends VoBase {
     setSession(token: any, updateCookie?: boolean): void;
     resetSession(): void;
     refreshToken(): Promise<void | VoTokenType>;
+    startTokenRefreshTimer(): void;
     check(forceRedirect?: boolean, forceLoad?: boolean): Promise<any>;
     loadUser(force?: boolean): Promise<any>;
     get currentUser(): any;

package/dist/modules/VoAuth.js

@@ -52,7 +52,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -121,6 +121,7 @@ var VoAuth = /** @class */ (function (_super) {
         var _this = this;
         return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
             var urlParams, code, state, initiatedAuth, params, url, response, state_1, verifier, error_1;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -159,6 +160,8 @@ var VoAuth = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.loadUser(true)];
                     case 3:
                         _a.sent();
+                        this.startTokenRefreshTimer();
+                        window.addEventListener("beforeunload", function () { return clearTimeout(_this.tokenRefreshTimeout); });
                         resolve(true);
                         return [3 /*break*/, 5];
                     case 4:
@@ -198,33 +201,34 @@ var VoAuth = /** @class */ (function (_super) {
     };
     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 access_token = token.access_token, refresh_token = token.refresh_token, expires_in = token.expires_in;
         if (updateCookie) {
-            var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-            js_cookie_1.default.set(refreshTokenKey, refresh_token, {
+            //console.log("setSession updatingCookie");
+            var expiryTime = new Date().getTime() + (expires_in || 3600) * 1000;
+            js_cookie_1.default.set(VoConfig_1.default.get.AUTH_STORAGE_EXPIRE_TOKEN || "", expiryTime.toString(), {
+                expires: 21,
+                sameSite: "Lax",
+                domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            });
+            js_cookie_1.default.set(VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "", 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 || "";
-            js_cookie_1.default.set(accessTokenKey, access_token, {
+            js_cookie_1.default.set(VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "", access_token, {
                 expires: expires,
                 sameSite: "Lax",
                 domain: VoConfig_1.default.get.AUTH_DOMAIN,
             });
         }
-        axios_1.default.defaults.headers.common["Authorization"] =
-            // token_type + " " + access_token;
-            "Bearer " + access_token;
+        axios_1.default.defaults.headers.common["Authorization"] = "Bearer " + access_token;
         var currentGroup = VoGroups_1.default.getCurrent(true);
-        axios_1.default.defaults.headers.common["VoGroup"] = currentGroup
-            ? currentGroup.id
-            : "";
+        axios_1.default.defaults.headers.common["VoGroup"] = currentGroup ? currentGroup.id : "";
+        this.startTokenRefreshTimer();
     };
     VoAuth.prototype.resetSession = function () {
-        console.log("Resetting session");
+        //console.log("Resetting session");
         var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
         Helpers.localStorage.remove(refreshTokenKey);
         js_cookie_1.default.remove(refreshTokenKey, {
@@ -277,13 +281,47 @@ var VoAuth = /** @class */ (function (_super) {
             });
         });
     };
+    VoAuth.prototype.startTokenRefreshTimer = function () {
+        var _this = this;
+        var expiresAt = js_cookie_1.default.get(VoConfig_1.default.get.AUTH_STORAGE_EXPIRE_TOKEN);
+        if (!expiresAt)
+            return;
+        var expiresInMs = parseInt(expiresAt) - (new Date().getTime());
+        var refreshAt = expiresInMs - (30 * 1000); // 30 sec before expiration
+        clearTimeout(this.tokenRefreshTimeout);
+        this.tokenRefreshTimeout = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+            var newToken, error_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, this.refreshToken()];
+                    case 1:
+                        newToken = _a.sent();
+                        this.setSession(newToken);
+                        this.startTokenRefreshTimer();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        error_3 = _a.sent();
+                        console.error("Token refresh failed:", error_3);
+                        this.resetSession();
+                        if (window.location.pathname !== "/login") {
+                            window.location.href = "/login";
+                        }
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        }); }, refreshAt);
+        //console.log("Setting token refresh timeout in: ", refreshAt);
+    };
     VoAuth.prototype.check = function (forceRedirect, forceLoad) {
         var _this = this;
         if (forceRedirect === void 0) { forceRedirect = false; }
         if (forceLoad === void 0) { forceLoad = false; }
         this.checkConfig();
         return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-            var currentCookies, cookieName, token, error_3;
+            var currentCookies, cookieName, token, error_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -314,8 +352,8 @@ var VoAuth = /** @class */ (function (_super) {
                         resolve(this.user);
                         return [3 /*break*/, 4];
                     case 3:
-                        error_3 = _a.sent();
-                        reject(error_3);
+                        error_4 = _a.sent();
+                        reject(error_4);
                         return [3 /*break*/, 4];
                     case 4: return [3 /*break*/, 6];
                     case 5:
@@ -335,7 +373,7 @@ var VoAuth = /** @class */ (function (_super) {
         var _this = this;
         if (force === void 0) { force = false; }
         return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-            var response, error_4;
+            var response, error_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -354,8 +392,8 @@ var VoAuth = /** @class */ (function (_super) {
                         resolve(this.user);
                         return [3 /*break*/, 4];
                     case 3:
-                        error_4 = _a.sent();
-                        reject(error_4);
+                        error_5 = _a.sent();
+                        reject(error_5);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }
@@ -382,10 +420,9 @@ var VoAuth = /** @class */ (function (_super) {
     });
     VoAuth.prototype.getToken = function () {
         try {
-            var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-            var refreshToken = js_cookie_1.default.get(refreshTokenKey);
-            var accessTokenKey = VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "";
-            var accessToken = js_cookie_1.default.get(accessTokenKey);
+            var refreshToken = js_cookie_1.default.get(VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "");
+            var accessToken = js_cookie_1.default.get(VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "");
+            var expiryToken = js_cookie_1.default.get(VoConfig_1.default.get.AUTH_STORAGE_EXPIRE_TOKEN || "");
             // let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
             // const tokenType = JsCookies.get(tokenTypeKey);
             // let expiresInKey = VoConfig.get.AUTH_STORAGE_EXPIRES_IN || "";
@@ -395,6 +432,7 @@ var VoAuth = /** @class */ (function (_super) {
                 return {
                     refresh_token: refreshToken,
                     access_token: accessToken || "",
+                    expiry_token: expiryToken || "",
                     // token_type: tokenType,
                     // expires_in: expiresIn,
                 };
@@ -404,9 +442,6 @@ var VoAuth = /** @class */ (function (_super) {
             throw error;
         }
     };
-    // const getLoginUrl = () => {
-    //     return 'http://localhost:8000/oauth/authorize?client_id=91c51b49-e705-4993-a8c7-497ee47e869e&redirect_uri=http://localhost:3000/auth&response_type=code&scope=*&state=' + state + '&code_challenge=' + challenge + '&code_challenge_method=S256'
-    //   }
     VoAuth.prototype.initAuth = function () {
         try {
             var state = Helpers.createRandomString(40);

package/dist/modules/VoConfig.d.ts

@@ -1,4 +1,4 @@
-declare type VoConfigType = {
+type VoConfigType = {
     [key: string]: any;
 };
 declare class VoConfig {

package/dist/modules/VoConfig.js

@@ -47,6 +47,7 @@ var VoConfig = /** @class */ (function () {
             AUTH_STORAGE_VERIFIER: "vo_verifier",
             AUTH_STORAGE_REFRESH_TOKEN: "vo_rtoken",
             AUTH_STORAGE_ACCESS_TOKEN: "vo_atoken",
+            AUTH_STORAGE_EXPIRE_TOKEN: "vo_etoken",
             // AUTH_STORAGE_TOKEN_TYPE: "voapp_tokentype",
             // AUTH_STORAGE_EXPIRES_IN: "voapp_expiresin",
             AUTH_DOMAIN: ".vo-college.se",

package/dist/modules/VoDocs/VoDocs.d.ts

@@ -3,7 +3,7 @@ declare class VoDocs extends VoBase {
     graphqlClient: any;
     init(): void;
     get getGraphqlUrl(): string;
-    getTemporaryFileUrl(id: string, publicDownload?: boolean): Promise<import("axios").AxiosResponse<any>>;
+    getTemporaryFileUrl(id: string, publicDownload?: boolean): Promise<import("axios").AxiosResponse<any, any>>;
 }
 declare const _default: VoDocs;
 export default _default;

package/dist/modules/VoDocs/VoDocs.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -77,10 +77,10 @@ var VoDocs = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    VoDocs.prototype.getTemporaryFileUrl = function (id, publicDownload) {
-        if (publicDownload === void 0) { publicDownload = false; }
-        return __awaiter(this, void 0, void 0, function () {
+    VoDocs.prototype.getTemporaryFileUrl = function (id_1) {
+        return __awaiter(this, arguments, void 0, function (id, publicDownload) {
             var currentGroup, endpoint, url;
+            if (publicDownload === void 0) { publicDownload = false; }
             return __generator(this, function (_a) {
                 try {
                     currentGroup = VoGroups_1.default.getCurrent(true);

package/dist/modules/VoHelpers.d.ts

@@ -7,7 +7,7 @@ export declare const localStorage: {
     get: (key: string) => string | false | null;
     remove: (key: string) => true | undefined;
 };
-declare type encodeQueryDataType = {
+type encodeQueryDataType = {
     [key: string]: any;
 };
 export declare const encodeQueryData: (data: encodeQueryDataType) => string;
@@ -20,7 +20,7 @@ export declare const regexPatterns: {
     personalNumber: RegExp;
     orgnr: RegExp;
 };
-declare type errorObjectType = {
+type errorObjectType = {
     message: string;
     fields?: {
         [key: string]: any;
@@ -33,8 +33,8 @@ export declare const wrapPromise: (promise: any) => {
     read: () => any;
 };
 export declare const downloadFile: (url: string) => void;
-export declare const orderByPosition: (a: any, b: any) => 1 | -1 | 0;
-export declare const orderByField: (a: any, b: any, field: string, descending?: boolean) => 1 | -1 | 0;
+export declare const orderByPosition: (a: any, b: any) => 0 | 1 | -1;
+export declare const orderByField: (a: any, b: any, field: string, descending?: boolean) => 0 | 1 | -1;
 export declare const shortenText: (str: string, limit?: number, stripHtml?: boolean, addEllipsis?: boolean) => string;
 export declare const getImageContact: (item: any, width?: number, height?: number) => string;
 export declare const getImage: (item: any, width: number, height: number, field?: string) => string;

package/dist/modules/VoHelpers.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -121,7 +121,7 @@ exports.regexPatterns = {
     username: /(^[a-z]{3,})([\.]|[\_]|[\-]|[a-z]|[0-9]?)+$/,
     email: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
     stringNonDigit: /^[^0-9]+$/,
-    password: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,}$/,
+    password: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,}$/, // At least 8 characters, 1 uppercase, 1 lowercase and 1 digit.
     cleanName: /(^[a-z]{1,})(\w|-?)+$/,
     personalNumber: /^(\d{8})[-]\d{4}$/,
     orgnr: /^(\d{6})[-]\d{4}$/,

package/dist/modules/VoRouter.d.ts

@@ -1,4 +1,4 @@
-declare type RoutesType = {
+type RoutesType = {
     [key: string]: any;
 };
 declare class VoRouter {

package/dist/modules/VoUtils_REMOVE.d.ts

@@ -6,7 +6,7 @@ declare const localStorage: {
     get: (key: string) => string | false | null;
     remove: (key: string) => true | undefined;
 };
-declare type encodeQueryDataType = {
+type encodeQueryDataType = {
     [key: string]: any;
 };
 declare const encodeQueryData: (data: encodeQueryDataType) => string;
@@ -16,7 +16,7 @@ declare const regexPatterns: {
     stringNonDigit: RegExp;
     password: RegExp;
 };
-declare type errorObjectType = {
+type errorObjectType = {
     message: string;
     fields?: {
         [key: string]: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocollege/app",
-  "version": "0.0.171",
+  "version": "0.0.173",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
     "@apollo/client": "^3.10.5",
     "@casl/ability": "^6.7.1",
     "@casl/react": "^4.0.0",
-    "@types/apollo-upload-client": "^18.0.0",
+    "apollo-upload-client": "^16.0.0",
     "@types/crypto-js": "^4.2.2",
     "@types/he": "^1.2.3",
     "@types/js-cookie": "^3.0.6",
@@ -41,5 +41,6 @@
     "js-cookie": "^3.0.1",
     "react": "^18.3.1",
     "react-toastify": "^8.0.0"
-  }
+  },
+  "dependencies": {}
 }

package/src/global.ts

@@ -34,6 +34,7 @@ export type VoTokenType = {
   // token_type: string;
   access_token: string;
   refresh_token: string;
+  expiry_token: string;
   // expires_in: string;
 };
 

package/src/interceptor.ts

@@ -7,28 +7,41 @@ import Cookies from "js-cookie";
 // Custom.
 import I18n from "./modules/Services/I18n";
 
-(function () {
-  async function redirect() {
-    try {
-      //console.log("@vocollege/api->interceptor.ts->redirect()");
-      Cookies.set("voapp_redirectTo", window.location.origin, {
-        domain: ".vo-college.se",
-        sameSite: "Lax",
-      });
-      await VoAuth.logout();
-      VoRouter.redirectToLogout();
-    } catch (error) {
-      console.error("Interceptor", error);
-      VoAuth.resetSession();
-    }
+let isRefreshingToken = false;
+let failedRequestQueue: any[] = [];
+
+function retryFailedRequests() {
+  if (failedRequestQueue.length && !isRefreshingToken) {
+    failedRequestQueue.forEach((request) => {
+      axios.request(request);
+    });
+    failedRequestQueue = [];
   }
+}
 
-  //console.log("@vocollege/api->interceptor.ts");
+async function redirect() {
+  try {
+    Cookies.set("voapp_redirectTo", window.location.origin, {
+      domain: ".vo-college.se",
+      sameSite: "Lax",
+    });
+    await VoAuth.logout();
+    VoRouter.redirectToLogout();
+  } catch (error) {
+    console.error("Interceptor", error);
+    VoAuth.resetSession();
+  }
+}
+
+(function () {
   axios.defaults.withCredentials = true;
   axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
 
   axios.interceptors.request.use((req) => {
-    //console.log("Interceptor request", `${req.method} ${req.url}`);
+    const token = VoAuth.getToken();
+    if (!req.headers.Authorization && token) {
+      req.headers.Authorization = `Bearer ${token.access_token}`;
+    }
     return req;
   });
 
@@ -39,28 +52,44 @@ import I18n from "./modules/Services/I18n";
     async (error) => {
       const { config } = error;
       let isTokenRequest = config.url.includes("oauth/token");
-      /*console.log(
-        "@vocollege/api->interceptor.js - isTokenRequest: ",
-        isTokenRequest,
-      );*/
+      
+      if (isTokenRequest) {
+        toast.error(I18n.get.messages.sessionExpired, { autoClose: false });
+        redirect();
+        return Promise.reject(error);
+      }
+
       try {
-        if (
-          !isTokenRequest &&
-          [400, 401, 403].indexOf(error.response?.status) > -1
-        ) {
-          await VoAuth.refreshToken();
+        if ([400, 401, 403].includes(error.response?.status)) {
+          if (!isRefreshingToken && !config._retry) {
+            isRefreshingToken = true;
+            config._retry = true;
+
+            try {
+              const newToken = await VoAuth.refreshToken();
+              config.headers.Authorization = `Bearer ${newToken?.access_token}`;
+              retryFailedRequests();
+              return axios(config);
+            } catch (refreshError) {
+              redirect();
+              return Promise.reject(refreshError);
+            } finally {
+              isRefreshingToken = false;
+            }
+          }
+        }
+          /*await VoAuth.refreshToken();
           const token: any = VoAuth.getToken();
           if (token) {
             config.headers["Authorization"] = "Bearer " + token.access_token;
             return axios.request(config);
           }
-        }
-      } catch (error) {}
-
-      if (isTokenRequest) {
-        toast.error(I18n.get.messages.sessionExpired, { autoClose: false });
-        redirect();
+        }*/
+      } catch (error) {
+        console.error("Interceptor error:", error);
       }
+
+      
       return Promise.reject(error);
     },
   );

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

@@ -1054,7 +1054,8 @@
       "createLanguageRepresentativeDiploma": "Skapa diplom för språkombud",
       "place": "Region/Ort",
       "educator1": "Utbildare 1",
-      "educator2": "Utbildare 2"
+      "educator2": "Utbildare 2",
+      "educator3": "Utbildare 3"
     },
     "messages": {
       "intro": "För diplom till de som genomgått utbildning till språkombud.",

package/src/modules/VoAuth.ts

@@ -18,6 +18,7 @@ class VoAuth extends VoBase {
   user: any = null;
   ability: AnyMongoAbility;
   globalAbility: AnyMongoAbility;
+  tokenRefreshTimeout: any;
 
   constructor(key: string) {
     super(key);
@@ -76,6 +77,8 @@ class VoAuth extends VoBase {
 
           this.setSession(response.data);
           await this.loadUser(true);
+          this.startTokenRefreshTimer();
+          window.addEventListener("beforeunload", () => clearTimeout(this.tokenRefreshTimeout));
           resolve(true);
         } else {
           reject("Authorization failed");
@@ -99,44 +102,48 @@ class VoAuth extends VoBase {
   }
 
   setSession(token: any, updateCookie = true) {
-    // const { token_type, access_token, refresh_token, expires_in } = token;
-    const { access_token, refresh_token } = token;
+    const { access_token, refresh_token, expires_in } = token;
 
     if (updateCookie) {
-      let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-      JsCookies.set(refreshTokenKey, refresh_token, {
+      
+      //console.log("setSession updatingCookie");
+      const expiryTime = new Date().getTime() + (expires_in || 3600) * 1000;
+      JsCookies.set(VoConfig.get.AUTH_STORAGE_EXPIRE_TOKEN || "", expiryTime.toString(), {
+        expires: 21,
+        sameSite: "Lax",
+        domain: VoConfig.get.AUTH_DOMAIN,
+      });
+
+      JsCookies.set(VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "", refresh_token, {
         expires: 21,
         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 || "";
-      JsCookies.set(accessTokenKey, access_token, {
+      JsCookies.set(VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "", access_token, {
         expires,
         sameSite: "Lax",
         domain: VoConfig.get.AUTH_DOMAIN,
       });
     }
 
-    axios.defaults.headers.common["Authorization"] =
-      // token_type + " " + access_token;
-      "Bearer " + access_token;
+    axios.defaults.headers.common["Authorization"] = "Bearer " + access_token;
     let currentGroup = VoGroups.getCurrent(true);
-    axios.defaults.headers.common["VoGroup"] = currentGroup
-      ? currentGroup.id
-      : "";
+    axios.defaults.headers.common["VoGroup"] = currentGroup ? currentGroup.id : "";
+    this.startTokenRefreshTimer();
   }
+
   resetSession() {
-    console.log("Resetting session");
-    let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
+    //console.log("Resetting session");
+    const refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
     Helpers.localStorage.remove(refreshTokenKey);
     JsCookies.remove(refreshTokenKey, {
       domain: VoConfig.get.AUTH_DOMAIN,
       sameSite: "Lax",
     });
 
-    let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
+    const accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
     Helpers.localStorage.remove(accessTokenKey);
     JsCookies.remove(accessTokenKey, {
       domain: VoConfig.get.AUTH_DOMAIN,
@@ -149,6 +156,7 @@ class VoAuth extends VoBase {
 
     delete axios.defaults.headers.common["Authorization"];
   }
+
   async refreshToken() {
     try {
       const token: any = this.getToken();
@@ -175,6 +183,29 @@ class VoAuth extends VoBase {
     }
   }
 
+  startTokenRefreshTimer() {
+    const expiresAt = JsCookies.get(VoConfig.get.AUTH_STORAGE_EXPIRE_TOKEN);
+    if (!expiresAt) return;
+
+    const expiresInMs = parseInt(expiresAt) - (new Date().getTime());
+    const refreshAt = expiresInMs - (30 * 1000); // 30 sec before expiration
+    clearTimeout(this.tokenRefreshTimeout);
+    this.tokenRefreshTimeout = setTimeout(async () => {
+      try {
+        const newToken = await this.refreshToken();
+        this.setSession(newToken);
+        this.startTokenRefreshTimer();
+      } catch (error) {
+        console.error("Token refresh failed:", error);
+        this.resetSession();
+        if (window.location.pathname !== "/login") {
+          window.location.href = "/login";
+        }
+      }
+    }, refreshAt);
+    //console.log("Setting token refresh timeout in: ", refreshAt);
+  }
+
   check(forceRedirect = false, forceLoad = false): Promise<any> {
     this.checkConfig();
     return new Promise(async (resolve, reject) => {
@@ -214,6 +245,7 @@ class VoAuth extends VoBase {
       }
     });
   }
+
   loadUser(force = false): Promise<any> {
     return new Promise(async (resolve, reject) => {
       try {
@@ -231,9 +263,11 @@ class VoAuth extends VoBase {
       }
     });
   }
+
   get currentUser() {
     return this.user;
   }
+
   get isOnlyValidigCandidate() {
     if (this.user?.validig) {
       return this.user?.roles?.length == 1 && this.user?.roles.find((r: any) => r.name ==="candidate");
@@ -243,11 +277,9 @@ class VoAuth extends VoBase {
 
   getToken(): VoTokenType | void {
     try {
-      let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-      const refreshToken = JsCookies.get(refreshTokenKey);
-
-      let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
-      const accessToken = JsCookies.get(accessTokenKey);
+      const refreshToken = JsCookies.get(VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "");
+      const accessToken = JsCookies.get(VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "");
+      const expiryToken = JsCookies.get(VoConfig.get.AUTH_STORAGE_EXPIRE_TOKEN || "");
 
       // let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
       // const tokenType = JsCookies.get(tokenTypeKey);
@@ -260,6 +292,7 @@ class VoAuth extends VoBase {
         return {
           refresh_token: refreshToken,
           access_token: accessToken || "",
+          expiry_token: expiryToken || "",
           // token_type: tokenType,
           // expires_in: expiresIn,
         };
@@ -269,17 +302,13 @@ class VoAuth extends VoBase {
     }
   }
 
-  // const getLoginUrl = () => {
-  //     return 'http://localhost:8000/oauth/authorize?client_id=91c51b49-e705-4993-a8c7-497ee47e869e&redirect_uri=http://localhost:3000/auth&response_type=code&scope=*&state=' + state + '&code_challenge=' + challenge + '&code_challenge_method=S256'
-  //   }
-
   initAuth(): { state: string; challenge: string } {
     try {
-      let state = Helpers.createRandomString(40);
-      let verifier = Helpers.createRandomString(128);
-      let challenge = Helpers.base64Url(crypto.SHA256(verifier));
+      const state = Helpers.createRandomString(40);
+      const verifier = Helpers.createRandomString(128);
+      const challenge = Helpers.base64Url(crypto.SHA256(verifier));
 
-      let stateKey = VoConfig.get.AUTH_STORAGE_STATE || "";
+      const stateKey = VoConfig.get.AUTH_STORAGE_STATE || "";
       Helpers.localStorage.remove(stateKey);
       JsCookies.set(stateKey, state, {
         expires: 1,
@@ -287,7 +316,7 @@ class VoAuth extends VoBase {
         domain: VoConfig.get.AUTH_DOMAIN,
       });
 
-      let verifierKey = VoConfig.get.AUTH_STORAGE_VERIFIER || "";
+      const verifierKey = VoConfig.get.AUTH_STORAGE_VERIFIER || "";
       Helpers.localStorage.remove(verifierKey);
       JsCookies.set(verifierKey, verifier, {
         expires: 1,
@@ -295,7 +324,7 @@ class VoAuth extends VoBase {
         domain: VoConfig.get.AUTH_DOMAIN,
       });
 
-      let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
+      const accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
       Helpers.localStorage.remove(accessTokenKey);
       JsCookies.remove(accessTokenKey, {
         domain: VoConfig.get.AUTH_DOMAIN,
@@ -303,7 +332,7 @@ class VoAuth extends VoBase {
         expires: 1,
       });
 
-      let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
+      const refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
       Helpers.localStorage.remove(refreshTokenKey);
       JsCookies.remove(refreshTokenKey, {
         domain: VoConfig.get.AUTH_DOMAIN,
@@ -327,6 +356,7 @@ class VoAuth extends VoBase {
       throw error;
     }
   }
+
   getInitiatedAuth(): { state: string; verifier: string } {
     let stateKey = VoConfig.get.AUTH_STORAGE_STATE || "";
     // const state = Helpers.localStorage.get(stateKey);

package/src/modules/VoConfig.ts

@@ -47,6 +47,7 @@ class VoConfig {
     AUTH_STORAGE_VERIFIER: "vo_verifier",
     AUTH_STORAGE_REFRESH_TOKEN: "vo_rtoken",
     AUTH_STORAGE_ACCESS_TOKEN: "vo_atoken",
+    AUTH_STORAGE_EXPIRE_TOKEN: "vo_etoken",
     // AUTH_STORAGE_TOKEN_TYPE: "voapp_tokentype",
     // AUTH_STORAGE_EXPIRES_IN: "voapp_expiresin",
     AUTH_DOMAIN: ".vo-college.se",