Merge pull request #23 from michaelburch/master

fixes for google authentication flow
GSingh01 · Sep 12, 2020 · a7d881f · a7d881f
2 parents 24362d1 + f8e7692
commit a7d881f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/LoginView.js b/src/LoginView.js
@@ -64,7 +64,7 @@ export default class LoginView extends PureComponent {
     const result = adService.getLoginFlowResult(navState.url);
     if (
       result.requestType === RequestType.Ignore ||
-      result.requestType === RequestType.Code ||
+      result.requestType === RequestType.Code && !navState.loading ||
       result.requestType === RequestType.PasswordReset ||
       result.requestType === RequestType.Cancelled
     ) {
@@ -129,7 +129,7 @@ export default class LoginView extends PureComponent {
 
     return (
       <WebView
-        userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:61.0) Gecko/20100101 Firefox/61.0"
+        userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 Safari/605.1.15"
         incognito
         {...rest}
         originWhitelist={["*"]} // refer: https://github.com/facebook/react-native/issues/20917

diff --git a/tests/LoginView.test.js b/tests/LoginView.test.js
@@ -199,6 +199,11 @@ describe("LoginView", () => {
         var result = instance.onShouldStartLoadWithRequest({ url: "" });
         expect(result).toBe(false);
       });
+
+      test("returns true", () => {
+        var result = instance.onShouldStartLoadWithRequest({ url: "", loading: true });
+        expect(result).toBe(true);
+      });
     });
 
     describe("RequestType.PasswordReset", () => {

diff --git a/tests/__snapshots__/LoginView.test.js.snap b/tests/__snapshots__/LoginView.test.js.snap
@@ -29,7 +29,7 @@ exports[`LoginView renders correctly when loaded 1`] = `
   startInLoadingState={true}
   tenant="TestTenant"
   useSharedProcessPool={true}
-  userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:61.0) Gecko/20100101 Firefox/61.0"
+  userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 Safari/605.1.15"
 />
 `;