@vocollege/app 0.0.58 → 0.0.59

package/dist/modules/VoAuth.js

@@ -16,7 +16,11 @@ var __extends = (this && this.__extends) || (function () {
 })();
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -81,6 +85,8 @@ var VoBase_1 = __importDefault(require("./VoBase"));
 var VoApi_1 = __importDefault(require("./VoApi"));
 var VoRouter_1 = __importDefault(require("./VoRouter"));
 var VoConfig_1 = __importDefault(require("./VoConfig"));
+var VoGroups_1 = __importDefault(require("./VoGroups"));
+var js_cookie_1 = __importDefault(require("js-cookie"));
 var VoAuth = /** @class */ (function (_super) {
     __extends(VoAuth, _super);
     function VoAuth(key) {
@@ -90,6 +96,7 @@ var VoAuth = /** @class */ (function (_super) {
         _this.verifier = "";
         _this.challenge = "";
         _this.ability = new ability_1.Ability();
+        _this.globalAbility = new ability_1.Ability();
         return _this;
     }
     Object.defineProperty(VoAuth.prototype, "getAppLoginUrl", {
@@ -113,7 +120,7 @@ var VoAuth = /** @class */ (function (_super) {
     VoAuth.prototype.auth = function () {
         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;
+            var urlParams, code, state, initiatedAuth, params, url, response, state_1, verifier, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -121,7 +128,10 @@ var VoAuth = /** @class */ (function (_super) {
                         code = urlParams.get("code");
                         state = urlParams.get("state");
                         initiatedAuth = this.getInitiatedAuth();
-                        if (!(code && state && state === initiatedAuth.state)) return [3 /*break*/, 3];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 6, , 7]);
+                        if (!(code && state && state === initiatedAuth.state)) return [3 /*break*/, 4];
                         params = {
                             grant_type: "authorization_code",
                             client_id: VoConfig_1.default.get.AUTH_CLIENT_ID,
@@ -131,22 +141,35 @@ var VoAuth = /** @class */ (function (_super) {
                         };
                         url = this.getUrl + "/token";
                         return [4 /*yield*/, axios_1.default.post(url, params)];
-                    case 1:
+                    case 2:
                         response = _a.sent();
                         state_1 = VoConfig_1.default.get.AUTH_STORAGE_STATE || "";
-                        Helpers.localStorage.remove(state_1);
+                        // Helpers.localStorage.remove(state);
+                        js_cookie_1.default.remove(state_1, {
+                            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+                            sameSite: "Lax",
+                        });
                         verifier = VoConfig_1.default.get.AUTH_STORAGE_VERIFIER || "";
-                        Helpers.localStorage.remove(verifier);
+                        // Helpers.localStorage.remove(verifier);
+                        js_cookie_1.default.remove(verifier, {
+                            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+                            sameSite: "Lax",
+                        });
                         this.setSession(response.data);
                         return [4 /*yield*/, this.loadUser(true)];
-                    case 2:
+                    case 3:
                         _a.sent();
                         resolve(true);
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 4:
                         reject("Authorization failed");
-                        _a.label = 4;
-                    case 4: return [2 /*return*/];
+                        _a.label = 5;
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
+                        error_1 = _a.sent();
+                        reject(error_1);
+                        return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
                 }
             });
         }); });
@@ -176,30 +199,67 @@ var VoAuth = /** @class */ (function (_super) {
     VoAuth.prototype.setSession = function (token) {
         var token_type = token.token_type, access_token = token.access_token, refresh_token = token.refresh_token, expires_in = token.expires_in;
         var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-        Helpers.localStorage.set(refreshTokenKey, refresh_token);
+        // Helpers.localStorage.set(refreshTokenKey, refresh_token);
+        js_cookie_1.default.set(refreshTokenKey, refresh_token, {
+            expires: 20,
+            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);
+        // Helpers.localStorage.set(accessTokenKey, access_token);
+        js_cookie_1.default.set(accessTokenKey, access_token, {
+            expires: 20,
+            sameSite: "Lax",
+            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+        });
         var tokenTypeKey = VoConfig_1.default.get.AUTH_STORAGE_TOKEN_TYPE || "";
-        Helpers.localStorage.set(tokenTypeKey, token_type);
+        // Helpers.localStorage.set(tokenTypeKey, token_type);
+        js_cookie_1.default.set(tokenTypeKey, token_type, {
+            expires: 20,
+            sameSite: "Lax",
+            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+        });
         var expiresInKey = VoConfig_1.default.get.AUTH_STORAGE_EXPIRES_IN || "";
-        Helpers.localStorage.set(expiresInKey, expires_in);
+        // Helpers.localStorage.set(expiresInKey, expires_in);
+        js_cookie_1.default.set(expiresInKey, expires_in, {
+            expires: 20,
+            sameSite: "Lax",
+            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+        });
         axios_1.default.defaults.headers.common["Authorization"] =
             token_type + " " + access_token;
+        var currentGroup = VoGroups_1.default.getCurrent(true);
+        axios_1.default.defaults.headers.common["VoGroup"] = currentGroup
+            ? currentGroup.id
+            : "";
     };
     VoAuth.prototype.resetSession = function () {
         var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
         Helpers.localStorage.remove(refreshTokenKey);
+        js_cookie_1.default.remove(refreshTokenKey, { domain: VoConfig_1.default.get.AUTH_DOMAIN });
         var accessTokenKey = VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "";
         Helpers.localStorage.remove(accessTokenKey);
+        js_cookie_1.default.remove(accessTokenKey, {
+            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            sameSite: "Lax",
+        });
         var tokenTypeKey = VoConfig_1.default.get.AUTH_STORAGE_TOKEN_TYPE || "";
         Helpers.localStorage.remove(tokenTypeKey);
+        js_cookie_1.default.remove(tokenTypeKey, {
+            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            sameSite: "Lax",
+        });
         var expiresInKey = VoConfig_1.default.get.AUTH_STORAGE_EXPIRES_IN || "";
         Helpers.localStorage.remove(expiresInKey);
+        js_cookie_1.default.remove(expiresInKey, {
+            domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            sameSite: "Lax",
+        });
         delete axios_1.default.defaults.headers.common["Authorization"];
     };
     VoAuth.prototype.refreshToken = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var token, params, url, response, error_1;
+            var token, params, url, response, error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -224,9 +284,9 @@ var VoAuth = /** @class */ (function (_super) {
                     case 2: throw new Error("Refresh token not found");
                     case 3: return [3 /*break*/, 5];
                     case 4:
-                        error_1 = _a.sent();
+                        error_2 = _a.sent();
                         this.resetSession();
-                        throw error_1;
+                        throw error_2;
                     case 5: return [2 /*return*/];
                 }
             });
@@ -238,7 +298,7 @@ var VoAuth = /** @class */ (function (_super) {
         if (forceLoad === void 0) { forceLoad = false; }
         this.checkConfig();
         return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-            var token, error_2;
+            var token, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -248,20 +308,14 @@ var VoAuth = /** @class */ (function (_super) {
                     case 1:
                         _a.trys.push([1, 3, , 4]);
                         this.setSession(token);
-                        // const response = await VoApi.getUser();
-                        // this.user = response.data.data;
-                        // this.ability.update(this.user.permissions);
                         return [4 /*yield*/, this.loadUser(forceLoad)];
                     case 2:
-                        // const response = await VoApi.getUser();
-                        // this.user = response.data.data;
-                        // this.ability.update(this.user.permissions);
                         _a.sent();
                         resolve(this.user);
                         return [3 /*break*/, 4];
                     case 3:
-                        error_2 = _a.sent();
-                        reject(error_2);
+                        error_3 = _a.sent();
+                        reject(error_3);
                         return [3 /*break*/, 4];
                     case 4: return [3 /*break*/, 6];
                     case 5:
@@ -281,7 +335,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_3;
+            var response, error_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -292,13 +346,16 @@ var VoAuth = /** @class */ (function (_super) {
                         response = _a.sent();
                         this.user = response.data.data;
                         this.ability.update(this.user.permissions);
+                        if (VoGroups_1.default.getCurrent(true)) {
+                            this.globalAbility.update(this.user.globalPermissions);
+                        }
                         _a.label = 2;
                     case 2:
                         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 [2 /*return*/];
                 }
@@ -315,13 +372,17 @@ var VoAuth = /** @class */ (function (_super) {
     VoAuth.prototype.getToken = function () {
         try {
             var refreshTokenKey = VoConfig_1.default.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-            var refreshToken = Helpers.localStorage.get(refreshTokenKey);
+            // const refreshToken = Helpers.localStorage.get(refreshTokenKey);
+            var refreshToken = js_cookie_1.default.get(refreshTokenKey);
             var accessTokenKey = VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "";
-            var accessToken = Helpers.localStorage.get(accessTokenKey);
+            // const accessToken = Helpers.localStorage.get(accessTokenKey);
+            var accessToken = js_cookie_1.default.get(accessTokenKey);
             var tokenTypeKey = VoConfig_1.default.get.AUTH_STORAGE_TOKEN_TYPE || "";
-            var tokenType = Helpers.localStorage.get(tokenTypeKey);
+            // const tokenType = Helpers.localStorage.get(tokenTypeKey);
+            var tokenType = js_cookie_1.default.get(tokenTypeKey);
             var expiresInKey = VoConfig_1.default.get.AUTH_STORAGE_EXPIRES_IN || "";
-            var expiresIn = Helpers.localStorage.get(expiresInKey);
+            // const expiresIn = Helpers.localStorage.get(expiresInKey);
+            var expiresIn = js_cookie_1.default.get(expiresInKey);
             if (refreshToken && accessToken && tokenType && expiresIn) {
                 return {
                     refresh_token: refreshToken,
@@ -344,13 +405,31 @@ var VoAuth = /** @class */ (function (_super) {
             var verifier = Helpers.createRandomString(128);
             var challenge = Helpers.base64Url(crypto_js_1.default.SHA256(verifier));
             var stateKey = VoConfig_1.default.get.AUTH_STORAGE_STATE || "";
-            Helpers.localStorage.set(stateKey, state);
+            Helpers.localStorage.remove(stateKey);
+            js_cookie_1.default.set(stateKey, state, {
+                expires: 1,
+                sameSite: "Lax",
+                domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            });
             var verifierKey = VoConfig_1.default.get.AUTH_STORAGE_VERIFIER || "";
-            Helpers.localStorage.set(verifierKey, verifier);
+            Helpers.localStorage.remove(verifierKey);
+            js_cookie_1.default.set(verifierKey, verifier, {
+                expires: 1,
+                sameSite: "Lax",
+                domain: VoConfig_1.default.get.AUTH_DOMAIN,
+            });
             var accessTokenKey = VoConfig_1.default.get.AUTH_STORAGE_ACCESS_TOKEN || "";
             Helpers.localStorage.remove(accessTokenKey);
+            js_cookie_1.default.remove(accessTokenKey, {
+                domain: VoConfig_1.default.get.AUTH_DOMAIN,
+                sameSite: "Lax",
+            });
             var tokenTypeKey = VoConfig_1.default.get.AUTH_STORAGE_TOKEN_TYPE || "";
             Helpers.localStorage.remove(tokenTypeKey);
+            js_cookie_1.default.remove(tokenTypeKey, {
+                domain: VoConfig_1.default.get.AUTH_DOMAIN,
+                sameSite: "Lax",
+            });
             return {
                 state: state,
                 challenge: challenge,
@@ -362,9 +441,11 @@ var VoAuth = /** @class */ (function (_super) {
     };
     VoAuth.prototype.getInitiatedAuth = function () {
         var stateKey = VoConfig_1.default.get.AUTH_STORAGE_STATE || "";
-        var state = Helpers.localStorage.get(stateKey);
+        // const state = Helpers.localStorage.get(stateKey);
+        var state = js_cookie_1.default.get(stateKey);
         var verifierKey = VoConfig_1.default.get.AUTH_STORAGE_VERIFIER || "";
-        var verifier = Helpers.localStorage.get(verifierKey);
+        // const verifier = Helpers.localStorage.get(verifierKey);
+        var verifier = js_cookie_1.default.get(verifierKey);
         return {
             state: state || "",
             verifier: verifier || "",

package/dist/modules/VoBase.js

@@ -15,8 +15,8 @@ var VoBase = /** @class */ (function () {
     };
     Object.defineProperty(VoBase.prototype, "getUrl", {
         get: function () {
-            var envKey = this.configKey.toUpperCase() + "_BASE_URL";
-            var endpointKey = this.configKey.toUpperCase() + "_ENDPOINT";
+            var envKey = "".concat(this.configKey.toUpperCase(), "_BASE_URL");
+            var endpointKey = "".concat(this.configKey.toUpperCase(), "_ENDPOINT");
             return VoConfig_1.default.get[envKey] + "" + VoConfig_1.default.get[endpointKey];
             // let envKey = `REACT_APP_${this.configKey.toUpperCase()}_BASE_URL`;
             // let endpointKey = `REACT_APP_${this.configKey.toUpperCase()}_ENDPOINT`;

package/dist/modules/VoConfig.js

@@ -21,9 +21,12 @@ var VoConfig = /** @class */ (function () {
         //     this.routes = routes;
         // }
         this.config = {
+            APP_VERSION: "",
             API_BASE_URL: "",
             API_ENDPOINT: "",
             API_GRAPHQL: "",
+            API_SUBSCRIPTIONS_BASE_URL: "",
+            API_GRAPHQL_SUBSCRIPTIONS: "",
             AUTH_CLIENT_ID: "",
             AUTH_BASE_URL: "",
             AUTH_ENDPOINT: "",
@@ -31,6 +34,10 @@ var VoConfig = /** @class */ (function () {
             DOCS_BASE_URL: "",
             DOCS_ENDPOINT: "",
             DOCS_GRAPHQL: "",
+            DOCS_PUBLIC_DISKS: "",
+            DOCS_PRIVATE_DISKS: "",
+            AWS_BUCKET_VOFRONT_FILES: "",
+            AWS_BUCKET_VODOCS_FILES: "",
             BASE_URL: "",
             AUTH: "",
             LOGIN: "",
@@ -42,6 +49,8 @@ var VoConfig = /** @class */ (function () {
             AUTH_STORAGE_ACCESS_TOKEN: "voapp_accesstoken",
             AUTH_STORAGE_TOKEN_TYPE: "voapp_tokentype",
             AUTH_STORAGE_EXPIRES_IN: "voapp_expiresin",
+            AUTH_DOMAIN: ".vo-college.se",
+            CURRENT_GROUP: "vo_group",
         };
     }
     VoConfig.prototype.setConfig = function (config) {

package/dist/modules/VoDocs/VoDocs.js

@@ -61,6 +61,7 @@ var GraphClient_1 = __importDefault(require("../VoApi/GraphClient"));
 var VoBase_1 = __importDefault(require("../VoBase"));
 // import VoAuth from '../VoAuth';
 var VoConfig_1 = __importDefault(require("../VoConfig"));
+var VoGroups_1 = __importDefault(require("../VoGroups"));
 var VoDocs = /** @class */ (function (_super) {
     __extends(VoDocs, _super);
     function VoDocs() {
@@ -78,10 +79,14 @@ var VoDocs = /** @class */ (function (_super) {
     });
     VoDocs.prototype.getTemporaryFileUrl = function (id) {
         return __awaiter(this, void 0, void 0, function () {
-            var url;
+            var currentGroup, url;
             return __generator(this, function (_a) {
                 try {
-                    url = this.getUrl + "/docs/download/" + id;
+                    currentGroup = VoGroups_1.default.getCurrent(true);
+                    axios_1.default.defaults.headers.common["VoGroup"] = currentGroup
+                        ? currentGroup.id
+                        : "";
+                    url = "".concat(this.getUrl, "/docs/download/").concat(id);
                     return [2 /*return*/, axios_1.default.get(url)];
                 }
                 catch (error) {

package/dist/modules/VoGroups.d.ts

@@ -0,0 +1,7 @@
+import { GeneralObject } from "../global";
+declare class VoGroups {
+    getCurrent(getFromDomain?: boolean): null | GeneralObject;
+    getGroupNameFromDomain(host: string): string | null;
+}
+declare const _default: VoGroups;
+export default _default;

package/dist/modules/VoGroups.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var VoHelpers_1 = require("./VoHelpers");
+var VoConfig_1 = __importDefault(require("./VoConfig"));
+var VoGroups = /** @class */ (function () {
+    function VoGroups() {
+    }
+    VoGroups.prototype.getCurrent = function (getFromDomain) {
+        if (getFromDomain === void 0) { getFromDomain = false; }
+        var group = VoHelpers_1.localStorage.get(VoConfig_1.default.get.CURRENT_GROUP);
+        if (group) {
+            return JSON.parse(group);
+        }
+        if (getFromDomain) {
+            var groupName = this.getGroupNameFromDomain(window.location.host);
+            if (groupName && groupName !== "") {
+                return { id: groupName };
+            }
+        }
+        return null;
+    };
+    VoGroups.prototype.getGroupNameFromDomain = function (host) {
+        var subdomain = host === null || host === void 0 ? void 0 : host.split(".")[0];
+        var localIndex = subdomain === null || subdomain === void 0 ? void 0 : subdomain.indexOf("local");
+        if (localIndex !== undefined && localIndex > -1) {
+            var hyphenIndex = (subdomain === null || subdomain === void 0 ? void 0 : subdomain.indexOf("-")) || 0;
+            subdomain = subdomain === null || subdomain === void 0 ? void 0 : subdomain.substring(hyphenIndex + 1);
+        }
+        if (subdomain === "admin") {
+            return null;
+        }
+        return subdomain;
+    };
+    return VoGroups;
+}());
+exports.default = new VoGroups();

package/dist/modules/VoHelpers.d.ts

@@ -1,4 +1,5 @@
 import crypto from "crypto-js";
+import { GeneralObject } from "../global";
 export declare const base64Url: (string: crypto.lib.WordArray | String) => string;
 export declare const createRandomString: (num: number) => string;
 export declare const localStorage: {
@@ -17,11 +18,12 @@ export declare const regexPatterns: {
     password: RegExp;
     cleanName: RegExp;
     personalNumber: RegExp;
+    orgnr: RegExp;
 };
 declare type errorObjectType = {
     message: string;
     fields?: {
-        [key: string]: string;
+        [key: string]: any;
     };
 };
 export declare const getError: (error: any) => errorObjectType;
@@ -31,4 +33,37 @@ 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) => 1 | -1 | 0;
+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;
+export declare const getImageDescription: (item: any, field?: string) => any;
+export declare const getContactName: (item?: GeneralObject | undefined) => string;
+export declare const getUserString: (item?: GeneralObject | undefined) => string;
+export declare const parseState: (state: any, initialState: any) => GeneralObject;
+export declare const changeObj: (obj: any, is: any, value: any) => {};
+export declare const reducer: (state: any, action: any) => any;
+export declare const getGroupLogotype: (group: GeneralObject, logo?: string, output?: GeneralObject[]) => any;
+export declare const getObjValue: (obj: any, ...props: string[]) => any;
+/**
+ * Convert an SVG into an image.
+ * @param url
+ * @param width
+ * @param height
+ * @param format
+ * @param quality
+ * @returns Promise
+ *
+ * @note Convert logic inpired by
+ * https://levelup.gitconnected.com/draw-an-svg-to-canvas-and-download-it-as-image-in-javascript-f7f7713cf81f
+ * https://medium.com/@benjamin.black/using-blob-from-svg-text-as-image-source-2a8947af7a8e
+ *
+ * In this method we could actually assign "url" directly to "image.src" and then
+ * extract an image with canvas, but Firefox doesn't support drawing an SVG into
+ * canvas if it misses width/height attributes. Read more here:
+ * https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=700533
+ */
+export declare const convertSvgToImage: (url: string, width?: null | number, height?: null | number, format?: string, quality?: number) => Promise<unknown>;
 export {};