@dexteel/mesf-core 3.11.6 → 3.11.8

package/dist/index.esm.js

@@ -18,22 +18,33 @@ import MenuList from '@material-ui/core/MenuList';
 import Paper from '@material-ui/core/Paper';
 import Grid from '@material-ui/core/Grid';
 import PersonPinCircleIcon from '@material-ui/icons/PersonPinCircle';
-import moment from 'moment';
+import axios from 'axios';
+import PropTypes from 'prop-types';
+import { ResponsiveBar } from '@nivo/bar';
+import Select from '@material-ui/core/Select';
 import { withStyles, alpha, makeStyles, createStyles, useTheme } from '@material-ui/core/styles';
+import Collapse from '@material-ui/core/Collapse';
+import SvgIcon from '@material-ui/core/SvgIcon';
+import Code from '@material-ui/icons/Code';
+import Folder from '@material-ui/icons/Folder';
+import TreeItem from '@material-ui/lab/TreeItem';
+import TreeView from '@material-ui/lab/TreeView';
+import { useSpring, animated } from 'react-spring';
+import { DataGrid, GridOverlay } from '@material-ui/data-grid';
+import Card from '@material-ui/core/Card';
+import CardActions from '@material-ui/core/CardActions';
+import CardContent from '@material-ui/core/CardContent';
+import Typography$1 from '@material-ui/core/Typography';
+import moment from 'moment';
 import { get, useForm, Controller } from 'react-hook-form';
 import DialogContentText from '@material-ui/core/DialogContentText';
-import Typography$1 from '@material-ui/core/Typography';
-import { DataGrid, GridOverlay } from '@material-ui/data-grid';
 import Snackbar from '@material-ui/core/Snackbar';
 import CircularProgress from '@material-ui/core/CircularProgress';
 import MuiAlert from '@material-ui/lab/Alert';
-import Card from '@material-ui/core/Card';
-import CardContent from '@material-ui/core/CardContent';
 import TextField$1 from '@material-ui/core/TextField';
 import { Alert as Alert$2, AlertTitle } from '@material-ui/lab';
 import { MuiPickersUtilsProvider, KeyboardDatePicker, KeyboardTimePicker } from '@material-ui/pickers';
 import MomentUtils from '@date-io/moment';
-import Select from '@material-ui/core/Select';
 import InputLabel from '@material-ui/core/InputLabel';
 import FormControl from '@material-ui/core/FormControl';
 import FormGroup from '@material-ui/core/FormGroup';
@@ -48,17 +59,6 @@ import Chip from '@material-ui/core/Chip';
 import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
 import IconButton from '@material-ui/core/IconButton';
 import CloseIcon from '@material-ui/icons/Close';
-import PropTypes from 'prop-types';
-import { ResponsiveBar } from '@nivo/bar';
-import Collapse from '@material-ui/core/Collapse';
-import SvgIcon from '@material-ui/core/SvgIcon';
-import Code from '@material-ui/icons/Code';
-import Folder from '@material-ui/icons/Folder';
-import TreeItem from '@material-ui/lab/TreeItem';
-import TreeView from '@material-ui/lab/TreeView';
-import { useSpring, animated } from 'react-spring';
-import CardActions from '@material-ui/core/CardActions';
-import axios from 'axios';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -4707,109 +4707,7 @@ var Configuration$1 = /** @class */ (function () {
     return Configuration;
 }());
 
-var _a;
 var base$2 = document.getElementsByTagName('base')[0].getAttribute('href') || '/';
-function renewToken() {
-    return __awaiter(this, void 0, void 0, function () {
-        var refreshToken, config, fd, response, token;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    refreshToken = localStorage.getItem("refreshToken");
-                    if (!refreshToken) {
-                        throw new Error('refresh token does not exist');
-                    }
-                    config = new Configuration$1();
-                    fd = new FormData();
-                    fd.append('refreshToken', refreshToken);
-                    return [4 /*yield*/, axios.post("".concat(config.API_AUTH_URL, "/refresh"), fd, {
-                            headers: {
-                                "Content-Type": 'application/json'
-                            },
-                            params: {
-                                refreshToken: refreshToken
-                            }
-                        })];
-                case 1:
-                    response = _a.sent();
-                    token = response.data.result;
-                    if (token) {
-                        return [2 /*return*/, [token, refreshToken]];
-                    }
-                    else {
-                        throw new Error("Token is not valid");
-                    }
-            }
-        });
-    });
-}
-function isUnauthorizedError(error) {
-    var _a = error.response, status = _a.status; _a.statusText;
-    return status === 401;
-}
-var axiosInstance = axios.create({
-    headers: {
-        Authorization: "Bearer ".concat((_a = localStorage.getItem('token')) !== null && _a !== void 0 ? _a : '')
-    }
-});
-var refreshingFunc;
-axiosInstance.interceptors.response.use(function (res) { return res; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
-    var originalConfig, token, _a, newToken, newRefreshToken, innerError_1;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                originalConfig = error.config;
-                if (originalConfig.headers.MESF_Retries === 1) {
-                    localStorage.removeItem("token");
-                    localStorage.removeItem("refreshToken");
-                    window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
-                }
-                token = getTokenFromLS();
-                if (!token || !isUnauthorizedError(error)) {
-                    return [2 /*return*/, Promise.reject(error)];
-                }
-                _b.label = 1;
-            case 1:
-                _b.trys.push([1, 7, 8, 9]);
-                // the trick here, that `refreshingFunc` is global, e.g. 2 expired requests will get the same function pointer and await same function.
-                if (!refreshingFunc)
-                    refreshingFunc = renewToken();
-                return [4 /*yield*/, refreshingFunc];
-            case 2:
-                _a = _b.sent(), newToken = _a[0], newRefreshToken = _a[1];
-                localStorage.setItem("token", newToken);
-                localStorage.setItem("refreshToken", newRefreshToken);
-                axiosInstance.defaults.headers.Authorization = "Bearer ".concat(newToken);
-                originalConfig.headers.Authorization = "Bearer ".concat(newToken);
-                originalConfig.headers.MESF_Retries = 1;
-                _b.label = 3;
-            case 3:
-                _b.trys.push([3, 5, , 6]);
-                return [4 /*yield*/, axios.request(originalConfig)];
-            case 4: return [2 /*return*/, _b.sent()];
-            case 5:
-                innerError_1 = _b.sent();
-                // if original req failed with 401 again - it means server returned not valid token for refresh request
-                if (isUnauthorizedError(innerError_1)) {
-                    return [2 /*return*/, innerError_1];
-                }
-                return [2 /*return*/, innerError_1];
-            case 6: return [3 /*break*/, 9];
-            case 7:
-                _b.sent();
-                localStorage.removeItem("token");
-                localStorage.removeItem("refreshToken");
-                window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
-                return [3 /*break*/, 9];
-            case 8:
-                refreshingFunc = undefined;
-                return [7 /*endfinally*/];
-            case 9: return [2 /*return*/];
-        }
-    });
-}); }, {});
-
-var base$1 = document.getElementsByTagName('base')[0].getAttribute('href') || '/';
 var MESApiService = /** @class */ (function () {
     function MESApiService() {
         this.config = new Configuration$1();
@@ -4941,11 +4839,14 @@ var MESApiService = /** @class */ (function () {
     MESApiService.prototype.loginWithWindowsAuthentication = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, axiosInstance.post(this.config.API_AUTH_URL + '/authenticate/windows', {}, {
-                        withCredentials: true,
+                return [2 /*return*/, fetch(this.config.API_AUTH_URL + '/authenticate/windows', {
+                        method: "POST",
+                        mode: "cors",
+                        credentials: 'include',
                         headers: {
                             "Content-Type": "application/json"
-                        }
+                        },
+                        body: JSON.stringify({})
                     })];
             });
         });
@@ -5006,7 +4907,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
@@ -5058,7 +4959,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
@@ -5113,7 +5014,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
@@ -5166,7 +5067,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         if (!isError.ok)
@@ -5235,7 +5136,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         if (!isError.ok)
@@ -5489,6 +5390,108 @@ var UserProvider = function (_a) {
     return (React__default.createElement(UserContext.Provider, { value: { state: state, actions: actions } }, children));
 };
 
+var _a;
+var base$1 = document.getElementsByTagName('base')[0].getAttribute('href') || '/';
+function renewToken() {
+    return __awaiter(this, void 0, void 0, function () {
+        var refreshToken, config, fd, response, token;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    refreshToken = localStorage.getItem("refreshToken");
+                    if (!refreshToken) {
+                        throw new Error('refresh token does not exist');
+                    }
+                    config = new Configuration$1();
+                    fd = new FormData();
+                    fd.append('refreshToken', refreshToken);
+                    return [4 /*yield*/, axios.post("".concat(config.API_AUTH_URL, "/refresh"), fd, {
+                            headers: {
+                                "Content-Type": 'application/json'
+                            },
+                            params: {
+                                refreshToken: refreshToken
+                            }
+                        })];
+                case 1:
+                    response = _a.sent();
+                    token = response.data.result;
+                    if (token) {
+                        return [2 /*return*/, [token, refreshToken]];
+                    }
+                    else {
+                        throw new Error("Token is not valid");
+                    }
+            }
+        });
+    });
+}
+function isUnauthorizedError(error) {
+    var _a = error.response, status = _a.status; _a.statusText;
+    return status === 401;
+}
+var axiosInstance = axios.create({
+    headers: {
+        Authorization: "Bearer ".concat((_a = localStorage.getItem('token')) !== null && _a !== void 0 ? _a : '')
+    }
+});
+var refreshingFunc;
+axiosInstance.interceptors.response.use(function (res) { return res; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
+    var originalConfig, token, _a, newToken, newRefreshToken, innerError_1;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                originalConfig = error.config;
+                if (originalConfig.headers.MESF_Retries === 1) {
+                    localStorage.removeItem("token");
+                    localStorage.removeItem("refreshToken");
+                    window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                }
+                token = getTokenFromLS();
+                if (!token || !isUnauthorizedError(error)) {
+                    return [2 /*return*/, Promise.reject(error)];
+                }
+                _b.label = 1;
+            case 1:
+                _b.trys.push([1, 7, 8, 9]);
+                // the trick here, that `refreshingFunc` is global, e.g. 2 expired requests will get the same function pointer and await same function.
+                if (!refreshingFunc)
+                    refreshingFunc = renewToken();
+                return [4 /*yield*/, refreshingFunc];
+            case 2:
+                _a = _b.sent(), newToken = _a[0], newRefreshToken = _a[1];
+                localStorage.setItem("token", newToken);
+                localStorage.setItem("refreshToken", newRefreshToken);
+                axiosInstance.defaults.headers.Authorization = "Bearer ".concat(newToken);
+                originalConfig.headers.Authorization = "Bearer ".concat(newToken);
+                originalConfig.headers.MESF_Retries = 1;
+                _b.label = 3;
+            case 3:
+                _b.trys.push([3, 5, , 6]);
+                return [4 /*yield*/, axios.request(originalConfig)];
+            case 4: return [2 /*return*/, _b.sent()];
+            case 5:
+                innerError_1 = _b.sent();
+                // if original req failed with 401 again - it means server returned not valid token for refresh request
+                if (isUnauthorizedError(innerError_1)) {
+                    return [2 /*return*/, innerError_1];
+                }
+                return [2 /*return*/, innerError_1];
+            case 6: return [3 /*break*/, 9];
+            case 7:
+                _b.sent();
+                localStorage.removeItem("token");
+                localStorage.removeItem("refreshToken");
+                window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                return [3 /*break*/, 9];
+            case 8:
+                refreshingFunc = undefined;
+                return [7 /*endfinally*/];
+            case 9: return [2 /*return*/];
+        }
+    });
+}); }, {});
+
 var getTokenFromLS = function () {
     return localStorage.getItem('token');
 };
@@ -5500,6 +5503,7 @@ function useToken() {
         localStorage.setItem('refreshToken', userToken['refreshToken']);
         localStorage.setItem('token', userToken['token']);
         setToken(userToken['token']);
+        axiosInstance.defaults.headers.Authorization = "Bearer ".concat(userToken['token']);
         setUserLogged(true);
     };
     var clearUserData = function () {
@@ -5886,7 +5890,7 @@ var LoginWithWindowsAuthentication = function () {
         });
     }); };
     var login = useCallback(function (e) { return __awaiter(void 0, void 0, void 0, function () {
-        var apiService, response, e_1;
+        var apiService, response, data, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -5894,17 +5898,21 @@ var LoginWithWindowsAuthentication = function () {
                     e.preventDefault();
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
+                    _a.trys.push([1, 4, , 5]);
                     return [4 /*yield*/, apiService.loginWithWindowsAuthentication()];
                 case 2:
                     response = _a.sent();
-                    saveUserData(response.data);
-                    return [3 /*break*/, 4];
+                    return [4 /*yield*/, response.json()];
                 case 3:
+                    data = _a.sent();
+                    saveUserData(data);
+                    return [3 /*break*/, 5];
+                case 4:
                     e_1 = _a.sent();
+                    setShowError(true);
                     setError(e_1.toString());
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
         });
     }); }, [setShowError,
@@ -5957,7 +5965,7 @@ function Login(_a) {
                 React__default.createElement(Navbar.Brand, { href: "/" }, "MESF"))),
         React__default.createElement("div", { className: "container-fluid" },
             React__default.createElement("div", { className: "row" },
-                React__default.createElement("div", { className: "col-md-3 mx-auto my-5" },
+                React__default.createElement("div", { className: "col-12 col-md-6 mx-auto my-5" },
                     React__default.createElement("div", { className: "card" },
                         React__default.createElement("div", { className: "card-header text-center" }, "Login"),
                         React__default.createElement("div", { className: "card-body m-3" },

package/dist/services/ApiService.d.ts

@@ -28,7 +28,7 @@ export declare class MESApiService {
     changePassword(userId: string, password: string): Promise<any>;
     authenticate(userName: string, password: string): Promise<any>;
     loginWithAzureAD(accessToken: string): Promise<any>;
-    loginWithWindowsAuthentication(): Promise<import("axios").AxiosResponse<any, any>>;
+    loginWithWindowsAuthentication(): Promise<Response>;
     uploadFiles(selectedFiles: File[], folderName?: string): Promise<any>;
     call(procedure: string, parameters: any[], database?: string): Promise<any>;
     callJSON(procedure: string, parameters: any[], database?: string): Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexteel/mesf-core",
-  "version": "3.11.6",
+  "version": "3.11.8",
   "author": "Dexteel Team",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",