@dexteel/mesf-core 3.11.0-alpha → 3.11.2

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/account/login-strategies/LoginWithWindowsAuthentication.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const LoginWithWindowsAuthentication: () => React.JSX.Element;
+export declare const LoginWithWindowsAuthentication: () => React.JSX.Element | null;

package/dist/index.esm.js

@@ -4847,6 +4847,7 @@ var MESApiService = /** @class */ (function () {
                 return [2 /*return*/, fetch(this.config.API_AUTH_URL + '/authenticate/windows', {
                         method: "POST",
                         mode: "cors",
+                        credentials: 'include',
                         headers: {
                             "Content-Type": "application/json"
                         },
@@ -5185,6 +5186,25 @@ var MESApiService = /** @class */ (function () {
             });
         });
     };
+    MESApiService.prototype.checkIfWindowsAuthIsEnabled = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var resp;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, fetch("".concat(this.config.API_AUTH_URL, "/is-windows-auth-enabled")).then(function (res) { return res.json(); })];
+                    case 1:
+                        resp = _a.sent();
+                        return [2 /*return*/, resp];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, false];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return MESApiService;
 }());
 
@@ -5408,6 +5428,8 @@ function useToken() {
     };
     var clearUserData = function () {
         localStorage.removeItem('userMESData');
+        localStorage.removeItem('token');
+        localStorage.removeItem('refreshToken');
         setToken('');
         setUserLogged(false);
     };
@@ -5766,12 +5788,33 @@ var LoginWithWindowsAuthentication = function () {
     var _a = React__default.useState(false), showError = _a[0], setShowError = _a[1];
     var _b = React__default.useState(undefined), error = _b[0], setError = _b[1];
     var saveUserData = React__default.useContext(AuthContext).saveUserData;
-    var apiService = new MESApiService();
-    var loginAsGuest = function (e) { return __awaiter(void 0, void 0, void 0, function () {
-        var response;
+    var _c = useState(false), windowsAuthIsEnabled = _c[0], setWindowsAuthIsEnabled = _c[1];
+    var checkIfEnabled = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var apiService, response;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    apiService = new MESApiService();
+                    return [4 /*yield*/, apiService.checkIfWindowsAuthIsEnabled()];
+                case 1:
+                    response = _a.sent();
+                    if (apiService.hasErrors) {
+                        setShowError(true);
+                        setError(apiService.error);
+                    }
+                    else {
+                        setWindowsAuthIsEnabled(response !== null && response !== void 0 ? response : false);
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    var login = useCallback(function (e) { return __awaiter(void 0, void 0, void 0, function () {
+        var apiService, response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    apiService = new MESApiService();
                     e.preventDefault();
                     return [4 /*yield*/, apiService.loginWithWindowsAuthentication()];
                 case 1:
@@ -5786,19 +5829,28 @@ var LoginWithWindowsAuthentication = function () {
                     return [2 /*return*/];
             }
         });
-    }); };
-    return (React__default.createElement(React__default.Fragment, null,
-        React__default.createElement(Alert$1, { show: showError, variant: "danger", dismissible: true, onClose: function () {
-                setShowError(false);
-                setError(undefined);
-            } },
-            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))),
-        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: loginAsGuest }, "Windows Auth"))));
+    }); }, [setShowError,
+        setError,
+        saveUserData]);
+    useEffect(function () {
+        checkIfEnabled().then(function () {
+            console.log('done');
+        });
+    }, []);
+    if (windowsAuthIsEnabled)
+        return (React__default.createElement(React__default.Fragment, null,
+            React__default.createElement(Alert$1, { show: showError, variant: "danger", dismissible: true, onClose: function () {
+                    setShowError(false);
+                    setError(undefined);
+                } },
+                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))),
+            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;
 };
 
 function Login(_a) {
@@ -5808,7 +5860,7 @@ function Login(_a) {
     var _c = useState(''), message = _c[0], setMessage = _c[1];
     var useEmailAndPassword = get$1(authConfig, 'useEmailAndPassword', true);
     var useAzureAD = get$1(authConfig, 'useAzureAD', false);
-    var useWindowsAuth = get$1(authConfig, 'useWindowsAuth', false);
+    get$1(authConfig, 'useWindowsAuth', false);
     var guestIsEnabled = get$1(authConfig, 'guestIsEnabled', false);
     var handleClose = function () {
         setOpen(false);
@@ -5835,7 +5887,7 @@ function Login(_a) {
                         React__default.createElement("div", { className: "card-body m-3" },
                             useEmailAndPassword && React__default.createElement(LoginWithEmailAndPassword, null),
                             useAzureAD && React__default.createElement(LoginWithAzureAD, { config: authConfig.AzureConfig }),
-                            useWindowsAuth && React__default.createElement(LoginWithWindowsAuthentication, null),
+                            React__default.createElement(LoginWithWindowsAuthentication, null),
                             guestIsEnabled && React__default.createElement(LoginAsGuest, null)))))),
         React__default.createElement(Snackbar$1, { open: open, autoHideDuration: 6000, onClose: handleClose, message: message })));
 }

package/dist/services/ApiService.d.ts

@@ -35,5 +35,6 @@ export declare class MESApiService {
     import(procedure: string, parameters: any[], files: any[], uniqueFile: any, database?: string): Promise<any>;
     export(procedure: string, parameters: spParameter[], fileName: string, database?: string): Promise<string | void>;
     exportExcel(procedure: string, parameters: spParameter[], fileName: string, excelStructure: ExportStructure, database?: string): Promise<string | void>;
+    checkIfWindowsAuthIsEnabled(): Promise<any>;
 }
 export {};

package/package.json

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