implementato logout

giuseppe16180 · Jan 6, 2020 · f93b432 · f93b432
1 parent 042eac4
commit f93b432
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 3 deletions.
diff --git a/src/App.js b/src/App.js
@@ -14,7 +14,7 @@ import OrdersHistory from "./Components/OrdersHistory";
 import Order from "./Components/Order";
 import Reservation from "./Components/Reservation";
 import RestaurantHome from "./Components/RestaurantHome";
-import RestOrder from "./Components/RestOrder";
+// import RestOrder from "./Components/RestOrder";
 
 
 class App extends React.Component {
@@ -50,9 +50,9 @@ class App extends React.Component {
         <Route path="/Order">
           <Order />
         </Route>
-        <Route path="/RestOrder">
+        {/* <Route path="/RestOrder">
           <RestOrder />
-        </Route>
+        </Route> */}
         <Route path="/Reservation">
           <Reservation />
         </Route>

diff --git a/src/Components/Cart.js b/src/Components/Cart.js
@@ -74,6 +74,12 @@ class Cart extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
 

diff --git a/src/Components/CheckOut.js b/src/Components/CheckOut.js
@@ -134,6 +134,12 @@ class CheckOut extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
 

diff --git a/src/Components/CustomerHome.js b/src/Components/CustomerHome.js
@@ -65,6 +65,10 @@ class CustomerHome extends React.Component {
                 onPress={this.provider.navigateOrders}
               />
               <Button text={"il tuo profilo 👤"} />
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+              />
             </View>
           )}
         </HeaderCard>

diff --git a/src/Components/Order.js b/src/Components/Order.js
@@ -80,6 +80,12 @@ class Order extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
         <Card>

diff --git a/src/Components/OrdersHistory.js b/src/Components/OrdersHistory.js
@@ -63,6 +63,12 @@ class OrderHistory extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
         <Card>

diff --git a/src/Components/Reservation.js b/src/Components/Reservation.js
@@ -78,6 +78,12 @@ class Reservation extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
         <Card>

diff --git a/src/Components/RestaurantHome.js b/src/Components/RestaurantHome.js
@@ -54,6 +54,12 @@ class RestaurantHome extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
         <Card>

diff --git a/src/Components/RestaurantMenu.js b/src/Components/RestaurantMenu.js
@@ -93,6 +93,12 @@ class RestaurantMenu extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
         {/*BODY*/}

diff --git a/src/Components/Search.js b/src/Components/Search.js
@@ -71,6 +71,12 @@ class Search extends React.Component {
                 onPress={this.provider.navigateCustomerProfile}
               />
             )}
+            {!this.provider.isGuest() && (
+              <Button 
+                text={"Logout"}
+                onPress={this.provider.doLogout}
+            />
+            )}
           </View>
         </HeaderCard>
 

diff --git a/src/DataProvider.js b/src/DataProvider.js
@@ -127,6 +127,35 @@ class DataProvider {
     });
   };
 
+  doLogout = () =>
+  {
+    console.debug("DataProvider", "doLogout");
+    const data = {
+      value: this.token
+    };
+
+    return new Promise((resolve, reject) => {
+      this.doPost("/logout", data)
+        .then(response => {
+          if (response != null)
+          {
+            sessionStorage.clear();
+            this.navigateLogin();
+          }
+          else {
+            reject("NoResults");
+          }
+        })
+        .catch(error => {
+          console.error(error);
+          if (error === "NoResults")
+            reject("Riprova più tardi.");
+          else
+            reject("FailedToFetch");
+        });
+    });
+  };
+
   doSearch(query) {
     console.debug("DataProvider", "doSearch");
 
@@ -205,6 +234,10 @@ class DataProvider {
     window.location.href = "CustomerProfile";
   }
 
+  navigateLogin() {
+    window.location.href = "Login";
+  }
+
   doAddToCart(menuEntryId) {
     console.debug("doAddToCart", menuEntryId);
     const data = {