@movalib/movalib-commons 1.1.74 → 1.1.76

package/devIndex.tsx

@@ -192,7 +192,7 @@ const App = () => {
           </Box>
 
 
-          {openAccountValidation && <AccountValidation smsValidation={true} movaAppType={MovaAppType.GARAGE}
+          {openAccountValidation && <AccountValidation smsValidation={true} resetPassword={false} movaAppType={MovaAppType.GARAGE}
           onSubmit={function (success: boolean, message: string): void {
             throw new Error('Function not implemented.');
           } } onResendSecurityCode={function (success: boolean, message: string): void {

package/dist/devIndex.js

@@ -155,7 +155,7 @@ var App = function () {
                                             throw new Error('Function not implemented.');
                                         } }), (0, jsx_runtime_1.jsx)("br", {}), " ", (0, jsx_runtime_1.jsx)("br", {}), (0, jsx_runtime_1.jsx)(IbanInput_1.default, { onIbanChange: function (iban) {
                                             throw new Error('Function not implemented.');
-                                        } })] }))] })), (0, jsx_runtime_1.jsx)(material_1.Box, __assign({ style: Tools_1.flexCenter }, { children: (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ onClick: function () { return setOpenAccountValidation(!openAccountValidation); } }, { children: "Validation de compte" })) })), openAccountValidation && (0, jsx_runtime_1.jsx)(AccountValidation_1.default, { smsValidation: true, movaAppType: Enums_1.MovaAppType.GARAGE, onSubmit: function (success, message) {
+                                        } })] }))] })), (0, jsx_runtime_1.jsx)(material_1.Box, __assign({ style: Tools_1.flexCenter }, { children: (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ onClick: function () { return setOpenAccountValidation(!openAccountValidation); } }, { children: "Validation de compte" })) })), openAccountValidation && (0, jsx_runtime_1.jsx)(AccountValidation_1.default, { smsValidation: true, resetPassword: false, movaAppType: Enums_1.MovaAppType.GARAGE, onSubmit: function (success, message) {
                             throw new Error('Function not implemented.');
                         }, onResendSecurityCode: function (success, message) {
                             throw new Error('Function not implemented.');

package/dist/src/AccountValidation.d.ts

@@ -3,6 +3,7 @@ import { MovaAppType } from './helpers/Enums';
 interface AccountValidationProps {
     movaAppType: MovaAppType;
     smsValidation: boolean;
+    resetPassword: boolean;
     onSubmit: (success: boolean, message: string) => void;
     onResendSecurityCode?: (success: boolean, message: string) => void;
 }

package/dist/src/AccountValidation.js

@@ -39,7 +39,7 @@ var initialFormState = {
 };
 var AccountValidation = function (_a) {
     var _b, _c, _d, _e;
-    var movaAppType = _a.movaAppType, smsValidation = _a.smsValidation, onSubmit = _a.onSubmit, onResendSecurityCode = _a.onResendSecurityCode;
+    var movaAppType = _a.movaAppType, smsValidation = _a.smsValidation, resetPassword = _a.resetPassword, onSubmit = _a.onSubmit, onResendSecurityCode = _a.onResendSecurityCode;
     var _f = (0, react_1.useState)(true), loading = _f[0], setLoading = _f[1];
     var _g = (0, react_1.useState)(initialFormState), validationForm = _g[0], setValidationForm = _g[1];
     var location = (0, react_router_dom_1.useLocation)();
@@ -55,16 +55,40 @@ var AccountValidation = function (_a) {
         // Si cette variable est transmise, cela signifie que le compte a été créé sans mot de passe
         var localEmptyPwd = Boolean(params.get('emptyPwd'));
         setEmptyPwd(localEmptyPwd);
-        if (token) {
+        if (token && !resetPassword) {
             if (!localEmptyPwd) {
                 var req = {
                     token: token
                 };
-                activateAccount(req);
+                activateUserAccount(req);
             }
         }
     }, [location]);
-    var activateAccount = function (req) {
+    var resetUserPassword = function (req) {
+        if (req) {
+            UserService_1.default.reestPassword(req)
+                .then(function (response) {
+                var _a, _b;
+                Logger_1.default.info(response);
+                if (response.success) {
+                    if (onSubmit) {
+                        onSubmit(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : '');
+                    }
+                }
+                else {
+                    if (onSubmit) {
+                        onSubmit(response.success, (_b = response.error) !== null && _b !== void 0 ? _b : '');
+                    }
+                }
+            }).catch(function (error) {
+                Logger_1.default.error(error);
+                if (onSubmit) {
+                    onSubmit(false, error);
+                }
+            });
+        }
+    };
+    var activateUserAccount = function (req) {
         if (req) {
             UserService_1.default.validateAccount(req)
                 .then(function (response) {
@@ -128,7 +152,7 @@ var AccountValidation = function (_a) {
                 password: validationForm.password.value,
                 demoGarage: Boolean(params.get('demoGarage'))
             };
-            activateAccount(req);
+            resetPassword ? resetUserPassword(req) : activateUserAccount(req);
         }
     };
     var getTitleStyle = function () {
@@ -190,17 +214,17 @@ var AccountValidation = function (_a) {
             });
         }
     };
-    return ((0, jsx_runtime_1.jsxs)("div", { children: [(emptyPwd || smsValidation) &&
+    return ((0, jsx_runtime_1.jsxs)("div", { children: [(emptyPwd || smsValidation || resetPassword) &&
                 (0, jsx_runtime_1.jsx)(MovaDialog_1.default, __assign({ leafImageColor: 'pink', titleStyle: getTitleStyle(), fullScreen: isMobile, open: emptyPwd || smsValidation, closable: false, onClose: function () {
                         throw new Error('Function not implemented.');
-                    }, actions: (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ type: "submit", onClick: handleValidateAccount, fullWidth: true, variant: "contained", sx: { mt: 4, mb: 0 } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Activer mon compte" }) })) }, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ sx: {
+                    }, actions: (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ type: "submit", onClick: handleValidateAccount, fullWidth: true, variant: "contained", sx: { mt: 4, mb: 0 } }, { children: resetPassword ? (0, jsx_runtime_1.jsx)("span", { children: "R\u00E9initialiser mon mot de passe" }) : (0, jsx_runtime_1.jsx)("span", { children: "Activer mon compte" }) })) }, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ sx: {
                                         display: 'flex',
                                         flexDirection: 'column',
                                         alignItems: 'center',
                                     } }, { children: [(0, jsx_runtime_1.jsx)("img", { src: getMovaLogo(), style: { width: '50%' } }), (0, jsx_runtime_1.jsx)("br", {})] })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ sx: { mt: 2, mb: 3 } }, { children: movaAppType === Enums_1.MovaAppType.INDIVIDUAL ?
-                                        "Pour commencer, définis ton mot de passe et active ton compte 😉"
+                                        resetPassword ? "Définis ton nouveau mot de passe" : "Pour commencer, définis ton mot de passe et active ton compte 😉"
                                         :
-                                            "Pour commencer, définissez votre mot de passe et activez votre compte 😉" })) })), smsValidation && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Code re\u00E7u par SMS", required: true, fullWidth: true, name: "securityCode", variant: "outlined", value: (_b = validationForm.securityCode) === null || _b === void 0 ? void 0 : _b.value, error: !((_c = validationForm.securityCode) === null || _c === void 0 ? void 0 : _c.isValid), helperText: Boolean((_d = validationForm.securityCode) === null || _d === void 0 ? void 0 : _d.error) ? (_e = validationForm.securityCode) === null || _e === void 0 ? void 0 : _e.error : null, onChange: function (e) { return handleInputChange(e); }, inputProps: {
+                                            resetPassword ? "Définissez votre nouveau mot de passe" : "Pour commencer, définissez votre mot de passe et activez votre compte 😉" })) })), smsValidation && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Code re\u00E7u par SMS", required: true, fullWidth: true, name: "securityCode", variant: "outlined", value: (_b = validationForm.securityCode) === null || _b === void 0 ? void 0 : _b.value, error: !((_c = validationForm.securityCode) === null || _c === void 0 ? void 0 : _c.isValid), helperText: Boolean((_d = validationForm.securityCode) === null || _d === void 0 ? void 0 : _d.error) ? (_e = validationForm.securityCode) === null || _e === void 0 ? void 0 : _e.error : null, onChange: function (e) { return handleInputChange(e); }, inputProps: {
                                                 maxLength: 6,
                                                 inputMode: 'numeric',
                                                 pattern: '[0-9]*' // Permet seulement la saisie de chiffres

package/dist/src/helpers/ApiHelper.d.ts

@@ -8,7 +8,7 @@ export type APIResponse<T> = {
 export type APIRequest = {
     url: string;
     method: APIMethod;
-    appType: MovaAppType;
+    appType?: MovaAppType;
     body?: string | FormData;
 };
 /**

package/dist/src/services/AuthenticationService.d.ts

@@ -2,5 +2,6 @@ import { APIResponse } from "../helpers/ApiHelper";
 import { MovaAppType } from "../helpers/Enums";
 import User from "../models/User";
 export default class AuthenticationService {
+    static forgotPassword(req: any): Promise<APIResponse<string>>;
     static login(appType: MovaAppType, email: string, password: string): Promise<APIResponse<User>>;
 }

package/dist/src/services/AuthenticationService.js

@@ -47,6 +47,17 @@ var UserService_1 = __importDefault(require("./UserService"));
 var AuthenticationService = /** @class */ (function () {
     function AuthenticationService() {
     }
+    AuthenticationService.forgotPassword = function (req) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, (0, ApiHelper_1.request)({
+                        url: "".concat(ApiHelper_1.API_BASE_URL, "/forgot-password"),
+                        method: Enums_1.APIMethod.POST,
+                        body: JSON.stringify(req)
+                    })];
+            });
+        });
+    };
     AuthenticationService.login = function (appType, email, password) {
         return __awaiter(this, void 0, void 0, function () {
             var url, tokenCookie, tokenResponse, userResponse, errorMsg, error_1, errorMessage;

package/dist/src/services/UserService.d.ts

@@ -3,6 +3,7 @@ import { MovaAppType } from "../helpers/Enums";
 import Garage from "../models/Garage";
 import User from "../models/User";
 export default class UserService {
+    static reestPassword(req: any): Promise<APIResponse<string>>;
     static resendSecurityCode(req: any): Promise<APIResponse<string>>;
     static getSalesGarages(salesId: string): Promise<APIResponse<Garage[]>>;
     static validateAccount(req: any): Promise<APIResponse<string>>;

package/dist/src/services/UserService.js

@@ -45,6 +45,14 @@ var Logger_1 = __importDefault(require("../helpers/Logger"));
 var UserService = /** @class */ (function () {
     function UserService() {
     }
+    UserService.reestPassword = function (req) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/user/reset-password"),
+            method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.INDIVIDUAL,
+            body: JSON.stringify(req)
+        });
+    };
     UserService.resendSecurityCode = function (req) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/user/resend-security-code"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.1.74",
+  "version": "1.1.76",
   "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/AccountValidation.tsx

@@ -11,7 +11,6 @@ import { MovaAppType } from './helpers/Enums';
 import { MovaFormField, MovaValidationForm } from './helpers/Types';
 import { validateField } from './helpers/Tools';
 import MovaDialog from './MovaDialog';
-
 import LogoLarge from './assets/images/logo/logo_large.png';
 import LogoProLarge from './assets/images/logo/logo_pro_large.png';
 import ConfirmationDialog from './ConfirmationDialog';
@@ -27,11 +26,12 @@ const initialFormState = {
 interface AccountValidationProps {
     movaAppType: MovaAppType,
     smsValidation: boolean,
+    resetPassword: boolean,
     onSubmit: (success:boolean, message:string) => void,
     onResendSecurityCode?: (success:boolean, message:string) => void,
 }
 
-const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppType, smsValidation, onSubmit, onResendSecurityCode }) => {
+const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppType, smsValidation, resetPassword, onSubmit, onResendSecurityCode }) => {
 
     const [loading, setLoading] = useState(true);
     const [validationForm, setValidationForm] = useState<MovaValidationForm>(initialFormState);
@@ -52,7 +52,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
         let localEmptyPwd = Boolean(params.get('emptyPwd'));
         setEmptyPwd(localEmptyPwd);
 
-        if (token) {
+        if (token && !resetPassword) {
 
             if(!localEmptyPwd){
 
@@ -60,13 +60,40 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                     token: token
                 }
 
-                activateAccount(req);
+                activateUserAccount(req);
             }
         }
 
     }, [location]);
 
-    const activateAccount = (req: any) => {
+    const resetUserPassword = (req: any) => {
+        if(req){
+
+            UserService.reestPassword(req)
+            .then(response => {
+
+                Logger.info(response);
+
+                if(response.success){
+                    if(onSubmit){
+                        onSubmit(response.success, response.data ?? '');
+                    }
+                }else{
+                    if(onSubmit){
+                        onSubmit(response.success, response.error ?? '');
+                    }
+                }
+
+            }).catch(error => {
+                Logger.error(error);
+                if(onSubmit){
+                    onSubmit(false, error);
+                }
+            });
+        }
+    }
+
+    const activateUserAccount = (req: any) => {
         if(req){
 
             UserService.validateAccount(req)
@@ -148,7 +175,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                 demoGarage: Boolean(params.get('demoGarage'))
             }
 
-            activateAccount(req);
+            resetPassword ? resetUserPassword(req) : activateUserAccount(req);
         }
     }
 
@@ -225,7 +252,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
 
     return (
         <div>
-            {(emptyPwd || smsValidation) &&
+            {(emptyPwd || smsValidation || resetPassword) &&
                 <MovaDialog 
                     leafImageColor='pink'
                     titleStyle={getTitleStyle()}
@@ -242,7 +269,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                             fullWidth
                             variant="contained"
                             sx={{ mt: 4, mb: 0 }}>
-                            <span>Activer mon compte</span>
+                            {resetPassword ? <span>Réinitialiser mon mot de passe</span> : <span>Activer mon compte</span>}
                         </LoadingButton>
                 }>
                     <Grid container>
@@ -261,9 +288,9 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                         <Grid item xs={12}>
                             <Typography sx={{ mt: 2, mb: 3 }}>
                                 {movaAppType === MovaAppType.INDIVIDUAL ?
-                                "Pour commencer, définis ton mot de passe et active ton compte 😉"
+                                    resetPassword ? "Définis ton nouveau mot de passe" : "Pour commencer, définis ton mot de passe et active ton compte 😉"
                                 :
-                                "Pour commencer, définissez votre mot de passe et activez votre compte 😉"
+                                    resetPassword ? "Définissez votre nouveau mot de passe" : "Pour commencer, définissez votre mot de passe et activez votre compte 😉"
                                 }                                
                             </Typography>
                         </Grid>

package/src/helpers/ApiHelper.ts

@@ -14,7 +14,7 @@ export type APIResponse<T> = {
 export type APIRequest = {
     url: string,
     method: APIMethod,
-    appType: MovaAppType,
+    appType?: MovaAppType,
     body?: string | FormData
 }
 

package/src/services/AuthenticationService.ts

@@ -7,6 +7,14 @@ import UserService from "./UserService";
 
 export default class AuthenticationService {
 
+    static async forgotPassword(req: any): Promise<APIResponse<string>> {
+            return request({
+            url: `${API_BASE_URL}/forgot-password`,
+            method: APIMethod.POST,
+            body: JSON.stringify(req)
+        });
+    }
+
     static async login(appType: MovaAppType, email: string, password: string): Promise<APIResponse<User>> {
         try {
 

package/src/services/UserService.ts

@@ -6,6 +6,15 @@ import User from "../models/User";
 
 export default class UserService {
 
+    static reestPassword(req: any): Promise<APIResponse<string>> {
+        return request({
+            url: `${API_BASE_URL}/user/reset-password`,
+            method: APIMethod.POST,
+            appType: MovaAppType.INDIVIDUAL,
+            body: JSON.stringify(req)
+        });
+    }
+
     static resendSecurityCode(req: any): Promise<APIResponse<string>> {
         return request({
             url: `${API_BASE_URL}/user/resend-security-code`,