@capgo/capacitor-social-login 0.0.49 → 0.0.50

package/README.md

@@ -75,22 +75,6 @@ const res = await SocialLogin.login({
 
 ### Android configuration
 
-In file `android/app/src/main/AndroidManifest.xml`, add the following XML elements under `<manifest><application>` :
-
-```xml
-<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
-<meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/facebook_client_token"/>
-```
-
-In file `android/app/src/main/res/values/strings.xml` add the following lines :
-
-```xml
-<string name="facebook_app_id">[APP_ID]</string>
-<string name="facebook_client_token">[CLIENT_TOKEN]</string>
-```
-
-Don't forget to replace `[APP_ID]` and `[CLIENT_TOKEN]` by your Facebook application Id.
-
 More information can be found here: https://developers.facebook.com/docs/android/getting-started
 
 Then call the `initialize` method with the `facebook` provider
@@ -99,6 +83,7 @@ Then call the `initialize` method with the `facebook` provider
 await SocialLogin.initialize({
   facebook: {
     appId: 'your-app-id',
+    clientToken: 'your-client-token',
   },
 });
 const res = await SocialLogin.login({

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

@@ -8,12 +8,16 @@ import com.facebook.AccessToken;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
+import com.facebook.FacebookSdk;
 import com.facebook.GraphRequest;
 import com.facebook.GraphResponse;
+import com.facebook.login.LoginBehavior;
 import com.facebook.login.LoginManager;
 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;
@@ -26,72 +30,99 @@ public class FacebookProvider implements SocialProvider {
 
   private Activity activity;
   private CallbackManager callbackManager;
+  private PluginCall savedCall;
 
   public FacebookProvider(Activity activity) {
     this.activity = activity;
   }
 
-  public void initialize(JSONObject _config) {
-    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);
-          }
-        }
-      );
+  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);
+                }
+            });
+    } catch (JSONException e) {
+        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) {
+    this.savedCall = call;
     try {
-      Collection<String> permissions = JsonHelper.jsonArrayToList(
-        config.getJSONArray("permissions")
-      );
-      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", accessToken.getToken());
-              result.put("userId", accessToken.getUserId());
-              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());
-            }
-          }
+        Collection<String> permissions = JsonHelper.jsonArrayToList(
+            config.getJSONArray("permissions")
         );
-      LoginManager.getInstance().logIn(activity, 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("authenticationToken", loginResult.getAuthenticationToken() != null ? loginResult.getAuthenticationToken().getToken() : null);
+                    // TODO: Fetch profile information and add it to the result
+                    savedCall.resolve(result);
+                }
+
+                @Override
+                public void onCancel() {
+                    Log.d(LOG_TAG, "LoginManager.onCancel");
+                    savedCall.reject("Login cancelled");
+                }
+
+                @Override
+                public void onError(FacebookException exception) {
+                    Log.e(LOG_TAG, "LoginManager.onError", exception);
+                    savedCall.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);
+        }
     } catch (JSONException e) {
-      call.reject("Invalid permissions format");
+        savedCall.reject("Invalid login options format");
     }
   }
 
@@ -170,6 +201,23 @@ public class FacebookProvider implements SocialProvider {
     int resultCode,
     Intent data
   ) {
-    return callbackManager.onActivityResult(requestCode, resultCode, data);
+    Log.d(LOG_TAG, "FacebookProvider.handleOnActivityResult called");
+    if (callbackManager != null) {
+        return callbackManager.onActivityResult(requestCode, resultCode, data);
+    }
+    return false;
+  }
+
+  private JSObject createAccessTokenObject(AccessToken accessToken) {
+    JSObject tokenObject = new JSObject();
+    tokenObject.put("applicationId", accessToken.getApplicationId());
+    tokenObject.put("declinedPermissions", new JSArray(accessToken.getDeclinedPermissions()));
+    tokenObject.put("expires", accessToken.getExpires().getTime());
+    tokenObject.put("isExpired", accessToken.isExpired());
+    tokenObject.put("lastRefresh", accessToken.getLastRefresh().getTime());
+    tokenObject.put("permissions", new JSArray(accessToken.getPermissions()));
+    tokenObject.put("token", accessToken.getToken());
+    tokenObject.put("userId", accessToken.getUserId());
+    return tokenObject;
   }
 }

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

@@ -69,11 +69,24 @@ public class SocialLoginPlugin extends Plugin {
 
     JSObject facebook = call.getObject("facebook");
     if (facebook != null) {
-      FacebookProvider facebookProvider = new FacebookProvider(
-        this.getActivity()
-      );
-      facebookProvider.initialize(new JSONObject());
-      this.socialProviderHashMap.put("facebook", facebookProvider);
+      String facebookAppId = facebook.getString("appId");
+      String facebookClientToken = facebook.getString("clientToken");
+      if (facebookAppId == null || facebookAppId.isEmpty()) {
+        call.reject("facebook.appId is null or empty");
+        return;
+      }
+      if (facebookClientToken == null || facebookClientToken.isEmpty()) {
+        call.reject("facebook.clientToken is null or empty");
+        return;
+      }
+      FacebookProvider facebookProvider = new FacebookProvider(this.getActivity());
+      try {
+        facebookProvider.initialize(facebook);
+        this.socialProviderHashMap.put("facebook", facebookProvider);
+      } catch (Exception e) {
+        call.reject("Failed to initialize Facebook provider: " + e.getMessage());
+        return;
+      }
     }
 
     call.resolve();
@@ -176,4 +189,24 @@ public class SocialLoginPlugin extends Plugin {
       Log.e(SocialLoginPlugin.LOG_TAG, "Cannot handle apple login intent");
     }
   }
+
+  @Override
+  protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
+    super.handleOnActivityResult(requestCode, resultCode, data);
+    
+    Log.d(LOG_TAG, "SocialLoginPlugin.handleOnActivityResult called");
+    
+    // Handle Facebook login result
+    SocialProvider facebookProvider = socialProviderHashMap.get("facebook");
+    if (facebookProvider instanceof FacebookProvider) {
+        boolean handled = ((FacebookProvider) facebookProvider).handleOnActivityResult(requestCode, resultCode, data);
+        if (handled) {
+            Log.d(LOG_TAG, "Facebook activity result handled");
+            return;
+        }
+    }
+    
+    // Handle other providers' activity results if needed
+    Log.d(LOG_TAG, "Activity result not handled by any provider");
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-social-login",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "description": "All social logins in one plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",