From 98ebbaceee70aaafd9564cd9d5c40cf0de6d6111 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sun, 6 Dec 2020 14:54:37 -0800
Subject: [PATCH] Refactor service class.

---
 packages/login/src/app.tsx                    |  9 +++-
 .../login/src/components/RegistrationPage.tsx | 54 ++++++++-----------
 packages/login/src/services/Service.ts        | 44 +++++++++++++++
 3 files changed, 74 insertions(+), 33 deletions(-)
 create mode 100644 packages/login/src/services/Service.ts

diff --git a/packages/login/src/app.tsx b/packages/login/src/app.tsx
index f5ae125c..3d2950f6 100644
--- a/packages/login/src/app.tsx
+++ b/packages/login/src/app.tsx
@@ -1,5 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import LoginPage from './components/LoginPage';
+import { Service, RestService } from './services/Service';
+
 import { RegistrationSuccessPage, RegistationFormPage } from './components/RegistrationPage';
 import { IntlProvider } from 'react-intl'
 
@@ -38,6 +40,9 @@ const App = () => {
     fetchData();
   }, []);
 
+  // Create Service object...
+  const service: Service = new RestService('http://localhost:8080', () => { console.log("401 error")});
+
   return messages ? (
     <IntlProvider locale={locale} defaultLocale='en' messages={messages}>
       <Router>
@@ -46,7 +51,9 @@ const App = () => {
             <Redirect to="/c/login" />
           </Route>
           <Route path="/c/login" component={LoginPage} />
-          <Route path="/c/user/registration" component={RegistationFormPage} />
+          <Route path="/c/user/registration">
+            <RegistationFormPage service={service}/>
+          </Route>
           <Route path="/c/user/registrationSuccess" component={RegistrationSuccessPage} />
         </Switch>
       </Router>
diff --git a/packages/login/src/components/RegistrationPage.tsx b/packages/login/src/components/RegistrationPage.tsx
index 254047da..11406d0a 100644
--- a/packages/login/src/components/RegistrationPage.tsx
+++ b/packages/login/src/components/RegistrationPage.tsx
@@ -1,9 +1,8 @@
-import React, { useState } from 'react'
-import axios from 'axios'
+import React, { useState, } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl'
 import ReCAPTCHA from "react-google-recaptcha";
 import { useHistory } from "react-router-dom";
-
+import { Service, NewUser } from '../Services/service';
 
 
 import Header from './Header';
@@ -34,10 +33,10 @@ type RegistrationBody = {
   password: string;
   recaptcha: string;
 }
-const RegistrationForm = () => {
+const RegistrationForm = (props: ServiceProps) => {
   const [email, setEmail] = useState(undefined);
   const [lastName, setLastname] = useState(undefined)
-  const [firstname, setFirstname] = useState(undefined);
+  const [firstName, setFirstname] = useState(undefined);
   const [password, setPassword] = useState(undefined);
   const [recaptchaToken, setRecaptchaToken] = useState(undefined);
   const [errorMsg, setErrorMsg] = useState(undefined);
@@ -47,33 +46,21 @@ const RegistrationForm = () => {
 
   const handleSubmit = async (event: React.FormEvent) => {
     event.preventDefault();
+    const user: NewUser =
+    {
+      email: email,
+      firstname: firstName,
+      lastname: lastName,
+      password: password,
+      recaptcha: recaptchaToken
+    };
 
-    // @Todo: Movo to a type ...
-    const payload = JSON.stringify(
-      {
-        email: email,
-        firstName: firstname,
-        lastName: lastName,
-        password: password,
-        recaptcha: recaptchaToken
-      }
+    // Call Service ...
+    props.service.registerNewUser(
+      user,
+      () => history.push("/c/user/registrationSuccess"),
+      (msg) => setErrorMsg(msg)
     );
-
-    await axios.post("http://localhost:8080/service/user",
-      payload,
-      { headers: { 'Content-Type': 'application/json' } }
-    ).then(response => {
-      // All was ok, let's sent to success page ...
-      history.push("/c/user/registrationSuccess");
-    }).catch(error => {
-      // Handle error ...
-      const data = error.response;
-      let errorMsg = intl.formatMessage({ id: "registration.unexpected", defaultMessage: "Unexpected error. Please, try latter." })
-      if (data != null) {
-        let errorMsg = Object.values(data.fieldErrors)[0] as string;
-      }
-      setErrorMsg(errorMsg);
-    });
   }
 
   return (
@@ -107,11 +94,14 @@ const RegistrationForm = () => {
 
 }
 
-const RegistationFormPage = (props: any) => {
+type ServiceProps = {
+  service: Service
+}
+const RegistationFormPage = (props: ServiceProps) => {
   return (
     <div>
       <Header type='only-signin' />
-      <RegistrationForm />
+      <RegistrationForm service={props.service} />
       <Footer />
     </div>
   );
diff --git a/packages/login/src/services/Service.ts b/packages/login/src/services/Service.ts
new file mode 100644
index 00000000..108c77f0
--- /dev/null
+++ b/packages/login/src/services/Service.ts
@@ -0,0 +1,44 @@
+import axios from 'axios'
+type NewUser =
+    {
+        email: string;
+        firstname: string;
+        lastname: string;
+        password: string;
+        recaptcha: string;
+
+    }
+
+interface Service {
+    registerNewUser(user: NewUser, onSuccess: () => void, onError: (msg: string) => void): void;
+}
+
+class RestService implements Service {
+    private baseUrl: string;
+    private authFailed: () => void
+
+    constructor(baseUrl: string, authFailed: () => void) {
+        this.baseUrl = baseUrl;
+    }
+
+     async registerNewUser(user: NewUser, onSuccess: () => void, onError: (msg: string) => void) {
+
+        await axios.post(this.baseUrl + '/service/user',
+            JSON.stringify(user),
+            { headers: { 'Content-Type': 'application/json' } }
+        ).then(response => {
+            // All was ok, let's sent to success page ...
+            onSuccess();
+        }).catch(error => {
+            const data = error.response;
+
+            // let errorMsg = intl.formatMessage({ id: "registration.unexpected", defaultMessage: "Unexpected error. Please, try latter." })
+            let msg = 'Unexpected error. Please, try latter';
+            if (data != null) {
+                msg = Object.values(data.fieldErrors)[0] as string;
+            }
+            onError(msg);
+        });
+    }
+}
+export { Service, RestService, NewUser }
\ No newline at end of file