@movalib/movalib-commons 1.59.7 → 1.59.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -0
- package/dist/index.js +4 -2
- package/dist/src/AccountValidation.js +3 -3
- package/dist/src/MovaSignUp.d.ts +2 -0
- package/dist/src/MovaSignUp.js +18 -18
- package/dist/src/components/singup/ActivateAccount.d.ts +10 -0
- package/dist/src/components/singup/ActivateAccount.js +179 -0
- package/dist/src/services/UserService.d.ts +5 -1
- package/dist/src/services/UserService.js +8 -0
- package/package.json +1 -1
- package/movalib-movalib-commons-1.59.23.tgz +0 -0
package/dist/index.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export { default as MovaCopyright } from './src/MovaCopyright';
|
|
|
22
22
|
export { default as MovaVehicleTireField } from './src/MovaVehicleTireField';
|
|
23
23
|
export { default as ConfirmationDialog } from './src/ConfirmationDialog';
|
|
24
24
|
export { default as GenderSelector } from './src/GenderSelector';
|
|
25
|
+
export { default as ActivateAccount } from './src/components/singup/ActivateAccount';
|
|
25
26
|
export { QrCodePLVContainer } from './src/components/QrCodePLVContainer/QrCodePLVContainer';
|
|
26
27
|
export { PLVComponent, PrintSize } from './src/components/QrCodePLVContainer/PLVComponent';
|
|
27
28
|
export { default as Subscription } from './src/models/Subscription';
|
package/dist/index.js
CHANGED
|
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
5
|
};
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.
|
|
8
|
-
exports.openDialogPrint = exports.APIMethod = exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.CustomerType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = void 0;
|
|
7
|
+
exports.CategoryPrestation = exports.VehicleTire = exports.Event = exports.Schedule = exports.VehicleGarage = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.Operation = exports.Prestation = exports.Product = exports.Supplier = exports.Employee = exports.Absence = exports.Subscription = exports.PrintSize = exports.PLVComponent = exports.QrCodePLVContainer = exports.ActivateAccount = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.oldRegexPlate = exports.regexPlate = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.AddressFields = exports.AccountValidation = exports.GaragePLV = exports.IbanInput = exports.DialogForgotPassword = exports.UserService = exports.GarageService = exports.AuthenticationService = exports.VehicleService = void 0;
|
|
8
|
+
exports.openDialogPrint = exports.APIMethod = exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.CustomerType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = exports.readCookie = void 0;
|
|
9
9
|
// Export des services
|
|
10
10
|
var VehicleService_1 = require("./src/services/VehicleService");
|
|
11
11
|
Object.defineProperty(exports, "VehicleService", { enumerable: true, get: function () { return __importDefault(VehicleService_1).default; } });
|
|
@@ -58,6 +58,8 @@ var ConfirmationDialog_1 = require("./src/ConfirmationDialog");
|
|
|
58
58
|
Object.defineProperty(exports, "ConfirmationDialog", { enumerable: true, get: function () { return __importDefault(ConfirmationDialog_1).default; } });
|
|
59
59
|
var GenderSelector_1 = require("./src/GenderSelector");
|
|
60
60
|
Object.defineProperty(exports, "GenderSelector", { enumerable: true, get: function () { return __importDefault(GenderSelector_1).default; } });
|
|
61
|
+
var ActivateAccount_1 = require("./src/components/singup/ActivateAccount");
|
|
62
|
+
Object.defineProperty(exports, "ActivateAccount", { enumerable: true, get: function () { return __importDefault(ActivateAccount_1).default; } });
|
|
61
63
|
var QrCodePLVContainer_1 = require("./src/components/QrCodePLVContainer/QrCodePLVContainer");
|
|
62
64
|
Object.defineProperty(exports, "QrCodePLVContainer", { enumerable: true, get: function () { return QrCodePLVContainer_1.QrCodePLVContainer; } });
|
|
63
65
|
var PLVComponent_1 = require("./src/components/QrCodePLVContainer/PLVComponent");
|
|
@@ -118,16 +118,16 @@ var AccountValidation = function (_a) {
|
|
|
118
118
|
if (req) {
|
|
119
119
|
UserService_1.default.validateAccount(req)
|
|
120
120
|
.then(function (response) {
|
|
121
|
-
var _a
|
|
121
|
+
var _a;
|
|
122
122
|
Logger_1.default.info(response);
|
|
123
123
|
if (response.success) {
|
|
124
124
|
if (onSubmit) {
|
|
125
|
-
onSubmit(response.success,
|
|
125
|
+
onSubmit(response.success, 'Le compte a été activé avec succès.');
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
128
|
else {
|
|
129
129
|
if (onSubmit) {
|
|
130
|
-
onSubmit(response.success, (
|
|
130
|
+
onSubmit(response.success, (_a = response.error) !== null && _a !== void 0 ? _a : '');
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
133
|
}).catch(function (error) {
|
package/dist/src/MovaSignUp.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { FunctionComponent, ReactNode } from "react";
|
|
|
2
2
|
import { AlertColor } from "@mui/material";
|
|
3
3
|
import { MovaUserSignUpForm } from "./helpers/Types";
|
|
4
4
|
import { MovaAppType } from "./helpers/Enums";
|
|
5
|
+
import User from "./models/User";
|
|
5
6
|
/**
|
|
6
7
|
* Propriétés du composant
|
|
7
8
|
* movaAppType : type d'application Movalib au sein de laquelle le composant est injectée
|
|
@@ -24,6 +25,7 @@ interface MovaSignUpProps {
|
|
|
24
25
|
showLoginButton?: boolean;
|
|
25
26
|
disableGutters?: boolean;
|
|
26
27
|
usePhoneNumber?: boolean;
|
|
28
|
+
userToEdit?: User;
|
|
27
29
|
}
|
|
28
30
|
/**
|
|
29
31
|
* Formulaire de création d'un compte Movalib (Garage / Utilisateur)
|
package/dist/src/MovaSignUp.js
CHANGED
|
@@ -77,29 +77,29 @@ var styles = {
|
|
|
77
77
|
justifyContent: 'center',
|
|
78
78
|
alignItems: 'center'
|
|
79
79
|
};
|
|
80
|
-
var initialUserFormState = {
|
|
81
|
-
firstname: { value: '', isValid: true },
|
|
82
|
-
lastname: { value: '', isValid: true },
|
|
83
|
-
email: { value: '', isValid: true },
|
|
84
|
-
phoneNumber: { value: '', isValid: true },
|
|
85
|
-
password: { value: '', isValid: true },
|
|
86
|
-
gender: { value: '', isValid: true },
|
|
87
|
-
birthDate: { value: null, isValid: true },
|
|
88
|
-
acceptsTerms: { value: false, isValid: true },
|
|
89
|
-
};
|
|
90
80
|
/**
|
|
91
81
|
* Formulaire de création d'un compte Movalib (Garage / Utilisateur)
|
|
92
82
|
* ATTENTION : le lien de consultation des CGU doit pointer vers "/terms-and-conditions"
|
|
93
83
|
*/
|
|
94
84
|
var MovaSignUp = function (_a) {
|
|
95
|
-
var
|
|
96
|
-
var
|
|
85
|
+
var _b, _c, _d, _e;
|
|
86
|
+
var loading = _a.loading, movaAppType = _a.movaAppType, onSubmit = _a.onSubmit, _f = _a.darkMode, darkMode = _f === void 0 ? false : _f, alertMessage = _a.alertMessage, alertSeverity = _a.alertSeverity, headerText = _a.headerText, _g = _a.showHeaderLogo, showHeaderLogo = _g === void 0 ? true : _g, _h = _a.showLeafs, showLeafs = _h === void 0 ? true : _h, _j = _a.showCopyright, showCopyright = _j === void 0 ? true : _j, _k = _a.showLoginButton, showLoginButton = _k === void 0 ? true : _k, _l = _a.disableGutters, disableGutters = _l === void 0 ? false : _l, _m = _a.usePhoneNumber, usePhoneNumber = _m === void 0 ? true : _m, _o = _a.userToEdit, userToEdit = _o === void 0 ? null : _o;
|
|
87
|
+
var _p = (0, react_1.useState)({
|
|
88
|
+
firstname: { value: (_b = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.firstname) !== null && _b !== void 0 ? _b : '', isValid: true },
|
|
89
|
+
lastname: { value: (_c = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.lastname) !== null && _c !== void 0 ? _c : '', isValid: true },
|
|
90
|
+
email: { value: (_d = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.email) !== null && _d !== void 0 ? _d : '', isValid: true },
|
|
91
|
+
phoneNumber: { value: (_e = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.phoneNumber) !== null && _e !== void 0 ? _e : '', isValid: true },
|
|
92
|
+
password: { value: '', isValid: true },
|
|
93
|
+
gender: { value: '', isValid: true },
|
|
94
|
+
birthDate: { value: null, isValid: true },
|
|
95
|
+
acceptsTerms: { value: false, isValid: true },
|
|
96
|
+
}), userForm = _p[0], setUserForm = _p[1];
|
|
97
97
|
var history = (0, react_router_dom_1.useHistory)();
|
|
98
|
-
var
|
|
98
|
+
var _q = (0, react_1.useState)(""), message = _q[0], setMessage = _q[1];
|
|
99
99
|
var theme = (0, material_1.useTheme)();
|
|
100
|
-
var
|
|
101
|
-
var
|
|
102
|
-
var
|
|
100
|
+
var _r = (0, react_1.useState)(false), showPassword = _r[0], setShowPassword = _r[1];
|
|
101
|
+
var _s = (0, react_1.useState)(false), openEmailInfo = _s[0], setOpenEmailInfo = _s[1];
|
|
102
|
+
var _t = (0, react_1.useState)(false), openPhoneNumberInfo = _t[0], setOpenPhoneNumberInfo = _t[1];
|
|
103
103
|
var handleDateChange = function (name, date) {
|
|
104
104
|
var _a;
|
|
105
105
|
if (name && date) {
|
|
@@ -229,9 +229,9 @@ var MovaSignUp = function (_a) {
|
|
|
229
229
|
'& .MuiOutlinedInput-notchedOutline': {
|
|
230
230
|
borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
|
|
231
231
|
}
|
|
232
|
-
} }), usePhoneNumber && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.TextField, { type: "tel", margin: "normal", required: true, fullWidth: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: userForm.phoneNumber.value, error: Boolean(userForm.phoneNumber.error), helperText: userForm.phoneNumber.error, InputProps: {
|
|
232
|
+
} }), usePhoneNumber && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.TextField, { type: "tel", margin: "normal", required: true, fullWidth: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", disabled: userToEdit && userToEdit.phoneNumber ? true : false, onChange: function (e) { return handleInputChange(e); }, value: userForm.phoneNumber.value, error: Boolean(userForm.phoneNumber.error), helperText: userForm.phoneNumber.error, InputProps: {
|
|
233
233
|
endAdornment: ((0, jsx_runtime_1.jsx)(InputAdornment_1.default, __assign({ position: "end" }, { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "end", onClick: function () { return setOpenPhoneNumberInfo(!openPhoneNumberInfo); } }, { children: (0, jsx_runtime_1.jsx)(Info_1.default, {}) })) }))),
|
|
234
|
-
} }), openPhoneNumberInfo && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "info", variant: 'standard' }, { children: "Entrez le num\u00E9ro de t\u00E9l\u00E9phone que vous avez utilis\u00E9 pour r\u00E9server, afin de suivre facilement vos rendez-vous." }))] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error, sx: {
|
|
234
|
+
} }), openPhoneNumberInfo && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "info", variant: 'standard' }, { children: "Entrez le num\u00E9ro de t\u00E9l\u00E9phone que vous avez utilis\u00E9 pour r\u00E9server, afin de suivre facilement vos rendez-vous." }))] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", disabled: userToEdit && userToEdit.email ? true : false, onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error, sx: {
|
|
235
235
|
'& .MuiOutlinedInput-notchedOutline': {
|
|
236
236
|
borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
|
|
237
237
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { FunctionComponent } from 'react';
|
|
2
|
+
import { MovaAppType } from '../../helpers/Enums';
|
|
3
|
+
interface ActivateAccountProps {
|
|
4
|
+
movaAppType: MovaAppType;
|
|
5
|
+
smsValidation: boolean;
|
|
6
|
+
onSubmit: (success: boolean, message: string) => void;
|
|
7
|
+
onResendSecurityCode?: (success: boolean, message: string) => void;
|
|
8
|
+
}
|
|
9
|
+
declare const ActivateAccount: FunctionComponent<ActivateAccountProps>;
|
|
10
|
+
export default ActivateAccount;
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
var jsx_runtime_1 = require("react/jsx-runtime");
|
|
18
|
+
var react_1 = require("react");
|
|
19
|
+
var react_router_dom_1 = require("react-router-dom");
|
|
20
|
+
var UserService_1 = __importDefault(require("../../services/UserService"));
|
|
21
|
+
var material_1 = require("@mui/material");
|
|
22
|
+
var Logger_1 = __importDefault(require("../../helpers/Logger"));
|
|
23
|
+
var Enums_1 = require("../../helpers/Enums");
|
|
24
|
+
var Tools_1 = require("../../helpers/Tools");
|
|
25
|
+
var MovaSignUp_1 = __importDefault(require("../../MovaSignUp"));
|
|
26
|
+
var Validator_1 = require("../../helpers/Validator");
|
|
27
|
+
var ActivateAccount = function (_a) {
|
|
28
|
+
var movaAppType = _a.movaAppType, smsValidation = _a.smsValidation, onSubmit = _a.onSubmit, onResendSecurityCode = _a.onResendSecurityCode;
|
|
29
|
+
var code = (0, react_router_dom_1.useParams)().code;
|
|
30
|
+
var location = (0, react_router_dom_1.useLocation)();
|
|
31
|
+
var theme = (0, material_1.useTheme)();
|
|
32
|
+
var _b = (0, react_1.useState)(""), alertMessage = _b[0], setAlertMessage = _b[1];
|
|
33
|
+
// La sévérité est initialiée à "error" par défaut
|
|
34
|
+
var _c = (0, react_1.useState)('error'), alertSeverity = _c[0], setAlertSeverity = _c[1];
|
|
35
|
+
var _d = (0, react_1.useState)(false), loading = _d[0], setLoading = _d[1];
|
|
36
|
+
var _e = (0, react_1.useState)(null), currentUser = _e[0], setCurrentUser = _e[1];
|
|
37
|
+
var _f = (0, react_1.useState)(false), expiredCode = _f[0], setExpiredCode = _f[1];
|
|
38
|
+
var _g = (0, react_1.useState)(false), unknowCode = _g[0], setUnknowCode = _g[1];
|
|
39
|
+
var _h = (0, react_1.useState)({ phoneNumber: { value: '', isValid: true } }), validationForm = _h[0], setValidationForm = _h[1];
|
|
40
|
+
var history = (0, react_router_dom_1.useHistory)();
|
|
41
|
+
// ajout d'un load pour le chargement de la page
|
|
42
|
+
var getUserByTokenOrCode = function () {
|
|
43
|
+
setExpiredCode(false);
|
|
44
|
+
setUnknowCode(false);
|
|
45
|
+
var params = location !== undefined ? new URLSearchParams(location.search) : undefined;
|
|
46
|
+
var req = {
|
|
47
|
+
appType: Enums_1.MovaAppType.INDIVIDUAL,
|
|
48
|
+
token: !smsValidation ? params === null || params === void 0 ? void 0 : params.get('token') : null,
|
|
49
|
+
securityCode: smsValidation ? code : null,
|
|
50
|
+
demoGarage: Boolean(params === null || params === void 0 ? void 0 : params.get('demoGarage'))
|
|
51
|
+
};
|
|
52
|
+
UserService_1.default.validateAccount(req).then(function (response) {
|
|
53
|
+
if (response.success) {
|
|
54
|
+
setCurrentUser(response.data);
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
var data = response.data;
|
|
58
|
+
if (data === null || data === void 0 ? void 0 : data.expiredCode) {
|
|
59
|
+
setExpiredCode(true);
|
|
60
|
+
}
|
|
61
|
+
if (data === null || data === void 0 ? void 0 : data.unknowCode) {
|
|
62
|
+
setUnknowCode(true);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
};
|
|
67
|
+
(0, react_1.useEffect)(function () {
|
|
68
|
+
getUserByTokenOrCode();
|
|
69
|
+
}, []);
|
|
70
|
+
var updateActivateUseronSubmit = function (form) {
|
|
71
|
+
// appelle api pour mettre a jour l'utilisateur + auto activate en fonction du movaAPPType
|
|
72
|
+
if (movaAppType === Enums_1.MovaAppType.INDIVIDUAL && currentUser) {
|
|
73
|
+
setLoading(true);
|
|
74
|
+
try {
|
|
75
|
+
// On prépare la query
|
|
76
|
+
var query = {
|
|
77
|
+
code: code,
|
|
78
|
+
email: form.email.value,
|
|
79
|
+
password: form.password.value,
|
|
80
|
+
firstname: form.firstname.value,
|
|
81
|
+
lastname: form.lastname.value,
|
|
82
|
+
};
|
|
83
|
+
UserService_1.default.editUser(query, currentUser.id)
|
|
84
|
+
.then(function (response) {
|
|
85
|
+
var _a, _b;
|
|
86
|
+
//success or Error this is parent component responsability
|
|
87
|
+
Logger_1.default.info(response);
|
|
88
|
+
if (response.success) {
|
|
89
|
+
onSubmit(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : 'Le compte a été mis à jout et activé avec succès');
|
|
90
|
+
history.push('/login');
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
onSubmit(response.success, (_b = response.error) !== null && _b !== void 0 ? _b : 'Erreur lors de la mise à jour du compte');
|
|
94
|
+
}
|
|
95
|
+
}).catch(function (error) {
|
|
96
|
+
onSubmit(false, 'Erreur lors de la mise à jour du compte');
|
|
97
|
+
Logger_1.default.error(error);
|
|
98
|
+
setAlertMessage(error);
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
console.error('Error occurred during submission:', error);
|
|
103
|
+
}
|
|
104
|
+
finally {
|
|
105
|
+
setLoading(false);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
var controlPhoneNumber = function () {
|
|
110
|
+
var _a, _b, _c, _d, _e;
|
|
111
|
+
var newForm = validationForm;
|
|
112
|
+
var newField;
|
|
113
|
+
newForm.phoneNumber = (0, Tools_1.validateField)(validationForm.phoneNumber, function (value) { return !!value; }, 'Champ obligatoire');
|
|
114
|
+
// Validator 'phoneNumber'
|
|
115
|
+
if ((_a = newForm.phoneNumber) === null || _a === void 0 ? void 0 : _a.value) {
|
|
116
|
+
if (((_b = newForm.phoneNumber) === null || _b === void 0 ? void 0 : _b.value.length) < 10) {
|
|
117
|
+
newField = { value: (_c = validationForm.phoneNumber) === null || _c === void 0 ? void 0 : _c.value, error: "Le n° de téléphone est invalide." };
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
newField = { value: (_d = validationForm.phoneNumber) === null || _d === void 0 ? void 0 : _d.value, error: '' };
|
|
121
|
+
}
|
|
122
|
+
newForm = __assign(__assign({}, newForm), { phoneNumber: newField });
|
|
123
|
+
}
|
|
124
|
+
setValidationForm(newForm);
|
|
125
|
+
return !Boolean((_e = newForm.phoneNumber) === null || _e === void 0 ? void 0 : _e.error);
|
|
126
|
+
};
|
|
127
|
+
var handleInputChange = function (e) {
|
|
128
|
+
var _a;
|
|
129
|
+
if (e) {
|
|
130
|
+
var fieldName = e.target.name;
|
|
131
|
+
var fieldValue = e.target.value;
|
|
132
|
+
var newField = (_a = {}, _a[fieldName] = { value: fieldValue, isValid: true }, _a);
|
|
133
|
+
if (fieldName == "phoneNumber") {
|
|
134
|
+
if (!(0, Validator_1.validatePhoneNumber)(fieldValue))
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
setValidationForm(__assign(__assign({}, validationForm), newField));
|
|
138
|
+
}
|
|
139
|
+
};
|
|
140
|
+
var resendCode = function () {
|
|
141
|
+
var _a;
|
|
142
|
+
if (controlPhoneNumber() && onResendSecurityCode) {
|
|
143
|
+
var req = {
|
|
144
|
+
phoneNumber: (_a = validationForm.phoneNumber) === null || _a === void 0 ? void 0 : _a.value
|
|
145
|
+
};
|
|
146
|
+
UserService_1.default.resendSecurityCode(req)
|
|
147
|
+
.then(function (response) {
|
|
148
|
+
var _a, _b;
|
|
149
|
+
Logger_1.default.info(response);
|
|
150
|
+
if (response.success) {
|
|
151
|
+
onResendSecurityCode(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : '');
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
onResendSecurityCode(response.success, (_b = response.error) !== null && _b !== void 0 ? _b : '');
|
|
155
|
+
}
|
|
156
|
+
history.push('/login');
|
|
157
|
+
}).catch(function (error) {
|
|
158
|
+
Logger_1.default.error(error);
|
|
159
|
+
if (onSubmit) {
|
|
160
|
+
onSubmit(false, error);
|
|
161
|
+
}
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
};
|
|
165
|
+
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [currentUser !== null && (0, jsx_runtime_1.jsx)(MovaSignUp_1.default, { movaAppType: movaAppType, onSubmit: updateActivateUseronSubmit, alertMessage: alertMessage, alertSeverity: alertSeverity, userToEdit: currentUser, loading: loading }), expiredCode && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Typography, { children: [(0, jsx_runtime_1.jsx)("b", { children: "Indiquez nous votre num\u00E9ro de t\u00E9l\u00E9phone" }), (0, jsx_runtime_1.jsx)("br", {})] }), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", fullWidth: true, required: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: validationForm.phoneNumber.value, error: Boolean(validationForm.phoneNumber.error), helperText: validationForm.phoneNumber.error }) })), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ onClick: resendCode, sx: { cursor: 'pointer', textAlign: 'center', width: '100%', mt: 1 } }, { children: "Renvoyer le code" }))] })), unknowCode && ((0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ sx: {
|
|
166
|
+
display: 'flex',
|
|
167
|
+
flexDirection: 'column',
|
|
168
|
+
alignItems: 'center',
|
|
169
|
+
justifyContent: 'center',
|
|
170
|
+
textAlign: 'center',
|
|
171
|
+
padding: 3,
|
|
172
|
+
borderRadius: 2,
|
|
173
|
+
boxShadow: 3,
|
|
174
|
+
maxWidth: 400,
|
|
175
|
+
margin: 'auto',
|
|
176
|
+
backgroundColor: 'white',
|
|
177
|
+
} }, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "h6", color: "error", gutterBottom: true }, { children: "Code de validation invalide" })), (0, jsx_runtime_1.jsxs)(material_1.Typography, __assign({ variant: "body1", color: "textSecondary", gutterBottom: true }, { children: ["Le code de validation fourni ne correspond \u00E0 aucun utilisateur.", (0, jsx_runtime_1.jsx)("br", {}), "Si le probl\u00E8me persiste, veuillez nous contacter \u00E0", ' ', (0, jsx_runtime_1.jsx)("b", { children: "contact@movalib.com" }), "."] })), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ variant: "contained", color: "primary", onClick: function (e) { return history.push('/login'); }, sx: { marginTop: 2 } }, { children: "Retour \u00E0 la connexion" }))] })))] }));
|
|
178
|
+
};
|
|
179
|
+
exports.default = ActivateAccount;
|
|
@@ -8,7 +8,11 @@ export default class UserService {
|
|
|
8
8
|
static reestPassword(req: any): Promise<APIResponse<string>>;
|
|
9
9
|
static resendSecurityCode(req: any): Promise<APIResponse<string>>;
|
|
10
10
|
static getSalesGarages(salesId: string): Promise<APIResponse<Garage[]>>;
|
|
11
|
-
static validateAccount(req: any): Promise<APIResponse<
|
|
11
|
+
static validateAccount(req: any): Promise<APIResponse<User | {
|
|
12
|
+
expiredCode?: boolean;
|
|
13
|
+
unknowCode?: boolean;
|
|
14
|
+
}>>;
|
|
15
|
+
static editUser(req: any, userId: string): Promise<APIResponse<string>>;
|
|
12
16
|
/**
|
|
13
17
|
* @param email
|
|
14
18
|
* @param password
|
|
@@ -88,6 +88,14 @@ var UserService = /** @class */ (function () {
|
|
|
88
88
|
body: JSON.stringify(req)
|
|
89
89
|
});
|
|
90
90
|
};
|
|
91
|
+
UserService.editUser = function (req, userId) {
|
|
92
|
+
return (0, ApiHelper_1.request)({
|
|
93
|
+
url: "".concat(ApiHelper_1.API_BASE_URL, "/user/").concat(userId),
|
|
94
|
+
method: Enums_1.APIMethod.PATCH,
|
|
95
|
+
appType: Enums_1.MovaAppType.INDIVIDUAL,
|
|
96
|
+
body: JSON.stringify(req)
|
|
97
|
+
});
|
|
98
|
+
};
|
|
91
99
|
/**
|
|
92
100
|
* @param email
|
|
93
101
|
* @param password
|
package/package.json
CHANGED
|
Binary file
|