fix: resolve authentication state regressions, restore google sign in

Author: javamonn

packages/android/app/src/main/java/io/literal/model/User.java

@@ -157,10 +157,13 @@ public String getIdentityId() {
 
     public String getEncodedIdentityId() {
         String encodedIdentityId = identityId;
-        try {
-            encodedIdentityId = URLEncoder.encode(identityId, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            ErrorRepository.captureException(e);
+
+        if (identityId != null) {
+            try {
+                encodedIdentityId = URLEncoder.encode(identityId, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                ErrorRepository.captureException(e);
+            }
         }
         return encodedIdentityId;
     }

packages/android/app/src/main/java/io/literal/ui/fragment/AppWebView.java

@@ -1,12 +1,10 @@
 package io.literal.ui.fragment;
 
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,21 +17,16 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.amazonaws.mobile.client.results.Tokens;
 import com.amazonaws.services.cognitoidentityprovider.model.NotAuthorizedException;
 import com.amazonaws.services.cognitoidentityprovider.model.UserNotFoundException;
 import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException;
-import com.apollographql.apollo.json.JsonDataException;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
-import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 
 import io.literal.BuildConfig;
@@ -46,7 +39,6 @@
 import io.literal.repository.AnalyticsRepository;
 import io.literal.repository.ErrorRepository;
 import io.literal.repository.SharedPreferencesRepository;
-import io.literal.ui.MainApplication;
 import io.literal.viewmodel.AppWebViewViewModel;
 import io.literal.viewmodel.AuthenticationViewModel;
 
@@ -103,12 +95,16 @@ private void handleSignInGoogle(io.literal.ui.view.AppWebView view) {
             authenticationViewModel.signInGoogle(getActivity(), (e, user) -> {
                 if (e != null) {
                     ErrorRepository.captureException(e);
-                    return;
                 }
 
                 try {
                     JSONObject result = new JSONObject();
-                    result.put("user", user);
+                    if (e == null && !user.isSignedOut()) {
+                        result.put("user", user.toJSON());
+                    } else {
+                        String errorCode = "SIGN_IN_FAILED";
+                        result.put("error", errorCode);
+                    }
 
                     getActivity().runOnUiThread(() -> view.postWebEvent(
                             new WebEvent(WebEvent.TYPE_AUTH_SIGN_IN_GOOGLE_RESULT, UUID.randomUUID().toString(), result)

packages/web/src/Containers/Containers_AnnotationCollectionHeader/Containers_AnnotationCollectionHeader.re

@@ -91,7 +91,7 @@ let make =
     <MaterialUi.IconButton
       size=`Small
       edge=MaterialUi.IconButton.Edge._end
-      onClick={_ =>
+      onClick={_ => {
         switch (annotation, identityId) {
         | (Some(annotation), Some(identityId)) =>
           let _ =
@@ -100,8 +100,8 @@ let make =
             );
           handleDelete(~annotation, ~identityId);
         | _ => ()
-        }
-      }
+        };
+      }}
       _TouchRippleProps={
         "classes": {
           "child": cn(["bg-white"]),

packages/web/src/components/Svg/more.svg

@@ -13,6 +13,26 @@ let apiOrigin =
   Env.amplifyEnv === "production"
     ? "https://literal.io" : "https://staging.literal.io";
 
+let resetPasswordUrl =
+  AwsAmplify.Config.(
+    "https://"
+    ++ awsAmplifyConfig->oauthGet->domainGet
+    ++ "/forgotPassword?"
+    ++ Webapi.Url.URLSearchParams.(
+         makeWithArray([|
+           ("client_id", awsAmplifyConfig->userPoolsWebClientIdGet),
+           ("response_type", awsAmplifyConfig->oauthGet->responseTypeGet),
+           (
+             "scope",
+             awsAmplifyConfig->oauthGet->scopeGet->Js.Array2.joinWith("+"),
+           ),
+           ("redirect_uri", awsAmplifyConfig->oauthGet->redirectSignInGet),
+         |])
+         ->toString
+         ->Js.Global.decodeURIComponent
+       )
+  );
+
 %raw
 {|
   const domains = awsAmplifyConfig.oauth.redirectSignIn.split(",")

packages/web/src/constants.re

@@ -1,34 +1,5 @@
 open Styles;
 
-let resetPasswordUrl =
-  AwsAmplify.Config.(
-    "https://"
-    ++ Constants.awsAmplifyConfig->oauthGet->domainGet
-    ++ "/forgotPassword?"
-    ++ Webapi.Url.URLSearchParams.(
-         makeWithArray([|
-           ("client_id", Constants.awsAmplifyConfig->userPoolsWebClientIdGet),
-           (
-             "response_type",
-             Constants.awsAmplifyConfig->oauthGet->responseTypeGet,
-           ),
-           (
-             "scope",
-             Constants.awsAmplifyConfig
-             ->oauthGet
-             ->scopeGet
-             ->Js.Array2.joinWith("+"),
-           ),
-           (
-             "redirect_uri",
-             Constants.awsAmplifyConfig->oauthGet->redirectSignInGet,
-           ),
-         |])
-         ->toString
-         ->Js.Global.decodeURIComponent
-       )
-  );
-
 [@react.component]
 let default = () => {
   let Providers_Authentication.{user} =
@@ -63,7 +34,7 @@ let default = () => {
                 ),
               )
             );
-          | (SignedInUser({identityId}), Some(_)) =>
+          | (SignedInUser(_), Some(_)) =>
             setIsAuthenticating(_ => false);
             let _ =
               Webview.(
@@ -77,24 +48,6 @@ let default = () => {
       [|user|],
     );
 
-  let handleAuthenticateGoogle = () => {
-    setIsMenuOpen(_ => false);
-    setIsAuthenticating(_ => true);
-    let didPostMessage =
-      Webview.(postMessage(WebEvent.make(~type_="AUTH_SIGN_IN_GOOGLE", ())));
-
-    let _ =
-      if (!didPostMessage) {
-        AwsAmplify.Auth.(
-          federatedSignInWithOptions(
-            inst,
-            {provider: "Google", customState: None},
-          )
-        );
-      };
-    ();
-  };
-
   let handleToggleIsMenuOpen = () => setIsMenuOpen(open_ => !open_);
 
   <main
@@ -147,7 +100,7 @@ let default = () => {
               (),
             )}>
             <a
-              href=resetPasswordUrl
+              href=Constants.resetPasswordUrl
               className={Cn.fromList(["flex", "flex-1", "items-center"])}>
               {React.string("Reset Password")}
             </a>
@@ -167,14 +120,6 @@ let default = () => {
               </a>
             </Next.Link>
           </MaterialUi.MenuItem>
-          <MaterialUi.MenuItem
-            classes={MaterialUi.MenuItem.Classes.make(
-              ~root=Cn.fromList(["font-sans"]),
-              (),
-            )}
-            onClick={_ => handleAuthenticateGoogle()}>
-            {React.string("Sign in with Google")}
-          </MaterialUi.MenuItem>
         </MaterialUi.Menu>
       </MaterialUi.NoSsr>
     </div>