@vocollege/app 0.0.73 → 0.0.75

package/dist/interceptor.js

@@ -112,15 +112,8 @@ var I18n_1 = __importDefault(require("./modules/Services/I18n"));
                     console.error("Interceptor", error_2);
                     return [3 /*break*/, 4];
                 case 4: return [3 /*break*/, 5];
-                case 5: 
-                // redirect();
-                // console.error("Interceptor", error);
-                // return Promise.reject(error);
-                return [2 /*return*/, new Promise(function (resolve, reject) {
+                case 5: return [2 /*return*/, new Promise(function (resolve, reject) {
                         switch (status) {
-                            // case 403:
-                            //   reject(error);
-                            //   break;
                             case 419:
                                 react_toastify_1.toast.error(I18n_1.default.get.messages.sessionExpired);
                                 setTimeout(function () {

package/dist/modules/VoApi/VoApi.js

@@ -61,6 +61,7 @@ var GraphClient_1 = __importDefault(require("./GraphClient"));
 var VoBase_1 = __importDefault(require("../VoBase"));
 // import VoAuth from "../VoAuth";
 var VoConfig_1 = __importDefault(require("../VoConfig"));
+var VoHelpers_1 = require("../VoHelpers");
 var VoApi = /** @class */ (function (_super) {
     __extends(VoApi, _super);
     function VoApi() {
@@ -93,12 +94,18 @@ var VoApi = /** @class */ (function (_super) {
     });
     VoApi.prototype.getUser = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var user, error_1;
+            var url, masquerade, user, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, axios_1.default.get(this.getUrl + "/user")];
+                        url = this.getUrl + "/user";
+                        masquerade = VoHelpers_1.localStorage.get(VoConfig_1.default.get.MASQUERADE_USER);
+                        if (masquerade) {
+                            masquerade = JSON.parse(masquerade);
+                            url = "".concat(url, "?masquerade=").concat(masquerade === null || masquerade === void 0 ? void 0 : masquerade.id);
+                        }
+                        return [4 /*yield*/, axios_1.default.get(url)];
                     case 1:
                         user = _a.sent();
                         return [2 /*return*/, user];

package/dist/modules/VoAuth.js

@@ -258,6 +258,8 @@ var VoAuth = /** @class */ (function (_super) {
             domain: VoConfig_1.default.get.AUTH_DOMAIN,
             sameSite: "Lax",
         });
+        Helpers.localStorage.remove(VoConfig_1.default.get.CURRENT_GROUP || "");
+        Helpers.localStorage.remove(VoConfig_1.default.get.MASQUERADE_USER || "");
         delete axios_1.default.defaults.headers.common["Authorization"];
     };
     VoAuth.prototype.refreshToken = function () {

package/dist/modules/VoConfig.js

@@ -51,6 +51,7 @@ var VoConfig = /** @class */ (function () {
             AUTH_STORAGE_EXPIRES_IN: "voapp_expiresin",
             AUTH_DOMAIN: ".vo-college.se",
             CURRENT_GROUP: "vo_group",
+            MASQUERADE_USER: "vo_masquerade",
         };
     }
     VoConfig.prototype.setConfig = function (config) {

package/package.json

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

package/src/interceptor.ts

@@ -39,7 +39,6 @@ import I18n from "./modules/Services/I18n";
         switch (status) {
           case 400:
           case 401:
-            // case 403:
             try {
               await VoAuth.refreshToken();
               const token: any = VoAuth.getToken();
@@ -56,23 +55,13 @@ import I18n from "./modules/Services/I18n";
             } catch (error) {
               redirect();
               console.error("Interceptor", error);
-              // return Promise.reject(error);
             }
             break;
-          // case 419:
-          //   console.log("LOG OUT");
-          //   break;
         }
       }
 
-      // redirect();
-      // console.error("Interceptor", error);
-      // return Promise.reject(error);
       return new Promise((resolve, reject) => {
         switch (status) {
-          // case 403:
-          //   reject(error);
-          //   break;
           case 419:
             toast.error(I18n.get.messages.sessionExpired);
             setTimeout(() => {

package/src/modules/VoApi/VoApi.ts

@@ -16,6 +16,7 @@ import VoBase from "../VoBase";
 // import VoAuth from "../VoAuth";
 import VoConfig from "../VoConfig";
 import { GeneralObject } from "../../global";
+import { localStorage } from "../VoHelpers";
 
 class VoApi extends VoBase {
   graphqlClient: any;
@@ -49,7 +50,13 @@ class VoApi extends VoBase {
 
   async getUser() {
     try {
-      const user = await axios.get(this.getUrl + "/user");
+      let url = this.getUrl + "/user";
+      let masquerade: any = localStorage.get(VoConfig.get.MASQUERADE_USER);
+      if (masquerade) {
+        masquerade = JSON.parse(masquerade);
+        url = `${url}?masquerade=${masquerade?.id}`;
+      }
+      const user = await axios.get(url);
       return user;
     } catch (error) {
       throw error;

package/src/modules/VoAuth.ts

@@ -169,6 +169,9 @@ class VoAuth extends VoBase {
       sameSite: "Lax",
     });
 
+    Helpers.localStorage.remove(VoConfig.get.CURRENT_GROUP || "");
+    Helpers.localStorage.remove(VoConfig.get.MASQUERADE_USER || "");
+
     delete axios.defaults.headers.common["Authorization"];
   }
   async refreshToken() {

package/src/modules/VoConfig.ts

@@ -52,6 +52,7 @@ class VoConfig {
     AUTH_DOMAIN: ".vo-college.se",
 
     CURRENT_GROUP: "vo_group",
+    MASQUERADE_USER: "vo_masquerade",
   };
 
   setConfig(config: VoConfigType) {