From 07de346be8fb5b04b7e050d4246894ffd0726301 Mon Sep 17 00:00:00 2001
From: "Ng Wing Tat, David" <i@ngwingt.at>
Date: Fri, 4 Nov 2022 04:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20[Register]=20Fix=20sign=20out=20?=
 =?UTF-8?q?if=20quit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../registration-screen/registration-screen.tsx   |  4 ----
 app/screens/sign-in-screen/sign-in-screen.tsx     | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/screens/registration-screen/registration-screen.tsx b/app/screens/registration-screen/registration-screen.tsx
index 371d707f..5932d660 100644
--- a/app/screens/registration-screen/registration-screen.tsx
+++ b/app/screens/registration-screen/registration-screen.tsx
@@ -117,10 +117,6 @@ export class RegistrationScreen extends React.Component<RegistrationScreenProps,
     }
   }
 
-  async componentWillUnmount() {
-    await this.props.userStore.authCore.signOut()
-  }
-
   /**
    * Validate the target input
    */
diff --git a/app/screens/sign-in-screen/sign-in-screen.tsx b/app/screens/sign-in-screen/sign-in-screen.tsx
index c2e51535..5089cb49 100644
--- a/app/screens/sign-in-screen/sign-in-screen.tsx
+++ b/app/screens/sign-in-screen/sign-in-screen.tsx
@@ -36,6 +36,7 @@ import { LoadingScreen } from "../../components/loading-screen"
 
 import { translate } from "../../i18n"
 import { color } from "../../theme"
+import { NavigationEventSubscription } from "react-navigation"
 
 const defaultBgImage = require("./bg.jpg")
 
@@ -68,8 +69,16 @@ export class SignInScreen extends React.Component<SignInScreenProps, SignInScree
     footerYAnim: new Animated.Value(200),
   }
 
+  screenWillFocusSubscription: NavigationEventSubscription
+
   componentDidMount() {
     this._checkNavigationParams()
+    this.screenWillFocusSubscription = this.props.navigation.addListener("willFocus", (payload) => {
+      if ((payload.lastState as any).routeName === "Register") {
+        // Sign out Authcore if users cancel Liker ID registration
+        this.props.userStore.authCore.signOut()
+      }
+    })
     this.reveal()
   }
 
@@ -77,6 +86,12 @@ export class SignInScreen extends React.Component<SignInScreenProps, SignInScree
     this._checkNavigationParams()
   }
 
+  componentWillUnmount() {
+    if (this.screenWillFocusSubscription) {
+      this.screenWillFocusSubscription.remove()
+    }
+  }
+
   private reveal() {
     const duration = 1500
     const easing = Easing.out(Easing.cubic)