@movalib/movalib-commons 1.1.4 → 1.1.5

package/dist/src/AccountValidation.d.ts

@@ -2,8 +2,7 @@ import { FunctionComponent } from 'react';
 import { MovaAppType } from './helpers/Enums';
 interface AccountValidationProps {
     movaAppType: MovaAppType;
-    onSuccess: () => void;
-    onError: () => void;
+    onSubmit: (success: boolean, message: string) => void;
 }
 declare const AccountValidation: FunctionComponent<AccountValidationProps>;
 export default AccountValidation;

package/dist/src/AccountValidation.js

@@ -32,7 +32,7 @@ var initialFormState = {
     confirmation: { value: '', isValid: true },
 };
 var AccountValidation = function (_a) {
-    var movaAppType = _a.movaAppType, onSuccess = _a.onSuccess, onError = _a.onError;
+    var movaAppType = _a.movaAppType, onSubmit = _a.onSubmit;
     var _b = (0, react_1.useState)(true), loading = _b[0], setLoading = _b[1];
     var _c = (0, react_1.useState)(initialFormState), passwordForm = _c[0], setPasswordForm = _c[1];
     var location = (0, react_router_dom_1.useLocation)();
@@ -58,18 +58,24 @@ var AccountValidation = function (_a) {
     }, [location]);
     var activateAccount = function (req) {
         if (req) {
-            Logger_1.default.info(req);
             UserService_1.default.validateAccount(req)
                 .then(function (response) {
-                // Affichage notification utilisateur
+                var _a, _b;
                 Logger_1.default.info(response);
-                if (onSuccess) {
-                    onSuccess();
+                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 (onError) {
-                    onError();
+                if (onSubmit) {
+                    onSubmit(false, error);
                 }
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "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

@@ -19,11 +19,10 @@ const initialFormState = {
 
 interface AccountValidationProps {
     movaAppType: MovaAppType,
-    onSuccess: () => void,
-    onError: () => void,
+    onSubmit: (success:boolean, message:string) => void,
 }
 
-const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppType, onSuccess, onError }) => {
+const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppType, onSubmit }) => {
 
     const [loading, setLoading] = useState(true);
     const [passwordForm, setPasswordForm] = useState<MovaPasswordForm>(initialFormState);
@@ -60,21 +59,25 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
     const activateAccount = (req: any) => {
         if(req){
 
-            Logger.info(req);
-
             UserService.validateAccount(req)
             .then(response => {
 
-                // Affichage notification utilisateur
                 Logger.info(response);
-                if(onSuccess){
-                    onSuccess();
+
+                if(response.success){
+                    if(onSubmit){
+                        onSubmit(response.success, response.data ?? '');
+                    }
+                }else{
+                    if(onSubmit){
+                        onSubmit(response.success, response.error ?? '');
+                    }
                 }
 
             }).catch(error => {
                 Logger.error(error);
-                if(onError){
-                    onError();
+                if(onSubmit){
+                    onSubmit(false, error);
                 }
             });
         }