From 1812d6752df2d2aacd32dfc55dfb9afa3cfe8e2e Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Tue, 11 Feb 2020 17:36:53 +0100
Subject: [PATCH] Handle invalid token error

---
 src/auth/AuthProvider.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/auth/AuthProvider.tsx b/src/auth/AuthProvider.tsx
index 55c11ab4b..ec4c19561 100644
--- a/src/auth/AuthProvider.tsx
+++ b/src/auth/AuthProvider.tsx
@@ -6,6 +6,7 @@ import {
   saveCredentials
 } from "@saleor/utils/credentialsManagement";
 import { MutationFunction, MutationResult } from "react-apollo";
+import { maybe } from "@saleor/misc";
 import { TypedTokenAuthMutation, TypedVerifyTokenMutation } from "./mutations";
 import { TokenAuth, TokenAuthVariables } from "./types/TokenAuth";
 import { User } from "./types/User";
@@ -90,9 +91,13 @@ class AuthProvider extends React.Component<
         );
       }
     } else {
-      if (tokenVerifyOpts.data && tokenVerifyOpts.data.tokenVerify.user) {
-        const user = tokenVerifyOpts.data.tokenVerify.user;
-        this.setState({ user });
+      if (maybe(() => tokenVerifyOpts.data.tokenVerify === null, false)) {
+        this.logout();
+      } else {
+        if (maybe(() => !!tokenVerifyOpts.data.tokenVerify.user, false)) {
+          const user = tokenVerifyOpts.data.tokenVerify.user;
+          this.setState({ user });
+        }
       }
     }
   }