@vocollege/app 0.0.98 → 0.0.100

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

@@ -438,7 +438,7 @@
     "form": {
         "errors": {
             "required": "Obligatoriskt",
-            "invalidName": "Ogiltigt namn. Det får endast innehålla småbokstäver (minst 3), följd av en eller flera siffror, t ex: 'ann', 'olle.persson', 'ann1980', 'peter_ericsson'",
+            "invalidName": "Ogiltigt namn. Det får endast innehålla småbokstäver (minst 3), följd av en eller flera siffror, t ex: 'ann', 'olle.persson', 'ann1980', 'peter_ericsson', 'david-larsson'",
             "invalidEmail": "Ogiltig e-postadress",
             "invalidFirstname": "Ogiltigt förnamn",
             "invalidLastname": "Ogiltigt efternamn",

package/dist/modules/VoApi/GraphClient.js

@@ -53,12 +53,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var client_1 = require("@apollo/client");
 var error_1 = require("@apollo/client/link/error");
 var apollo_upload_client_1 = require("apollo-upload-client");
-// import { getMainDefinition } from "@apollo/client/utilities";
-// import { WebSocketLink } from "@apollo/client/link/ws";
 var VoAuth_1 = __importDefault(require("../VoAuth"));
 var VoRouter_1 = __importDefault(require("../VoRouter"));
-// import ws from "ws";
 var VoGroups_1 = __importDefault(require("../VoGroups"));
+var VoConfig_1 = __importDefault(require("../VoConfig"));
+var VoHelpers_1 = require("../VoHelpers");
 function redirect() {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -178,13 +177,14 @@ var GraphClient = /** @class */ (function () {
                 var currentGroup = VoGroups_1.default.getCurrent(true);
                 groupId = currentGroup ? currentGroup.id : "";
             }
-            operation.setContext(function () { return (__assign(__assign({}, currentHeaders), { headers: {
-                    Authorization: token
+            var masquerade = VoHelpers_1.localStorage.get(VoConfig_1.default.get.MASQUERADE_USER);
+            if (masquerade) {
+                masquerade = JSON.parse(masquerade);
+            }
+            operation.setContext(function () { return (__assign(__assign({}, currentHeaders), { headers: __assign({ Authorization: token
                         ? // ? `${token.token_type} ${token.access_token}`
                             "Bearer ".concat(token.access_token)
-                        : "",
-                    VoGroup: groupId,
-                } })); });
+                        : "", VoGroup: groupId }, (masquerade && { VoMasquerade: masquerade === null || masquerade === void 0 ? void 0 : masquerade.id })) })); });
             return forward(operation);
         });
         var omitTypenameLink = new client_1.ApolloLink(function (operation, forward) {

package/dist/modules/VoHelpers.js

@@ -118,7 +118,7 @@ var encodeQueryData = function (data) {
 exports.encodeQueryData = encodeQueryData;
 exports.regexPatterns = {
     // username: /(^[a-z]{3,})([0-9]?)+$/,
-    username: /(^[a-z]{3,})([\.]|[\_]|[a-z]|[0-9]?)+$/,
+    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,}$/,

package/package.json

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

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

@@ -438,7 +438,7 @@
   "form": {
     "errors": {
       "required": "Obligatoriskt",
-      "invalidName": "Ogiltigt namn. Det får endast innehålla småbokstäver (minst 3), följd av en eller flera siffror, t ex: 'ann', 'olle.persson', 'ann1980', 'peter_ericsson'",
+      "invalidName": "Ogiltigt namn. Det får endast innehålla småbokstäver (minst 3), följd av en eller flera siffror, t ex: 'ann', 'olle.persson', 'ann1980', 'peter_ericsson', 'david-larsson'",
       "invalidEmail": "Ogiltig e-postadress",
       "invalidFirstname": "Ogiltigt förnamn",
       "invalidLastname": "Ogiltigt efternamn",

package/src/modules/VoApi/GraphClient.ts

@@ -9,13 +9,11 @@ import {
 } from "@apollo/client";
 import { onError } from "@apollo/client/link/error";
 import { createUploadLink } from "apollo-upload-client";
-// import { getMainDefinition } from "@apollo/client/utilities";
-// import { WebSocketLink } from "@apollo/client/link/ws";
 import VoAuth from "../VoAuth";
 import VoRouter from "../VoRouter";
-// import ws from "ws";
 import VoGroups from "../VoGroups";
-// import VoApp from "../VoApp";
+import VoConfig from "../VoConfig";
+import { localStorage } from "../VoHelpers";
 import { GeneralObject } from "../../global";
 
 async function redirect() {
@@ -138,6 +136,13 @@ class GraphClient {
         const currentGroup = VoGroups.getCurrent(true);
         groupId = currentGroup ? currentGroup.id : "";
       }
+
+      let masquerade: any = localStorage.get(VoConfig.get.MASQUERADE_USER);
+
+      if (masquerade) {
+        masquerade = JSON.parse(masquerade);
+      }
+
       operation.setContext(() => ({
         ...currentHeaders,
         headers: {
@@ -146,6 +151,7 @@ class GraphClient {
               `Bearer ${token.access_token}`
             : "",
           VoGroup: groupId,
+          ...(masquerade && { VoMasquerade: masquerade?.id }),
         },
       }));
       return forward(operation);

package/src/modules/VoHelpers.ts

@@ -60,7 +60,7 @@ export const encodeQueryData = (data: encodeQueryDataType) => {
 
 export const regexPatterns = {
   // username: /(^[a-z]{3,})([0-9]?)+$/,
-  username: /(^[a-z]{3,})([\.]|[\_]|[a-z]|[0-9]?)+$/,
+  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,}$/, // At least 8 characters, 1 uppercase, 1 lowercase and 1 digit.