@michalrakus/x-react-web-lib 0.25.0 → 1.0.0

package/lib/components/XUtils.js

@@ -90,7 +90,7 @@ var XUtils = /** @class */ (function () {
     function XUtils() {
     }
     XUtils.demo = function () {
-        return XUtils.getXServerUrl().indexOf('x-demo-server') !== -1;
+        return XUtils.getXBackendUrl().indexOf('x-demo-server') !== -1;
     };
     XUtils.isMobile = function () {
         // extra small displays (podla https://www.w3schools.com/howto/howto_css_media_query_breakpoints.asp)
@@ -306,7 +306,8 @@ var XUtils = /** @class */ (function () {
             });
         });
     };
-    XUtils.fetchBasic = function (path, headers, body, usePublicToken) {
+    // nepouzivana stara Basic autentifikacia
+    XUtils.fetchBasicAuthBasic = function (path, headers, body, usePublicToken) {
         return __awaiter(this, void 0, void 0, function () {
             var xToken, response, responseBody;
             return __generator(this, function (_a) {
@@ -325,7 +326,43 @@ var XUtils = /** @class */ (function () {
                             }
                         }
                         headers = __assign(__assign({}, headers), { 'Authorization': "Basic " + Buffer.from(xToken.username + ':' + xToken.password).toString('base64') });
-                        return [4 /*yield*/, fetch(XUtils.getXServerUrl() + path, {
+                        return [4 /*yield*/, fetch(XUtils.getXBackendUrl() + path, {
+                                method: 'POST',
+                                headers: headers,
+                                body: body
+                            })];
+                    case 1:
+                        response = _a.sent();
+                        if (!!response.ok) return [3 /*break*/, 3];
+                        return [4 /*yield*/, response.json()];
+                    case 2:
+                        responseBody = _a.sent();
+                        throw new XResponseError_1.XResponseError(path, response.status, response.statusText, responseBody);
+                    case 3: return [2 /*return*/, response];
+                }
+            });
+        });
+    };
+    XUtils.fetchBasic = function (path, headers, body, usePublicToken) {
+        return __awaiter(this, void 0, void 0, function () {
+            var xToken, response, responseBody;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (typeof usePublicToken === 'object') {
+                            xToken = usePublicToken;
+                        }
+                        else if (usePublicToken) {
+                            xToken = XUtils.xTokenPublic; // public token vzdy
+                        }
+                        else {
+                            xToken = XUtils.getXToken();
+                            if (xToken === null) {
+                                xToken = XUtils.xTokenPublic; // ak nikto nie je prihlaseny, posleme public token
+                            }
+                        }
+                        headers = __assign(__assign({}, headers), { 'Authorization': "Bearer " + xToken.accessToken });
+                        return [4 /*yield*/, fetch(XUtils.getXBackendUrl() + path, {
                                 method: 'POST',
                                 headers: headers,
                                 body: body
@@ -352,17 +389,28 @@ var XUtils = /** @class */ (function () {
         return XUtils.xToken;
     };
     XUtils.getUsername = function () {
-        var _a;
-        return (_a = XUtils.getXToken()) === null || _a === void 0 ? void 0 : _a.username;
+        var _a, _b;
+        return (_b = (_a = XUtils.getXToken()) === null || _a === void 0 ? void 0 : _a.xUser) === null || _b === void 0 ? void 0 : _b.username;
     };
-    XUtils.getXServerUrl = function () {
-        if (XUtils.xServerUrl === null) {
-            throw "XUtils.xServerUrl is null";
+    XUtils.getXBackendUrl = function () {
+        if (XUtils.xBackendUrl === undefined) {
+            throw "XUtils.xBackendUrl is undefined";
         }
-        return XUtils.xServerUrl;
-    };
-    XUtils.setXServerUrl = function (xServerUrl) {
-        XUtils.xServerUrl = xServerUrl;
+        return XUtils.xBackendUrl;
+    };
+    XUtils.setXBackendUrl = function (xBackendUrl) {
+        XUtils.xBackendUrl = xBackendUrl;
+    };
+    /**
+     * returns value of environment variable from configuration file .env
+     * @param envVar
+     */
+    XUtils.getEnvVarValue = function (envVarEnum) {
+        var value = process.env[envVarEnum];
+        if (value === undefined) {
+            throw "Environment variable " + envVarEnum + " - value not found. Check configuration file .env*";
+        }
+        return value;
     };
     // funkcionalita ktoru by bolo dobre dat do servisov
     XUtils.removeRow = function (entity, row) {
@@ -434,7 +482,7 @@ var XUtils = /** @class */ (function () {
         return value;
     };
     XUtils.dropdownEmptyOptionValue = " ";
-    XUtils.xServerUrl = null;
+    XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela
     XUtils.xToken = null;
     // token pouzivany pre public stranky (napr. XLoginForm), meno/heslo natvrdo (lepsie ako nic)

package/lib/serverApi/XUser.d.ts

@@ -3,4 +3,5 @@ export interface XUser {
     username: string;
     password: string;
     name: string;
+    enabled: boolean;
 }

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "0.25.0",
+  "version": "1.0.0",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",
     "compile": "tsc",
     "generateApi": "gulp generateApi",
-    "build": "npm run clean && npm run compile && npm run generateApi",
-    "linkDemo": "npm link && npm link ../DemoReactWebApp/node_modules/react",
-    "linkDemoRouter": "npm link && npm link ../demo-router-web-app/node_modules/react",
-    "linkKvm": "npm link && npm link ../kvm-web-app/node_modules/react",
-    "linkKvmNext": "npm link && npm link ../kvm-next-web-app/node_modules/react",
+    "build": "pnpm run clean && pnpm run compile && pnpm run generateApi",
+    "linkDemo": "pnpm link && pnpm link ../DemoReactWebApp/node_modules/react",
+    "linkDemoRouter": "pnpm link && pnpm link ../demo-router-web-app/node_modules/react",
+    "linkKvm": "pnpm link && pnpm link ../kvm-web-app/node_modules/react",
+    "linkKvmNext": "pnpm link && pnpm link ../kvm-next-web-app/node_modules/react",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "pnpm run build",
+    "buildAndPack": "pnpm run build && pnpm pack",
+    "bp": "pnpm run buildAndPack",
+    "preinstall": "npx only-allow pnpm"
   },
   "author": "Michal Rakus",
   "license": "ISC",
@@ -30,9 +33,9 @@
     "@types/react-transition-group": "^4.2.4",
     "axios": "^0.19.0",
     "classnames": "^2.2.6",
-    "primeflex": "3.0.1",
-    "primeicons": "^4.1.0",
-    "primereact": "latest",
+    "primeflex": "^3.3.0",
+    "primeicons": "^6.0.1",
+    "primereact": "6.0.2",
     "lodash": "^4.17.21",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
@@ -40,7 +43,7 @@
     "react-transition-group": "^4.4.1",
     "gulp": "^4.0.2",
     "rimraf": "^3.0.2",
-    "typescript": "^4.2.4",
+    "typescript": "^3.2.1",
     "dateformat": "^4.4.1"
   },
   "files": [