@dexteel/mesf-core 3.11.1 → 3.11.3

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 # CHANGELOG
+## 3.11.1
+- Add Windows Auth
 ## 3.10.5
 - Fix double login issue when disconnected
 ## 3.10.2

package/dist/index.esm.js

@@ -17,7 +17,6 @@ import MenuItem from '@material-ui/core/MenuItem';
 import MenuList from '@material-ui/core/MenuList';
 import Paper from '@material-ui/core/Paper';
 import Grid from '@material-ui/core/Grid';
-import axios from 'axios';
 import PersonPinCircleIcon from '@material-ui/icons/PersonPinCircle';
 import moment from 'moment';
 import { withStyles, alpha, makeStyles, createStyles, useTheme } from '@material-ui/core/styles';
@@ -59,6 +58,7 @@ 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.
@@ -4708,6 +4708,107 @@ var Configuration$1 = /** @class */ (function () {
 }());
 
 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(getTokenFromLS())
+    }
+});
+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();
@@ -4838,37 +4939,12 @@ var MESApiService = /** @class */ (function () {
     };
     MESApiService.prototype.loginWithWindowsAuthentication = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var isError, data;
-            var _this = this;
             return __generator(this, function (_a) {
-                this.prepareCall();
-                isError = { ok: true };
-                data = {};
-                return [2 /*return*/, fetch(this.config.API_AUTH_URL + '/authenticate/windows', {
-                        method: "POST",
-                        mode: "cors",
+                return [2 /*return*/, axiosInstance.post(this.config.API_AUTH_URL + '/authenticate/windows', {}, {
+                        withCredentials: true,
                         headers: {
                             "Content-Type": "application/json"
-                        },
-                        body: JSON.stringify(data)
-                    })["catch"](function (errorMsg) {
-                        throw new FetchError(errorMsg.message, 404, "ERR_CONNECTION_REFUSED");
-                    })
-                        .then(function (response) {
-                        isError = { ok: response.ok, status: response.status, statusText: response.statusText };
-                        return response.json();
-                    })
-                        .then(function (object) {
-                        if (!isError.ok)
-                            throw new FetchError(isError.statusText, isError.status, object);
-                        return object;
-                    })["catch"](function (err) {
-                        _this.hasErrors = true;
-                        _this.error = err;
-                        return {
-                            hasErrors: true,
-                            error: err
-                        };
+                        }
                     })];
             });
         });
@@ -4929,7 +5005,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
@@ -4981,7 +5057,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
@@ -5036,7 +5112,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
@@ -5089,7 +5165,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         if (!isError.ok)
@@ -5158,7 +5234,7 @@ var MESApiService = /** @class */ (function () {
                     })
                         .then(function (response) {
                         if (response.status === 401) {
-                            window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
                         }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         if (!isError.ok)
@@ -5809,23 +5885,25 @@ var LoginWithWindowsAuthentication = function () {
         });
     }); };
     var login = useCallback(function (e) { return __awaiter(void 0, void 0, void 0, function () {
-        var apiService, response;
+        var apiService, response, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     apiService = new MESApiService();
                     e.preventDefault();
-                    return [4 /*yield*/, apiService.loginWithWindowsAuthentication()];
+                    _a.label = 1;
                 case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, apiService.loginWithWindowsAuthentication()];
+                case 2:
                     response = _a.sent();
-                    if (apiService.hasErrors) {
-                        setShowError(true);
-                        setError(apiService.error);
-                    }
-                    else {
-                        saveUserData(response);
-                    }
-                    return [2 /*return*/];
+                    saveUserData(response.data);
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_1 = _a.sent();
+                    setError(e_1);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     }); }, [setShowError,
@@ -5833,7 +5911,6 @@ var LoginWithWindowsAuthentication = function () {
         saveUserData]);
     useEffect(function () {
         checkIfEnabled().then(function () {
-            console.log('done');
         });
     }, []);
     if (windowsAuthIsEnabled)
@@ -5845,8 +5922,7 @@ var LoginWithWindowsAuthentication = function () {
                 React__default.createElement("strong", null, "Bad credentials"),
                 React__default.createElement("p", null,
                     " ",
-                    error === undefined ? 'There was an error' :
-                        (error.internalError.message === undefined ? error.internalError : error.internalError.message))),
+                    error)),
             React__default.createElement("div", { className: "row" },
                 React__default.createElement("button", { className: "btn btn-primary mes-button-primary mx-auto col-md-12 mt-3 ", role: "button", onClick: login }, "Windows Auth"))));
     return null;
@@ -6173,7 +6249,7 @@ var Navigation = function (_a) {
 var css = "body {\n  margin: 0;\n  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',\n    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',\n    sans-serif;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n  background-color: #fafbfc !important;\n}\n.container-fluid-main{\n  padding-right: 0px !important; \n  padding-left: 0px !important;\n}\n\ncode {\n  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',\n    monospace;\n}\n\n.mes-primary-color {\n  background-color: #479dc4 !important;\n}\n.mes-button-primary{\n  background-color: #479dc4 !important;\n  border-color: #479dc4 !important;\n}\n\n.mes-selectable-datagrid .MuiDataGrid-row{\n  cursor: pointer;\n}\n\n.mes-menu-top .navbar-brand{\n  color: #FFFF !important;\n}\n.mes-menu-top .nav-link {\n  color: #FFFF !important;\n}\n.mes-menu-top .navbar-toggler {\n  color: #FFFF !important;\n}\n.mes-menu-top .navbar-text {\n  color: #FFFF !important;\n}\n.mes-footer-login{\n  position: absolute;\n  bottom: 0;\n  width: 100%;\n  height: 10em;\n  line-height: 60px;\n  text-align:center;\n}\n.mes-filter-datepicker{\n  padding: unset !important;\n  border-top-left-radius: 0 !important;\n  border-bottom-left-radius: 0 !important;\n  padding-top: 0.375rem !important;\n  padding-bottom: 0.375rem !important;\n  padding-left: 0.75rem !important;\n  cursor: pointer !important;\n  max-width: 120px;\n}\n.mes-filter-datetimepicker{\n  max-width: 97px;\n}\n.mes-not-rounded{\n  border-radius: unset !important;\n}\n\n.mes-numeric{\n  text-align: right;\n}\n.mes-drag-over{\n  border: 3px dotted #666;\n  background-color: #479dc4 !important;\n}\n.mes-drag-start{\n  border: 3px solid #666;\n}\n\n.mes-selectable{\n  cursor: pointer !important;\n}\n\n.mes-custom-select{\n  width: auto !important;\n  padding: 0.375rem 0 0.375rem 0 !important;\n  background: unset !important;\n  font-family: inherit !important;\n}\n.mes-custom-select .MuiSelect-select{\n  padding-left: 14px;\n}\n\n.mes-custom-select::before{\n  border-bottom: unset !important;\n}\n.mes-custom-select::after{\n  border-bottom: unset !important;\n}\n.mes-no-border{\n  border: unset;\n}\n.mes-no-border:focus-visible {\n  outline: unset;\n}\n.mes-div-submenu{\n  border-right: 1px solid #cfdbe2; \n}\n.mes-submenu a{\n  width: 100% !important;\n  /* color: rgba(0, 0, 0, 0.87); */\n  color: #479dc4\n}\n.mes-submenu .Mui-selected{\n  border-right: 3px solid #479dc4; \n}\n.mes-menu-group{\n    font-size: 20px;\n    line-height: 1.1;\n    color: #929292;  \n    font-weight: normal;    \n}\n\n/********************MUI DATAGRID*****************************/\n.Mui-selected{\n  font-weight: bolder !important;\n  opacity: 1 !important;\n}\n\n.mes-upload-control{\n\n}\n.mes-upload-control .file-box{\n  /* border : 1px solid black; */\n  height : 100px;\n  position: relative;  \n}\n.mes-upload-control .file-detail{\n  position: absolute;\n  left: 0px;\n  top: 0px; \n  z-index: 1;\n  height: 100%;\n  width: 100%;\n}\n\n.mes-upload-control input[type=file]{\n  left: 0px;\n  top: 0px;\n  opacity: 0;\n  z-index: 10000;\n  height: 100%;\n  cursor: pointer;\n}\n.mes-upload-control table{\n  width: 100%;\n}\n.mes-upload-control td{\n  font-size: 0.8rem !important;\n  max-width:0;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;\n}\n\n\n.input-group-text{\n  background-color: #ced2cc !important;\n  /* border: 1px solid #ced4da !important; */\n  /* color: #000000 !important; */\n}\n\n\n\n\n.content-wrapper {\n  padding: 15px;\n  width: 100%;\n  border-top: 1px solid rgba(0, 0, 0, 0.15);\n  margin-top: -1px;\n}\n.content-wrapper > .unwrap {\n  margin: -15px;\n}\n@media only screen and (min-width: 768px) {\n  .content-wrapper > .unwrap {\n    margin: -20px;\n  }\n}\n.content-wrapper > h3,\n.content-wrapper > .content-heading {\n  font-size: 24px;\n  line-height: 1.1;\n  color: #929292;\n  margin: -15px;\n  margin-bottom: 20px;\n  padding: 15px;\n  font-weight: normal;\n  background-color: #fafbfc;\n  border-bottom: 1px solid #cfdbe2;\n}\n.content-wrapper > h3 > small,\n.content-wrapper > .content-heading > small {\n  display: block;\n  font-size: 12px;\n  color: #909fa7;\n}\n.content-wrapper > button,\n.content-wrapper > .btn {\n  margin: 10px 10px 0 0;\n}\n.content-wrapper .container,\n.content-wrapper .container-fluid {\n  padding-left: 0;\n  padding-right: 0;\n}\n@media only screen and (min-width: 768px) {\n  .content-wrapper {\n    padding: 20px;\n  }\n  .content-wrapper > h3,\n  .content-wrapper > .content-heading {\n    margin: -20px;\n    margin-bottom: 5px;\n    padding: 15px;\n  }\n  .content-wrapper > button,\n  .content-wrapper > .btn {\n    margin: 0;\n  }\n}\n\n  @media print {\n    .sidebar,\n    .topnavbar,\n    .offsidebar,\n    .btn {\n      display: none !important;\n      width: 0 !important;\n      height: 0 !important;\n    }\n    .wrapper,\n    .wrapper > section,\n    .content-wrapper {\n      margin: 0 !important;\n      /* remove margin used for sidebar and expand the content */\n      padding: 0 !important;\n      width: 100% !important;\n    }\n    .content-wrapper {\n      overflow: hidden !important;\n    }\n  }\n  ";
 n(css,{});
 
-var base$1 = document.getElementsByTagName('base')[0].getAttribute('href') || '/';
+var base = document.getElementsByTagName('base')[0].getAttribute('href') || '/';
 function MESFMain(_a) {
     var authentication = _a.authentication, routes = _a.routes, navbar = _a.navbar, configurations = _a.configurations, _b = _a.showAreaSelector, showAreaSelector = _b === void 0 ? false : _b;
     return (React__default.createElement(AuthProvider, { authConfig: authentication },
@@ -6183,113 +6259,12 @@ function MESFMain(_a) {
                     React__default.createElement(RouterContext.Provider, { value: routes },
                         React__default.createElement(NavbarContext.Provider, { value: navbar },
                             React__default.createElement(ConfigurationContext.Provider, { value: configurations },
-                                React__default.createElement(BrowserRouter, { basename: base$1 },
+                                React__default.createElement(BrowserRouter, { basename: base },
                                     React__default.createElement(Routes, null,
                                         React__default.createElement(Route, { path: "/logout", element: React__default.createElement(Logout, null) })),
                                     React__default.createElement(Navigation, { showAreaSelector: showAreaSelector }))))))))));
 }
 
-var base = 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(getTokenFromLS())
-    }
-});
-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, "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, "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 useDefaultAreaId = function () {
     var _a = useUserContext(), userId = _a.state.userId, setDefaultAreaId = _a.actions.setDefaultAreaId;
     return function () {

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<any>;
+    loginWithWindowsAuthentication(): Promise<import("axios").AxiosResponse<any, any>>;
     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.1",
+  "version": "3.11.3",
   "author": "Dexteel Team",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",