@capgo/capacitor-social-login 0.0.57 → 0.0.64

package/README.md

@@ -390,14 +390,12 @@ Refresh the access token
 
 #### AppleProviderResponse
 
-| Prop                    | Type                        |
-| ----------------------- | --------------------------- |
-| **`user`**              | <code>string \| null</code> |
-| **`email`**             | <code>string \| null</code> |
-| **`givenName`**         | <code>string \| null</code> |
-| **`familyName`**        | <code>string \| null</code> |
-| **`identityToken`**     | <code>string \| null</code> |
-| **`authorizationCode`** | <code>string \| null</code> |
+| Prop                    | Type                                                                                                         |
+| ----------------------- | ------------------------------------------------------------------------------------------------------------ |
+| **`accessToken`**       | <code><a href="#accesstoken">AccessToken</a> \| null</code>                                                  |
+| **`profile`**           | <code>{ user: string; email: string \| null; givenName: string \| null; familyName: string \| null; }</code> |
+| **`idToken`**           | <code>string \| null</code>                                                                                  |
+| **`authorizationCode`** | <code>string \| null</code>                                                                                  |
 
 
 #### LoginOptions

package/android/src/main/java/ee/forgr/capacitor/social/login/AppleProvider.java

@@ -43,13 +43,15 @@ import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
 
 public class AppleProvider implements SocialProvider {
 
-  private static final String SCOPE = "name%20email";
+  private static final String LOG_TAG = "AppleProvider";
+  private static final String DEFAULT_SCOPE = "name%20email";
   private static final String AUTHURL =
     "https://appleid.apple.com/auth/authorize";
   private static final String TOKENURL = "https://appleid.apple.com/auth/token";
@@ -164,13 +166,27 @@ public class AppleProvider implements SocialProvider {
     }
 
     String state = UUID.randomUUID().toString();
+
+    // Extract scopes from config
+    String scopes = DEFAULT_SCOPE;
+    if (config.has("scopes")) {
+      try {
+        JSONArray scopesArray = config.getJSONArray("scopes");
+        if (scopesArray.length() > 0) {
+          scopes = String.join("%20", toStringArray(scopesArray));
+        }
+      } catch (JSONException e) {
+        Log.e(SocialLoginPlugin.LOG_TAG, "Error parsing scopes", e);
+      }
+    }
+
     this.appleAuthURLFull = AUTHURL +
     "?client_id=" +
     this.clientId +
     "&redirect_uri=" +
     this.redirectUrl +
     "&response_type=code&scope=" +
-    SCOPE +
+    scopes +
     "&response_mode=form_post&state=" +
     state;
 
@@ -229,11 +245,6 @@ public class AppleProvider implements SocialProvider {
     }
   }
 
-  @Override
-  public void getCurrentUser(PluginCall call) {
-    call.reject("Not implemented");
-  }
-
   @Override
   public void refresh(PluginCall call) {
     call.reject("Not implemented");
@@ -249,16 +260,20 @@ public class AppleProvider implements SocialProvider {
         String idToken = uri.getQueryParameter("id_token");
         try {
           persistState(idToken, refreshToken, accessToken);
-          this.lastcall.resolve(
-              new JSObject()
-                .put("provider", "apple")
-                .put("result", new JSObject().put("identityToken", idToken))
-            );
-          this.lastcall = null;
+          JSObject result = new JSObject();
+          result.put("accessToken", createAccessTokenObject(accessToken));
+          result.put("profile", createProfileObject(idToken));
+          result.put("idToken", idToken);
+          result.put("authorizationCode", ""); // Apple doesn't provide this in the response
+
+          JSObject response = new JSObject();
+          response.put("provider", "apple");
+          response.put("result", result);
+
+          this.lastcall.resolve(response);
         } catch (JSONException e) {
           Log.e(SocialLoginPlugin.LOG_TAG, "Cannot persist state", e);
           this.lastcall.reject("Cannot persist state", e);
-          this.lastcall = null;
         }
       } else {
         String appleAuthCode = uri.getQueryParameter("code");
@@ -267,8 +282,8 @@ public class AppleProvider implements SocialProvider {
       }
     } else {
       this.lastcall.reject("We couldn't get the Auth Code");
-      this.lastcall = null;
     }
+    this.lastcall = null;
   }
 
   private void requestForAccessToken(String code, String clientSecret) {
@@ -379,4 +394,43 @@ public class AppleProvider implements SocialProvider {
 
     builder.build().launchUrl(context, Uri.parse(url));
   }
+
+  private JSObject createAccessTokenObject(String accessToken) {
+    JSObject tokenObject = new JSObject();
+    tokenObject.put("token", accessToken);
+    // Add other fields if available
+    return tokenObject;
+  }
+
+  private JSObject createProfileObject(String idToken) {
+    JSObject profileObject = new JSObject();
+    // Parse the ID token to extract user information
+    // This is a simplified example. In practice, you should properly decode and verify the JWT.
+    String[] parts = idToken.split("\\.");
+    if (parts.length == 3) {
+      try {
+        String payload = new String(
+          android.util.Base64.decode(parts[1], android.util.Base64.URL_SAFE)
+        );
+        JSONObject claims = new JSONObject(payload);
+        profileObject.put("user", claims.optString("sub"));
+        profileObject.put("email", claims.optString("email"));
+        // Apple doesn't provide given name and family name in the ID token
+        profileObject.put("givenName", JSONObject.NULL);
+        profileObject.put("familyName", JSONObject.NULL);
+      } catch (JSONException e) {
+        Log.e(LOG_TAG, "Error parsing ID token", e);
+      }
+    }
+    return profileObject;
+  }
+
+  // Helper method to convert JSONArray to String array
+  private String[] toStringArray(JSONArray array) throws JSONException {
+    String[] stringArray = new String[array.length()];
+    for (int i = 0; i < array.length(); i++) {
+      stringArray[i] = array.getString(i);
+    }
+    return stringArray;
+  }
 }

package/android/src/main/java/ee/forgr/capacitor/social/login/FacebookProvider.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import androidx.activity.result.ActivityResultRegistryOwner;
 import com.facebook.AccessToken;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
@@ -17,7 +18,6 @@ import com.facebook.login.LoginResult;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
-import androidx.activity.result.ActivityResultRegistryOwner;
 import ee.forgr.capacitor.social.login.helpers.JsonHelper;
 import ee.forgr.capacitor.social.login.helpers.SocialProvider;
 import java.util.Collection;
@@ -37,90 +37,117 @@ public class FacebookProvider implements SocialProvider {
 
   public void initialize(JSONObject config) {
     try {
-        // Set Facebook App ID
-        String facebookAppId = config.getString("appId");
-        FacebookSdk.setApplicationId(facebookAppId);
-        
-        // Set Facebook Client Token
-        String facebookClientToken = config.getString("clientToken");
-        FacebookSdk.setClientToken(facebookClientToken);
-        
-        // Initialize Facebook SDK
-        FacebookSdk.sdkInitialize(activity.getApplicationContext());
-        
-        this.callbackManager = CallbackManager.Factory.create();
-
-        LoginManager.getInstance().registerCallback(callbackManager,
-            new FacebookCallback<LoginResult>() {
-                @Override
-                public void onSuccess(LoginResult loginResult) {
-                    Log.d(LOG_TAG, "LoginManager.onSuccess");
-                }
-
-                @Override
-                public void onCancel() {
-                    Log.d(LOG_TAG, "LoginManager.onCancel");
-                }
-
-                @Override
-                public void onError(FacebookException exception) {
-                    Log.e(LOG_TAG, "LoginManager.onError", exception);
-                }
-            });
+      // Set Facebook App ID
+      String facebookAppId = config.getString("appId");
+      FacebookSdk.setApplicationId(facebookAppId);
+
+      // Set Facebook Client Token
+      String facebookClientToken = config.getString("clientToken");
+      FacebookSdk.setClientToken(facebookClientToken);
+
+      // Initialize Facebook SDK
+      FacebookSdk.sdkInitialize(activity.getApplicationContext());
+
+      this.callbackManager = CallbackManager.Factory.create();
+
+      LoginManager.getInstance()
+        .registerCallback(
+          callbackManager,
+          new FacebookCallback<LoginResult>() {
+            @Override
+            public void onSuccess(LoginResult loginResult) {
+              Log.d(LOG_TAG, "LoginManager.onSuccess");
+            }
+
+            @Override
+            public void onCancel() {
+              Log.d(LOG_TAG, "LoginManager.onCancel");
+            }
+
+            @Override
+            public void onError(FacebookException exception) {
+              Log.e(LOG_TAG, "LoginManager.onError", exception);
+            }
+          }
+        );
     } catch (JSONException e) {
-        Log.e(LOG_TAG, "Error initializing Facebook SDK", e);
-        throw new RuntimeException("Failed to initialize Facebook SDK: " + e.getMessage());
+      Log.e(LOG_TAG, "Error initializing Facebook SDK", e);
+      throw new RuntimeException(
+        "Failed to initialize Facebook SDK: " + e.getMessage()
+      );
     }
   }
 
   @Override
   public void login(PluginCall call, JSONObject config) {
     try {
-        Collection<String> permissions = JsonHelper.jsonArrayToList(
-            config.getJSONArray("permissions")
+      Collection<String> permissions = JsonHelper.jsonArrayToList(
+        config.getJSONArray("permissions")
+      );
+      boolean limitedLogin = config.optBoolean("limitedLogin", false);
+      String nonce = config.optString("nonce", "");
+
+      LoginManager.getInstance()
+        .registerCallback(
+          callbackManager,
+          new FacebookCallback<LoginResult>() {
+            @Override
+            public void onSuccess(LoginResult loginResult) {
+              Log.d(LOG_TAG, "LoginManager.onSuccess");
+              AccessToken accessToken = loginResult.getAccessToken();
+              JSObject result = new JSObject();
+              result.put("accessToken", createAccessTokenObject(accessToken));
+              result.put("profile", createProfileObject(accessToken));
+              result.put(
+                "authenticationToken",
+                loginResult.getAuthenticationToken() != null
+                  ? loginResult.getAuthenticationToken().getToken()
+                  : null
+              );
+
+              JSObject response = new JSObject();
+              response.put("provider", "facebook");
+              response.put("result", result);
+
+              call.resolve(response);
+            }
+
+            @Override
+            public void onCancel() {
+              Log.d(LOG_TAG, "LoginManager.onCancel");
+              call.reject("Login cancelled");
+            }
+
+            @Override
+            public void onError(FacebookException exception) {
+              Log.e(LOG_TAG, "LoginManager.onError", exception);
+              call.reject(exception.getMessage());
+            }
+          }
         );
-        boolean limitedLogin = config.optBoolean("limitedLogin", false);
-        String nonce = config.optString("nonce", "");
-
-        LoginManager.getInstance().registerCallback(callbackManager,
-            new FacebookCallback<LoginResult>() {
-                @Override
-                public void onSuccess(LoginResult loginResult) {
-                    Log.d(LOG_TAG, "LoginManager.onSuccess");
-                    AccessToken accessToken = loginResult.getAccessToken();
-                    JSObject result = new JSObject();
-                    result.put("accessToken", createAccessTokenObject(accessToken));
-                    result.put("authenticationToken", loginResult.getAuthenticationToken() != null ? loginResult.getAuthenticationToken().getToken() : null);
-                    // TODO: Fetch profile information and add it to the result
-                    call.resolve(result);
-                }
-
-                @Override
-                public void onCancel() {
-                    Log.d(LOG_TAG, "LoginManager.onCancel");
-                    call.reject("Login cancelled");
-                }
-
-                @Override
-                public void onError(FacebookException exception) {
-                    Log.e(LOG_TAG, "LoginManager.onError", exception);
-                    call.reject(exception.getMessage());
-                }
-            });
-
-        LoginManager loginManager = LoginManager.getInstance();
-        if (limitedLogin) {
-            Log.w(LOG_TAG, "Limited login is not available for Android");
-        }
-        
-        loginManager.setLoginBehavior(LoginBehavior.NATIVE_WITH_FALLBACK);
-        if (!nonce.isEmpty()) {
-            loginManager.logIn((ActivityResultRegistryOwner) activity, callbackManager, permissions, nonce);
-        } else {
-            loginManager.logIn((ActivityResultRegistryOwner) activity, callbackManager, permissions);
-        }
+
+      LoginManager loginManager = LoginManager.getInstance();
+      if (limitedLogin) {
+        Log.w(LOG_TAG, "Limited login is not available for Android");
+      }
+
+      loginManager.setLoginBehavior(LoginBehavior.NATIVE_WITH_FALLBACK);
+      if (!nonce.isEmpty()) {
+        loginManager.logIn(
+          (ActivityResultRegistryOwner) activity,
+          callbackManager,
+          permissions,
+          nonce
+        );
+      } else {
+        loginManager.logIn(
+          (ActivityResultRegistryOwner) activity,
+          callbackManager,
+          permissions
+        );
+      }
     } catch (JSONException e) {
-        call.reject("Invalid login options format");
+      call.reject("Invalid login options format");
     }
   }
 
@@ -149,45 +176,6 @@ public class FacebookProvider implements SocialProvider {
     );
   }
 
-  @Override
-  public void getCurrentUser(PluginCall call) {
-    AccessToken accessToken = AccessToken.getCurrentAccessToken();
-    if (accessToken == null) {
-      call.reject(
-        "You're not logged in. Call FacebookLogin.login() first to obtain an access token."
-      );
-      return;
-    }
-
-    if (accessToken.isExpired()) {
-      call.reject("AccessToken is expired.");
-      return;
-    }
-
-    GraphRequest graphRequest = GraphRequest.newMeRequest(
-      accessToken,
-      new GraphRequest.GraphJSONObjectCallback() {
-        @Override
-        public void onCompleted(JSONObject object, GraphResponse response) {
-          if (response.getError() != null) {
-            call.reject(response.getError().getErrorMessage());
-          } else {
-            try {
-              call.resolve(JSObject.fromJSONObject(object));
-            } catch (JSONException e) {
-              call.reject("Error parsing user data: " + e.getMessage());
-            }
-          }
-        }
-      }
-    );
-
-    Bundle parameters = new Bundle();
-    parameters.putString("fields", "id,name,email");
-    graphRequest.setParameters(parameters);
-    graphRequest.executeAsync();
-  }
-
   @Override
   public void refresh(PluginCall call) {
     // Not implemented for Facebook
@@ -201,7 +189,7 @@ public class FacebookProvider implements SocialProvider {
   ) {
     Log.d(LOG_TAG, "FacebookProvider.handleOnActivityResult called");
     if (callbackManager != null) {
-        return callbackManager.onActivityResult(requestCode, resultCode, data);
+      return callbackManager.onActivityResult(requestCode, resultCode, data);
     }
     return false;
   }
@@ -209,7 +197,10 @@ public class FacebookProvider implements SocialProvider {
   private JSObject createAccessTokenObject(AccessToken accessToken) {
     JSObject tokenObject = new JSObject();
     tokenObject.put("applicationId", accessToken.getApplicationId());
-    tokenObject.put("declinedPermissions", new JSArray(accessToken.getDeclinedPermissions()));
+    tokenObject.put(
+      "declinedPermissions",
+      new JSArray(accessToken.getDeclinedPermissions())
+    );
     tokenObject.put("expires", accessToken.getExpires().getTime());
     tokenObject.put("isExpired", accessToken.isExpired());
     tokenObject.put("lastRefresh", accessToken.getLastRefresh().getTime());
@@ -218,4 +209,41 @@ public class FacebookProvider implements SocialProvider {
     tokenObject.put("userId", accessToken.getUserId());
     return tokenObject;
   }
+
+  private JSObject createProfileObject(AccessToken accessToken) {
+    JSObject profileObject = new JSObject();
+    GraphRequest request = GraphRequest.newMeRequest(
+      accessToken,
+      new GraphRequest.GraphJSONObjectCallback() {
+        @Override
+        public void onCompleted(JSONObject object, GraphResponse response) {
+          if (response.getError() != null) {
+            Log.e(
+              LOG_TAG,
+              "Error fetching profile",
+              response.getError().getException()
+            );
+          } else {
+            profileObject.put("userID", object.optString("id", ""));
+            profileObject.put("email", object.optString("email", ""));
+            profileObject.put("name", object.optString("name", ""));
+
+            JSONObject pictureObject = object.optJSONObject("picture");
+            if (pictureObject != null) {
+              JSONObject dataObject = pictureObject.optJSONObject("data");
+              if (dataObject != null) {
+                profileObject.put("imageURL", dataObject.optString("url", ""));
+              }
+            }
+            // Add other fields as needed
+          }
+        }
+      }
+    );
+    Bundle parameters = new Bundle();
+    parameters.putString("fields", "id,name,email,picture.type(large)");
+    request.setParameters(parameters);
+    request.executeAndWait();
+    return profileObject;
+  }
 }

package/android/src/main/java/ee/forgr/capacitor/social/login/GoogleProvider.java

@@ -3,8 +3,8 @@ package ee.forgr.capacitor.social.login;
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
-import android.util.Log;
 import android.text.TextUtils;
+import android.util.Log;
 import androidx.credentials.ClearCredentialStateRequest;
 import androidx.credentials.Credential;
 import androidx.credentials.CredentialManager;
@@ -19,19 +19,18 @@ import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
 import com.google.android.gms.auth.GoogleAuthException;
 import com.google.android.gms.auth.GoogleAuthUtil;
-import com.google.android.libraries.identity.googleid.GetGoogleIdOption;
 import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption;
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential;
 import ee.forgr.capacitor.social.login.helpers.SocialProvider;
 import java.io.IOException;
+import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
 
 public class GoogleProvider implements SocialProvider {
 
@@ -91,7 +90,7 @@ public class GoogleProvider implements SocialProvider {
     }
 
     String nonce = call.getString("nonce");
-    
+
     // Extract scopes from the config
     JSONArray scopesArray = config.optJSONArray("scopes");
     if (scopesArray != null) {
@@ -101,7 +100,7 @@ public class GoogleProvider implements SocialProvider {
       }
     } else {
       // Default scopes if not provided
-      this.scopes = new String[]{"profile", "email"};
+      this.scopes = new String[] { "profile", "email" };
     }
 
     GetSignInWithGoogleOption.Builder googleIdOptionBuilder =
@@ -111,7 +110,8 @@ public class GoogleProvider implements SocialProvider {
       googleIdOptionBuilder.setNonce(nonce);
     }
 
-    GetSignInWithGoogleOption googleIdOptionFiltered = googleIdOptionBuilder.build();
+    GetSignInWithGoogleOption googleIdOptionFiltered =
+      googleIdOptionBuilder.build();
     GetCredentialRequest filteredRequest = new GetCredentialRequest.Builder()
       .addCredentialOption(googleIdOptionFiltered)
       .build();
@@ -178,37 +178,43 @@ public class GoogleProvider implements SocialProvider {
 
           // Use ExecutorService to retrieve the access token
           ExecutorService executor = Executors.newSingleThreadExecutor();
-          Future<AccessToken> future = executor.submit(new Callable<AccessToken>() {
-            @Override
-            public AccessToken call() throws Exception {
-              return getAccessToken(googleIdTokenCredential);
+          Future<AccessToken> future = executor.submit(
+            new Callable<AccessToken>() {
+              @Override
+              public AccessToken call() throws Exception {
+                return getAccessToken(googleIdTokenCredential);
+              }
             }
-          });
-
-          executor.execute(new Runnable() {
-            @Override
-            public void run() {
-              try {
-                AccessToken accessToken = future.get();
-                if (accessToken != null) {
-                  JSObject accessTokenObj = new JSObject();
-                  accessTokenObj.put("token", accessToken.token);
-                  accessTokenObj.put("userId", accessToken.userId);
-
-                  resultObj.put("accessToken", accessTokenObj);
-                  resultObj.put("profile", user);
-                  response.put("result", resultObj);
-                  call.resolve(response);
-                } else {
-                  call.reject("Failed to get access token");
+          );
+
+          executor.execute(
+            new Runnable() {
+              @Override
+              public void run() {
+                try {
+                  AccessToken accessToken = future.get();
+                  if (accessToken != null) {
+                    JSObject accessTokenObj = new JSObject();
+                    accessTokenObj.put("token", accessToken.token);
+                    accessTokenObj.put("userId", accessToken.userId);
+
+                    resultObj.put("accessToken", accessTokenObj);
+                    resultObj.put("profile", user);
+                    response.put("result", resultObj);
+                    call.resolve(response);
+                  } else {
+                    call.reject("Failed to get access token");
+                  }
+                } catch (Exception e) {
+                  call.reject(
+                    "Error retrieving access token: " + e.getMessage()
+                  );
+                } finally {
+                  executor.shutdown();
                 }
-              } catch (Exception e) {
-                call.reject("Error retrieving access token: " + e.getMessage());
-              } finally {
-                executor.shutdown();
               }
             }
-          });
+          );
 
           return; // The call will be resolved in the Runnable
         }
@@ -329,44 +335,6 @@ public class GoogleProvider implements SocialProvider {
     );
   }
 
-  @Override
-  public void getCurrentUser(PluginCall call) {
-    GetGoogleIdOption googleIdOption = new GetGoogleIdOption.Builder()
-      .setFilterByAuthorizedAccounts(true)
-      .setServerClientId(this.clientId)
-      .build();
-    GetCredentialRequest request = new GetCredentialRequest.Builder()
-      .addCredentialOption(googleIdOption)
-      .build();
-
-    Executor executor = Executors.newSingleThreadExecutor();
-    credentialManager.getCredentialAsync(
-      context,
-      request,
-      null,
-      executor,
-      new CredentialManagerCallback<
-        GetCredentialResponse,
-        GetCredentialException
-      >() {
-        @Override
-        public void onResult(GetCredentialResponse result) {
-          try {
-            JSObject user = handleSignInResult(result);
-            call.resolve(user);
-          } catch (JSONException e) {
-            call.reject("Error creating user object: " + e.getMessage());
-          }
-        }
-
-        @Override
-        public void onError(GetCredentialException e) {
-          call.reject("No current user: " + e.getMessage());
-        }
-      }
-    );
-  }
-
   @Override
   public void refresh(PluginCall call) {
     // Implement refresh logic here
@@ -374,6 +342,7 @@ public class GoogleProvider implements SocialProvider {
   }
 
   private static class AccessToken {
+
     String token;
     String userId;
     // Add other fields as needed (expires, isExpired, etc.)