@capgo/capacitor-social-login 8.3.4 → 8.3.6

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

@@ -42,6 +42,10 @@ public class OAuth2Provider implements SocialProvider {
     private static final String PREFS_NAME = "CapgoOAuth2ProviderPrefs";
     private static final String PREFS_KEY_PREFIX = "OAuth2Tokens_";
 
+    public interface ActivityLauncher {
+        void launchForResult(Intent intent, int requestCode);
+    }
+
     private final Activity activity;
     private final Context context;
     private final OkHttpClient httpClient;
@@ -51,6 +55,19 @@ public class OAuth2Provider implements SocialProvider {
 
     private PluginCall pendingCall;
     private OAuth2PendingState pendingState;
+    private ActivityLauncher activityLauncher;
+
+    public void setActivityLauncher(ActivityLauncher launcher) {
+        this.activityLauncher = launcher;
+    }
+
+    public PluginCall getPendingCall() {
+        return pendingCall;
+    }
+
+    public void setPendingCall(PluginCall call) {
+        this.pendingCall = call;
+    }
 
     private static class OAuth2ProviderConfig {
 
@@ -461,7 +478,19 @@ public class OAuth2Provider implements SocialProvider {
                     Intent intent = new Intent(activity, OAuth2LoginActivity.class);
                     intent.putExtra(OAuth2LoginActivity.EXTRA_AUTH_URL, builder.build().toString());
                     intent.putExtra(OAuth2LoginActivity.EXTRA_REDIRECT_URL, finalRedirect);
-                    activity.runOnUiThread(() -> activity.startActivityForResult(intent, REQUEST_CODE));
+
+                    activity.runOnUiThread(() -> {
+                        if (activityLauncher != null) {
+                            activityLauncher.launchForResult(intent, REQUEST_CODE);
+                        } else {
+                            Log.w(
+                                LOG_TAG,
+                                "activityLauncher is null — falling back to raw startActivityForResult. " +
+                                    "Activity result routing through Capacitor will not work."
+                            );
+                            activity.startActivityForResult(intent, REQUEST_CODE);
+                        }
+                    });
                 }
 
                 @Override
@@ -621,6 +650,13 @@ public class OAuth2Provider implements SocialProvider {
             return false;
         }
         if (pendingCall == null || pendingState == null) {
+            if (pendingCall != null) {
+                // pendingCall was restored (e.g. via @ActivityCallback after process death)
+                // but pendingState (codeVerifier, state nonce, etc.) was lost. Cannot complete.
+                Log.e(LOG_TAG, "pendingCall present but pendingState is null — login state lost (process death?)");
+                pendingCall.reject("OAuth2 login state was lost (process death). Please retry.");
+                cleanupPending();
+            }
             return true;
         }
 

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

@@ -4,12 +4,14 @@ import android.content.Intent;
 import android.net.Uri;
 import android.util.Base64;
 import android.util.Log;
+import androidx.activity.result.ActivityResult;
 import androidx.browser.customtabs.CustomTabsIntent;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.ActivityCallback;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import ee.forgr.capacitor.social.login.helpers.DependencyAvailabilityChecker;
 import ee.forgr.capacitor.social.login.helpers.SocialProvider;
@@ -22,10 +24,9 @@ import org.json.JSONObject;
 @CapacitorPlugin(name = "SocialLogin")
 public class SocialLoginPlugin extends Plugin {
 
-    private final String pluginVersion = "8.3.4";
+    private final String pluginVersion = "8.3.6";
 
     public static String LOG_TAG = "CapgoSocialLogin";
-
     public HashMap<String, SocialProvider> socialProviderHashMap = new HashMap<>();
 
     private PluginCall openSecureWindowSavedCall;
@@ -174,6 +175,14 @@ public class SocialLoginPlugin extends Plugin {
                     return;
                 }
                 this.socialProviderHashMap.put("oauth2", oauth2Provider);
+                oauth2Provider.setActivityLauncher((intent, requestCode) -> {
+                    PluginCall loginCall = oauth2Provider.getPendingCall();
+                    if (loginCall != null) {
+                        startActivityForResult(loginCall, intent, "handleOAuth2ActivityResult");
+                    } else {
+                        Log.e(LOG_TAG, "OAuth2 activityLauncher fired but pendingCall is null, cannot route result");
+                    }
+                });
             } catch (JSONException e) {
                 call.reject("Failed to initialize OAuth2 provider: " + e.getMessage());
                 return;
@@ -357,6 +366,29 @@ public class SocialLoginPlugin extends Plugin {
         }
     }
 
+    @ActivityCallback
+    private void handleOAuth2ActivityResult(PluginCall call, ActivityResult result) {
+        if (call == null) {
+            Log.e(LOG_TAG, "OAuth2 activity result: saved call is null");
+            return;
+        }
+
+        SocialProvider oauth2Provider = socialProviderHashMap.get("oauth2");
+        if (!(oauth2Provider instanceof OAuth2Provider)) {
+            call.reject("OAuth2 provider not found");
+            return;
+        }
+
+        OAuth2Provider p = (OAuth2Provider) oauth2Provider;
+        if (p.getPendingCall() == null) {
+            p.setPendingCall(call);
+        }
+
+        Intent data = result.getData();
+        int resultCode = result.getResultCode();
+        p.handleActivityResult(OAuth2Provider.REQUEST_CODE, resultCode, data);
+    }
+
     public void handleGoogleLoginIntent(int requestCode, Intent intent) {
         try {
             SocialProvider provider = socialProviderHashMap.get("google");
@@ -387,7 +419,7 @@ public class SocialLoginPlugin extends Plugin {
     protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
         super.handleOnActivityResult(requestCode, resultCode, data);
 
-        Log.d(LOG_TAG, "SocialLoginPlugin.handleOnActivityResult called");
+        Log.d(LOG_TAG, "SocialLoginPlugin.handleOnActivityResult called (legacy fallback path)");
 
         // Handle Facebook login result
         SocialProvider facebookProvider = socialProviderHashMap.get("facebook");

package/ios/Sources/SocialLoginPlugin/OAuth2Provider.swift

@@ -113,14 +113,14 @@ class OAuth2Provider: NSObject {
                 responseType: config["responseType"] as? String ?? "code",
                 pkceEnabled: config["pkceEnabled"] as? Bool ?? true,
                 scope: normalizeScope(config["scope"] ?? config["scopes"]),
-                additionalParameters: config["additionalParameters"] as? [String: String],
+                additionalParameters: (config["additionalParameters"] as? [String: Any]).map { $0.mapValues { "\($0)" } },
                 loginHint: config["loginHint"] as? String,
                 prompt: config["prompt"] as? String,
-                additionalTokenParameters: config["additionalTokenParameters"] as? [String: String],
-                additionalResourceHeaders: config["additionalResourceHeaders"] as? [String: String],
+                additionalTokenParameters: (config["additionalTokenParameters"] as? [String: Any]).map { $0.mapValues { "\($0)" } },
+                additionalResourceHeaders: (config["additionalResourceHeaders"] as? [String: Any]).map { $0.mapValues { "\($0)" } },
                 logoutUrl: (config["logoutUrl"] as? String) ?? (config["endSessionEndpoint"] as? String),
                 postLogoutRedirectUrl: config["postLogoutRedirectUrl"] as? String,
-                additionalLogoutParameters: config["additionalLogoutParameters"] as? [String: String],
+                additionalLogoutParameters: (config["additionalLogoutParameters"] as? [String: Any]).map { $0.mapValues { "\($0)" } },
                 iosPrefersEphemeralWebBrowserSession:
                     (config["iosPrefersEphemeralWebBrowserSession"] as? Bool) ??
                     (config["iosPrefersEphemeralSession"] as? Bool) ??
@@ -228,7 +228,7 @@ class OAuth2Provider: NSObject {
                 let state = payload["state"] as? String ?? UUID().uuidString
                 let codeVerifier = payload["codeVerifier"] as? String ?? self.generateCodeVerifier()
                 let redirect = payload["redirectUrl"] as? String ?? config.redirectUrl
-                let additionalLoginParams = payload["additionalParameters"] as? [String: String]
+                let additionalLoginParams = (payload["additionalParameters"] as? [String: Any]).map { $0.mapValues { "\($0)" } }
 
                 self.currentState = state
                 self.currentCodeVerifier = codeVerifier
@@ -740,8 +740,10 @@ extension OAuth2Provider: ASWebAuthenticationPresentationContextProviding {
 
 private extension Dictionary where Key == String, Value == String {
     func percentEncoded() -> Data? {
-        map { key, value in
-            "\(key.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? key)=\(value.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? value)"
+        var formValueAllowed = CharacterSet.urlQueryAllowed
+        formValueAllowed.remove(charactersIn: "+&=/")
+        return map { key, value in
+            "\(key.addingPercentEncoding(withAllowedCharacters: formValueAllowed) ?? key)=\(value.addingPercentEncoding(withAllowedCharacters: formValueAllowed) ?? value)"
         }
         .joined(separator: "&")
         .data(using: .utf8)

package/ios/Sources/SocialLoginPlugin/SocialLoginPlugin.swift

@@ -16,7 +16,7 @@ import GoogleSignIn
  */
 @objc(SocialLoginPlugin)
 public class SocialLoginPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.3.4"
+    private let pluginVersion: String = "8.3.6"
     public let identifier = "SocialLoginPlugin"
     public let jsName = "SocialLogin"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

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