@movalib/movalib-commons 1.0.95 → 1.0.97

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.
@@ -171,7 +171,7 @@ var MovaLogin = function (_a) {
171
171
  alignItems: 'center',
172
172
  } }, { children: [(0, jsx_runtime_1.jsx)("img", { src: getMovaLogo(), style: { width: '80%' } }), (0, jsx_runtime_1.jsx)("br", {})] })), (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ component: "form", onSubmit: handleSubmit, noValidate: true, sx: { mt: 1 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", autoFocus: true, onChange: function (e) { return handleInputChange(e); }, value: form.email.value, error: !form.email.isValid, helperText: form.email.error }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, name: "password", label: "Mot de passe", type: showPassword ? 'text' : 'password', id: "password", autoComplete: "current-password", onChange: function (e) { return handleInputChange(e); }, value: form.password.value, error: !form.password.isValid, helperText: form.password.error, InputProps: {
173
173
  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: handleClickShowPassword }, { children: showPassword ? (0, jsx_runtime_1.jsx)(VisibilityOff_1.default, {}) : (0, jsx_runtime_1.jsx)(Visibility_1.default, {}) })) }))),
174
- } }), (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { value: "remember", color: "primary" }), label: "Se souvenir de moi" }), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2 } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Se connecter" }) })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickForgotPassword(e); } }, { children: "Mot de passe oubli\u00E9 ?" })) })), movaAppType === Enums_1.MovaAppType.INDIVIDUAL && (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickSignUp(e); } }, { children: "Cr\u00E9er mon compte" })) }))] }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } }), openForgotPassword && dialogForgotPassword()] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
174
+ } }), (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { value: "remember", color: "primary" }), label: "Se souvenir de moi" }), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2 } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Se connecter" }) })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickForgotPassword(e); }, sx: { cursor: 'pointer' } }, { children: "Mot de passe oubli\u00E9 ?" })) })), movaAppType === Enums_1.MovaAppType.INDIVIDUAL && (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickSignUp(e); }, sx: { cursor: 'pointer' } }, { children: "Cr\u00E9er mon compte" })) }))] }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } }), openForgotPassword && dialogForgotPassword()] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
175
175
  float: 'right',
176
176
  width: '250px',
177
177
  height: '400px',
@@ -201,7 +201,7 @@ var MovaLogin = function (_a) {
201
201
  padding: 0,
202
202
  },
203
203
  },
204
- } }), (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ error: !userForm.acceptsTerms.isValid }, { children: [(0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "acceptsTerms", color: "primary", checked: userForm.acceptsTerms.value, onChange: function (e, checked) { return handleCheckboxChange(e, checked); } }), label: (0, jsx_runtime_1.jsxs)("span", { children: ["J'accepte les", ' ', (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ href: "/terms-and-conditions", target: "_blank" }, { children: "Conditions G\u00E9n\u00E9rales d'Utilisation" }))] }) }), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: userForm.acceptsTerms.error })] })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2 } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Cr\u00E9er mon compte" }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickLogin(e); } }, { children: "Se connecter" })) })) }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } })] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
204
+ } }), (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ error: !userForm.acceptsTerms.isValid }, { children: [(0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "acceptsTerms", color: "primary", checked: userForm.acceptsTerms.value, onChange: function (e, checked) { return handleCheckboxChange(e, checked); } }), label: (0, jsx_runtime_1.jsxs)("span", { children: ["J'accepte les", ' ', (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ href: "/terms-and-conditions", target: "_blank" }, { children: "Conditions G\u00E9n\u00E9rales d'Utilisation" }))] }) }), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: userForm.acceptsTerms.error })] })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2 } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Cr\u00E9er mon compte" }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickLogin(e); }, sx: { cursor: 'pointer' } }, { children: "Se connecter" })) })) }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } })] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
205
205
  float: 'right',
206
206
  width: '250px',
207
207
  height: '400px',
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.request = exports.API_BASE_URL = void 0;
7
7
  var CookieUtils_1 = require("./CookieUtils");
8
8
  var Logger_1 = __importDefault(require("./Logger"));
9
- var react_router_dom_1 = require("react-router-dom");
10
9
  exports.API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
11
10
  function handleError(error) {
12
11
  var msg = error.message.includes('fetch') ? "Connexion impossible" : error.message;
@@ -18,7 +17,6 @@ function handleError(error) {
18
17
  function handleResponse(response) {
19
18
  var contentType = response.headers.get("content-type");
20
19
  var isJson = contentType && contentType.includes("application/json");
21
- var history = (0, react_router_dom_1.useHistory)();
22
20
  var dataPromise = isJson ? response.json() : response.text();
23
21
  return dataPromise.then(function (data) {
24
22
  if (!response.ok) {
@@ -31,11 +29,6 @@ function handleResponse(response) {
31
29
  case 404:
32
30
  errorMsg = 'La ressource demandée est introuvable (404)';
33
31
  break;
34
- case 407:
35
- // On redirige l'utilisateur vers la page de login (407 = compte utilisateur introuvable, authentification requise)
36
- errorMsg = (typeof data === 'string') ? data : "Compte introuvable, veuillez vous reconnecter (".concat(response.status, ")");
37
- history.push('/login');
38
- break;
39
32
  case 500:
40
33
  errorMsg = 'Une erreur interne du serveur est survenue (500)';
41
34
  break;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@movalib/movalib-commons",
3
- "version": "1.0.95",
3
+ "version": "1.0.97",
4
4
  "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/MovaLogin.tsx CHANGED
@@ -263,13 +263,13 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
263
263
 
264
264
  <Grid container>
265
265
  <Grid item xs>
266
- <Link variant="body2" color="text.secondary" onClick={(e) => handleOnClickForgotPassword(e)}>
266
+ <Link variant="body2" color="text.secondary" onClick={(e) => handleOnClickForgotPassword(e)} sx={{ cursor:'pointer' }}>
267
267
  Mot de passe oublié ?
268
268
  </Link>
269
269
  </Grid>
270
270
  {movaAppType === MovaAppType.INDIVIDUAL && <Grid item>
271
- <Link variant="body2" color="text.secondary" onClick={(e) => handleOnClickSignUp(e)}>
272
- Créer mon compte
271
+ <Link variant="body2" color="text.secondary" onClick={(e) => handleOnClickSignUp(e)} sx={{ cursor:'pointer' }}>
272
+ Créer mon compte
273
273
  </Link>
274
274
  </Grid>}
275
275
  </Grid>
@@ -329,7 +329,7 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
329
329
 
330
330
  <Grid container>
331
331
  <Grid item xs>
332
- <Link variant="body2" color="text.secondary" onClick={(e) => handleOnClickLogin(e)}>
332
+ <Link variant="body2" color="text.secondary" onClick={(e) => handleOnClickLogin(e)} sx={{ cursor:'pointer' }}>
333
333
  Se connecter
334
334
  </Link>
335
335
  </Grid>
@@ -29,7 +29,6 @@ function handleResponse(response: Response): Promise<APIResponse<any>> {
29
29
 
30
30
  const contentType = response.headers.get("content-type");
31
31
  const isJson = contentType && contentType.includes("application/json");
32
- const history = useHistory();
33
32
  const dataPromise = isJson ? response.json() : response.text();
34
33
 
35
34
  return dataPromise.then(data => {
@@ -45,11 +44,6 @@ function handleResponse(response: Response): Promise<APIResponse<any>> {
45
44
  errorMsg = 'Accès non autorisé (403)'; break;
46
45
  case 404:
47
46
  errorMsg = 'La ressource demandée est introuvable (404)'; break;
48
- case 407:
49
- // On redirige l'utilisateur vers la page de login (407 = compte utilisateur introuvable, authentification requise)
50
- errorMsg = (typeof data === 'string') ? data : `Compte introuvable, veuillez vous reconnecter (${response.status})`;
51
- history.push('/login');
52
- break;
53
47
  case 500:
54
48
  errorMsg = 'Une erreur interne du serveur est survenue (500)'; break;
55
49
  default: