@capgo/capacitor-social-login 0.0.16 → 0.0.28

package/CapgoCapacitorSocialLogin.podspec

@@ -13,8 +13,8 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
-  s.dependency 'FBSDKCoreKit', '17.1.0'
-  s.dependency 'FBSDKLoginKit', '17.1.0'
+  s.dependency 'FBSDKCoreKit', '17.3.0'
+  s.dependency 'FBSDKLoginKit', '17.3.0'
   s.dependency 'GoogleSignIn', '~> 8.0.0'
   s.dependency 'Alamofire'
   s.swift_version = '5.1'

package/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main"),
         // FBSDKCoreKit and FBSDKLoginKit
-        .package(url: "https://github.com/facebook/facebook-ios-sdk.git", .upToNextMajor(from: "17.2.0")),
+        .package(url: "https://github.com/facebook/facebook-ios-sdk.git", .upToNextMajor(from: "17.3.0")),
         // Add Google Sign-In dependency
         .package(url: "https://github.com/google/GoogleSignIn-iOS.git", .upToNextMajor(from: "8.0.0")),
         // Alamofire
@@ -24,6 +24,7 @@ let package = Package(
             dependencies: [
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
                 .product(name: "Cordova", package: "capacitor-swift-pm"),
+                .product(name: "FacebookCore", package: "facebook-ios-sdk"),
                 .product(name: "FacebookLogin", package: "facebook-ios-sdk"),
                 .product(name: "GoogleSignIn", package: "GoogleSignIn-iOS"),
                 .product(name: "Alamofire", package: "Alamofire")

package/README.md

@@ -24,6 +24,9 @@ npx cap sync
 
 ## Apple
 
+[How to get the credentials](https://github.com/Cap-go/capacitor-social-login/blob/main/docs/setup_apple.md)
+[How to setup redirect url](https://github.com/Cap-go/capacitor-social-login/blob/main/docs/apple_redirect_url.png)
+
 ### Android configuration
 
 For android you need a server to get the callback from the apple login. As we use the web SDK .
@@ -195,6 +198,8 @@ const res = await SocialLogin.login({
 
 ## Google
 
+[How to get the credentials](https://github.com/Cap-go/capacitor-social-login/blob/main/docs/setup_google.md)
+
 ### Android configuration
 
 Directly call the `initialize` method with the `google` provider
@@ -349,11 +354,11 @@ Refresh the access token
 
 #### InitializeOptions
 
-| Prop           | Type                                                    |
-| -------------- | ------------------------------------------------------- |
-| **`facebook`** | <code>{ appId: string; }</code>                         |
-| **`google`**   | <code>{ clientId: string; }</code>                      |
-| **`apple`**    | <code>{ clientId: string; redirectUrl: string; }</code> |
+| Prop           | Type                                                                                     |
+| -------------- | ---------------------------------------------------------------------------------------- |
+| **`facebook`** | <code>{ appId: string; }</code>                                                          |
+| **`google`**   | <code>{ iOSClientId?: string; iOSServerClientId?: string; webclientId?: string; }</code> |
+| **`apple`**    | <code>{ clientId?: string; redirectUrl?: string; }</code>                                |
 
 
 #### LoginResult
@@ -404,7 +409,7 @@ Refresh the access token
 | **`givenName`**         | <code>string \| null</code> |
 | **`familyName`**        | <code>string \| null</code> |
 | **`identityToken`**     | <code>string \| null</code> |
-| **`authorizationCode`** | <code>string</code>         |
+| **`authorizationCode`** | <code>string \| null</code> |
 
 
 #### LoginOptions
@@ -427,17 +432,17 @@ Refresh the access token
 | Prop                     | Type                  | Description                                                                                                                              | Default            | Since |
 | ------------------------ | --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | ----- |
 | **`scopes`**             | <code>string[]</code> | Specifies the scopes required for accessing Google APIs The default is defined in the configuration.                                     |                    |       |
+| **`nonce`**              | <code>string</code>   | Nonce                                                                                                                                    |                    |       |
 | **`grantOfflineAccess`** | <code>boolean</code>  | Set if your application needs to refresh access tokens when the user is not present at the browser. In response use `serverAuthCode` key | <code>false</code> | 3.1.0 |
 
 
 #### AppleProviderOptions
 
-| Prop              | Type                  | Description  |
-| ----------------- | --------------------- | ------------ |
-| **`scopes`**      | <code>string[]</code> | Scopes       |
-| **`redirectURI`** | <code>string</code>   | Redirect URI |
-| **`nonce`**       | <code>string</code>   | Nonce        |
-| **`state`**       | <code>string</code>   | State        |
+| Prop         | Type                  | Description |
+| ------------ | --------------------- | ----------- |
+| **`scopes`** | <code>string[]</code> | Scopes      |
+| **`nonce`**  | <code>string</code>   | Nonce       |
+| **`state`**  | <code>string</code>   | State       |
 
 
 #### isLoggedInOptions

package/android/build.gradle

@@ -56,8 +56,9 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.auth0.android:jwtdecode:2.0.2'
     implementation "androidx.credentials:credentials:1.2.2"
-    implementation "androidx.credentials:credentials-play-services-auth:1.2.2"
+    implementation "androidx.credentials:credentials-play-services-auth:1.3.0"
     implementation "com.google.android.libraries.identity.googleid:googleid:1.1.1"
+    implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.4.0'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

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

@@ -3,7 +3,9 @@ package ee.forgr.capacitor.social.login;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Rect;
@@ -12,6 +14,7 @@ import android.net.Uri;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.webkit.WebResourceRequest;
@@ -20,9 +23,16 @@ import android.webkit.WebViewClient;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import androidx.annotation.NonNull;
+import androidx.browser.customtabs.CustomTabsCallback;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
+import androidx.browser.customtabs.CustomTabsSession;
+import androidx.browser.trusted.TrustedWebActivityIntentBuilder;
 import com.auth0.android.jwt.JWT;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
+import com.google.androidbrowserhelper.trusted.TwaLauncher;
 import ee.forgr.capacitor.social.login.helpers.SocialProvider;
 import java.io.IOException;
 import java.util.Objects;
@@ -45,9 +55,11 @@ public class AppleProvider implements SocialProvider {
   private static final String TOKENURL = "https://appleid.apple.com/auth/token";
   private static final String SHARED_PREFERENCE_NAME =
     "APPLE_LOGIN_Q16ob0k_SHARED_PERF";
+  private static final String APPLE_DATA_PREFERENCE =
+    "APPLE_LOGIN_APPLE_DATA_83b2d6db-17fe-49c9-8c33-e3f5d02f9f84";
 
+  private PluginCall lastcall;
   private String appleAuthURLFull;
-  private Dialog appledialog;
 
   private String idToken;
   private String refreshToken;
@@ -58,6 +70,22 @@ public class AppleProvider implements SocialProvider {
   private final Activity activity;
   private final Context context;
 
+  private CustomTabsClient customTabsClient;
+  private CustomTabsSession currentSession;
+  CustomTabsServiceConnection connection = new CustomTabsServiceConnection() {
+    @Override
+    public void onCustomTabsServiceConnected(
+      @NonNull ComponentName name,
+      CustomTabsClient client
+    ) {
+      customTabsClient = client;
+      client.warmup(0);
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName name) {}
+  };
+
   public AppleProvider(
     String redirectUrl,
     String clientId,
@@ -70,18 +98,71 @@ public class AppleProvider implements SocialProvider {
     this.context = context;
   }
 
-  public void initialize(JSONObject config) {
-    this.idToken = config.optString("idToken", null);
-    this.refreshToken = config.optString("refreshToken", null);
-    this.accessToken = config.optString("accessToken", null);
+  public void initialize() {
+    String data = context
+      .getSharedPreferences(SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE)
+      .getString(APPLE_DATA_PREFERENCE, null);
+
+    if (data == null || data.isEmpty()) {
+      Log.i(SocialLoginPlugin.LOG_TAG, "No data to restore for apple login");
+      return;
+    }
+    try {
+      JSONObject object = new JSONObject(data);
+      String idToken = object.optString("idToken", null);
+      String refreshToken = object.optString("refreshToken", null);
+      String accessToken = object.optString("accessToken", null);
+      AppleProvider.this.idToken = idToken;
+      AppleProvider.this.refreshToken = refreshToken;
+      AppleProvider.this.accessToken = accessToken;
+      Log.i(
+        SocialLoginPlugin.LOG_TAG,
+        String.format("Apple restoreState: %s", object)
+      );
+    } catch (JSONException e) {
+      Log.e(
+        SocialLoginPlugin.LOG_TAG,
+        "Apple restoreState: Failed to parse JSON",
+        e
+      );
+    }
+  }
+
+  public void handleIntent(Intent intent) {
+    // Extract information from the URI
+    Uri data = intent.getData();
+
+    // Data should never be null
+    assert data != null;
+
+    String scheme = data.getScheme(); // "capgo-demo-app"
+    String host = data.getHost(); // "path"
+    String path = data.getPath(); // Additional path segments
+    String query = data.getQuery(); // Query parameters
+
     Log.i(
       SocialLoginPlugin.LOG_TAG,
-      String.format("Apple restoreState: %s", config)
+      String.format(
+        "Recieved apple login intent: %s, %s, %s, %s",
+        scheme,
+        host,
+        path,
+        query
+      )
     );
+
+    handleUrl(data.toString());
+    //    if (data.toString().contains("success=")) {
+    //      this.currentSession.
+    //    }
   }
 
   @Override
   public void login(PluginCall call, JSONObject config) {
+    if (this.lastcall != null) {
+      call.reject("Last call is not null");
+    }
+
     String state = UUID.randomUUID().toString();
     this.appleAuthURLFull = AUTHURL +
     "?client_id=" +
@@ -98,6 +179,7 @@ public class AppleProvider implements SocialProvider {
       return;
     }
 
+    this.lastcall = call;
     call.setKeepAlive(true);
     activity.runOnUiThread(() ->
       setupWebview(context, activity, call, appleAuthURLFull)
@@ -126,7 +208,7 @@ public class AppleProvider implements SocialProvider {
   @Override
   public void getAuthorizationCode(PluginCall call) {
     if (this.idToken != null && !this.idToken.isEmpty()) {
-      call.resolve(new JSObject().put("code", this.idToken));
+      call.resolve(new JSObject().put("jwt", this.idToken));
     } else {
       call.reject("Apple-login not logged in!");
     }
@@ -157,161 +239,131 @@ public class AppleProvider implements SocialProvider {
     call.reject("Not implemented");
   }
 
-  private class AppleWebViewClient extends WebViewClient {
-
-    private final Activity activity;
-    private final String clientId;
-    private final String redirectUrl;
-    private final PluginCall call;
-
-    public AppleWebViewClient(
-      Activity activity,
-      PluginCall call,
-      String redirectUrl,
-      String clientId
-    ) {
-      this.activity = activity;
-      this.redirectUrl = redirectUrl;
-      this.clientId = clientId;
-      this.call = call;
-    }
-
-    @Override
-    public boolean shouldOverrideUrlLoading(
-      WebView view,
-      WebResourceRequest request
-    ) {
-      String url = request.getUrl().toString();
-      if (url.startsWith(redirectUrl)) {
-        handleUrl(url);
-        if (url.contains("success=")) {
-          appledialog.dismiss();
-        }
-        return true;
-      }
-      return false;
-    }
-
-    @Override
-    public void onPageFinished(WebView view, String url) {
-      super.onPageFinished(view, url);
-      Rect displayRectangle = new Rect();
-      Window window = activity.getWindow();
-      window.getDecorView().getWindowVisibleDisplayFrame(displayRectangle);
-      view.setLayoutParams(
-        new android.view.ViewGroup.LayoutParams(
-          android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-          (int) (displayRectangle.height() * 0.9f)
-        )
-      );
-    }
-
-    private void handleUrl(String url) {
-      Uri uri = Uri.parse(url);
-      String success = uri.getQueryParameter("success");
-      if ("true".equals(success)) {
-        String accessToken = uri.getQueryParameter("access_token");
-        if (accessToken != null) {
-          String refreshToken = uri.getQueryParameter("refresh_token");
-          String idToken = uri.getQueryParameter("id_token");
-          try {
-            persistState(idToken, refreshToken, accessToken);
-            call.resolve(new JSObject().put("success", true));
-          } catch (JSONException e) {
-            Log.e(SocialLoginPlugin.LOG_TAG, "Cannot persist state", e);
-            call.reject("Cannot persist state", e);
-          }
-        } else {
-          String appleAuthCode = uri.getQueryParameter("code");
-          String appleClientSecret = uri.getQueryParameter("client_secret");
-          requestForAccessToken(appleAuthCode, appleClientSecret);
+  public void handleUrl(String url) {
+    Uri uri = Uri.parse(url);
+    String success = uri.getQueryParameter("success");
+    if ("true".equals(success)) {
+      String accessToken = uri.getQueryParameter("access_token");
+      if (accessToken != null) {
+        String refreshToken = uri.getQueryParameter("refresh_token");
+        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;
+        } catch (JSONException e) {
+          Log.e(SocialLoginPlugin.LOG_TAG, "Cannot persist state", e);
+          this.lastcall.reject("Cannot persist state", e);
+          this.lastcall = null;
         }
       } else {
-        call.reject("We couldn't get the Auth Code");
+        String appleAuthCode = uri.getQueryParameter("code");
+        String appleClientSecret = uri.getQueryParameter("client_secret");
+        requestForAccessToken(appleAuthCode, appleClientSecret);
       }
+    } else {
+      this.lastcall.reject("We couldn't get the Auth Code");
+      this.lastcall = null;
     }
+  }
 
-    private void requestForAccessToken(String code, String clientSecret) {
-      OkHttpClient client = new OkHttpClient();
-      FormBody formBody = new FormBody.Builder()
-        .add("grant_type", "authorization_code")
-        .add("code", code)
-        .add("redirect_uri", redirectUrl)
-        .add("client_id", clientId)
-        .add("client_secret", clientSecret)
-        .build();
-
-      Request request = new Request.Builder()
-        .url(TOKENURL)
-        .post(formBody)
-        .build();
-
-      client
-        .newCall(request)
-        .enqueue(
-          new Callback() {
-            @Override
-            public void onFailure(@NonNull Call call, @NonNull IOException e) {
-              AppleWebViewClient.this.call.reject("Cannot get access_token", e);
-            }
+  private void requestForAccessToken(String code, String clientSecret) {
+    OkHttpClient client = new OkHttpClient();
+    FormBody formBody = new FormBody.Builder()
+      .add("grant_type", "authorization_code")
+      .add("code", code)
+      .add("redirect_uri", redirectUrl)
+      .add("client_id", clientId)
+      .add("client_secret", clientSecret)
+      .build();
+
+    Request request = new Request.Builder()
+      .url(TOKENURL)
+      .post(formBody)
+      .build();
+
+    client
+      .newCall(request)
+      .enqueue(
+        new Callback() {
+          @Override
+          public void onFailure(@NonNull Call call, @NonNull IOException e) {
+            AppleProvider.this.lastcall.reject("Cannot get access_token", e);
+            AppleProvider.this.lastcall = null;
+          }
 
-            @Override
-            public void onResponse(
-              @NonNull Call call,
-              @NonNull Response response
-            ) throws IOException {
-              try {
-                if (!response.isSuccessful()) throw new IOException(
-                  "Unexpected code " + response
+          @Override
+          public void onResponse(
+            @NonNull Call call,
+            @NonNull Response response
+          ) throws IOException {
+            try {
+              if (!response.isSuccessful()) throw new IOException(
+                "Unexpected code " + response
+              );
+
+              String responseData = Objects.requireNonNull(
+                response.body()
+              ).string();
+              JSONObject jsonObject = (JSONObject) new JSONTokener(
+                responseData
+              ).nextValue();
+              String accessToken = jsonObject.getString("access_token");
+              String refreshToken = jsonObject.getString("refresh_token");
+              String idToken = jsonObject.getString("id_token");
+
+              persistState(idToken, refreshToken, accessToken);
+              AppleProvider.this.lastcall.resolve(
+                  new JSObject()
+                    .put("provider", "apple")
+                    .put("result", new JSObject().put("identityToken", idToken))
                 );
-
-                String responseData = Objects.requireNonNull(
-                  response.body()
-                ).string();
-                JSONObject jsonObject = (JSONObject) new JSONTokener(
-                  responseData
-                ).nextValue();
-                String accessToken = jsonObject.getString("access_token");
-                String refreshToken = jsonObject.getString("refresh_token");
-                String idToken = jsonObject.getString("id_token");
-
-                persistState(idToken, refreshToken, accessToken);
-                AppleWebViewClient.this.call.resolve(
-                    new JSObject().put("success", true)
-                  );
-              } catch (Exception e) {
-                AppleWebViewClient.this.call.reject(
-                    "Cannot get access_token",
-                    e
-                  );
-              } finally {
-                response.close();
-              }
+              AppleProvider.this.lastcall = null;
+            } catch (Exception e) {
+              AppleProvider.this.lastcall.reject("Cannot get access_token", e);
+              AppleProvider.this.lastcall = null;
+            } finally {
+              response.close();
             }
           }
-        );
-    }
+        }
+      );
+  }
 
-    private void persistState(
-      String idToken,
-      String refreshToken,
-      String accessToken
-    ) throws JSONException {
-      JSONObject object = new JSONObject();
-      object.put("idToken", idToken);
-      object.put("refreshToken", refreshToken);
-      object.put("accessToken", accessToken);
+  private void persistState(
+    String idToken,
+    String refreshToken,
+    String accessToken
+  ) throws JSONException {
+    JSONObject object = new JSONObject();
+    object.put("idToken", idToken);
+    object.put("refreshToken", refreshToken);
+    object.put("accessToken", accessToken);
+
+    AppleProvider.this.idToken = idToken;
+    AppleProvider.this.refreshToken = refreshToken;
+    AppleProvider.this.accessToken = accessToken;
+
+    activity
+      .getSharedPreferences(SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE)
+      .edit()
+      .putString(APPLE_DATA_PREFERENCE, object.toString())
+      .apply();
+  }
 
-      AppleProvider.this.idToken = idToken;
-      AppleProvider.this.refreshToken = refreshToken;
-      AppleProvider.this.accessToken = accessToken;
+  public CustomTabsSession getCustomTabsSession() {
+    if (customTabsClient == null) {
+      return null;
+    }
 
-      activity
-        .getSharedPreferences(SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE)
-        .edit()
-        .putString(SHARED_PREFERENCE_NAME, object.toString())
-        .apply();
+    if (currentSession == null) {
+      currentSession = customTabsClient.newSession(new CustomTabsCallback() {});
     }
+    return currentSession;
   }
 
   @SuppressLint("SetJavaScriptEnabled")
@@ -321,56 +373,10 @@ public class AppleProvider implements SocialProvider {
     PluginCall call,
     String url
   ) {
-    this.appledialog = new Dialog(context, R.style.CustomDialogTheme);
-    Window window = appledialog.getWindow();
-    if (window != null) {
-      window.setLayout(
-        WindowManager.LayoutParams.MATCH_PARENT,
-        WindowManager.LayoutParams.MATCH_PARENT
-      );
-      window.setGravity(Gravity.TOP);
-      window.setBackgroundDrawable(new ColorDrawable(Color.WHITE));
-      window.setDimAmount(0.0f);
-    }
-
-    View customView = activity
-      .getLayoutInflater()
-      .inflate(R.layout.dialog_custom_layout, null);
-    WebView webView = customView.findViewById(R.id.webview);
-    ProgressBar progressBar = customView.findViewById(R.id.progress_bar);
-
-    webView.setVerticalScrollBarEnabled(false);
-    webView.setHorizontalScrollBarEnabled(false);
-
-    AppleWebViewClient webViewClient = new AppleWebViewClient(
-      activity,
-      call,
-      this.redirectUrl,
-      this.clientId
-    ) {
-      @Override
-      public void onPageStarted(WebView view, String url, Bitmap favicon) {
-        super.onPageStarted(view, url, favicon);
-        progressBar.setVisibility(View.VISIBLE);
-      }
-
-      @Override
-      public void onPageFinished(WebView view, String url) {
-        super.onPageFinished(view, url);
-        progressBar.setVisibility(View.GONE);
-      }
-    };
-
-    webView.setWebViewClient(webViewClient);
-
-    webView.getSettings().setJavaScriptEnabled(true);
-    webView.loadUrl(url);
-
-    ImageButton closeButton = customView.findViewById(R.id.close_button);
-    closeButton.setOnClickListener(v -> appledialog.dismiss());
-
-    appledialog.setContentView(customView);
+    CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(
+      getCustomTabsSession()
+    );
 
-    appledialog.show();
+    builder.build().launchUrl(context, Uri.parse(url));
   }
 }

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

@@ -51,12 +51,20 @@ public class GoogleProvider implements SocialProvider {
       return;
     }
 
+    String nonce = call.getString("nonce");
+
     // First attempt with setFilterByAuthorizedAccounts(true)
-    GetGoogleIdOption googleIdOptionFiltered = new GetGoogleIdOption.Builder()
-      .setFilterByAuthorizedAccounts(true)
-      .setServerClientId(this.clientId)
-      .setAutoSelectEnabled(true)
-      .build();
+    GetGoogleIdOption.Builder googleIdOptionBuilder =
+      new GetGoogleIdOption.Builder()
+        .setFilterByAuthorizedAccounts(true)
+        .setServerClientId(this.clientId)
+        .setAutoSelectEnabled(true);
+
+    if (nonce != null && !nonce.isEmpty()) {
+      googleIdOptionBuilder.setNonce(nonce);
+    }
+
+    GetGoogleIdOption googleIdOptionFiltered = googleIdOptionBuilder.build();
     GetCredentialRequest filteredRequest = new GetCredentialRequest.Builder()
       .addCredentialOption(googleIdOptionFiltered)
       .build();
@@ -90,10 +98,18 @@ public class GoogleProvider implements SocialProvider {
   }
 
   private void retryWithoutFiltering(PluginCall call) {
-    GetGoogleIdOption googleIdOption = new GetGoogleIdOption.Builder()
-      .setFilterByAuthorizedAccounts(false)
-      .setServerClientId(this.clientId)
-      .build();
+    String nonce = call.getString("nonce");
+
+    GetGoogleIdOption.Builder googleIdOptionBuilder =
+      new GetGoogleIdOption.Builder()
+        .setFilterByAuthorizedAccounts(false)
+        .setServerClientId(this.clientId);
+
+    if (nonce != null && !nonce.isEmpty()) {
+      googleIdOptionBuilder.setNonce(nonce);
+    }
+
+    GetGoogleIdOption googleIdOption = googleIdOptionBuilder.build();
     GetCredentialRequest request = new GetCredentialRequest.Builder()
       .addCredentialOption(googleIdOption)
       .build();

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

@@ -1,6 +1,8 @@
 package ee.forgr.capacitor.social.login;
 
+import android.content.Intent;
 import android.os.Build;
+import android.util.Log;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
@@ -46,7 +48,7 @@ public class SocialLoginPlugin extends Plugin {
         this.getContext()
       );
 
-      appleProvider.initialize(apple);
+      appleProvider.initialize();
       this.socialProviderHashMap.put("apple", appleProvider);
     }
 
@@ -56,7 +58,7 @@ public class SocialLoginPlugin extends Plugin {
         this.getActivity(),
         this.getContext()
       );
-      String googleClientId = google.getString("clientId");
+      String googleClientId = google.getString("webclientId");
       if (googleClientId == null || googleClientId.isEmpty()) {
         call.reject("google.clientId is null or empty");
         return;
@@ -158,4 +160,20 @@ public class SocialLoginPlugin extends Plugin {
     //      call.reject("Unsupported social login provider: " + provider);
     //    }
   }
+
+  public void handleAppleLoginIntent(Intent intent) {
+    try {
+      SocialProvider provider = socialProviderHashMap.get("apple");
+      if (!(provider instanceof AppleProvider)) {
+        Log.e(
+          SocialLoginPlugin.LOG_TAG,
+          "Provider is not an apple provider (could be null)"
+        );
+        return;
+      }
+      ((AppleProvider) provider).handleIntent(intent);
+    } catch (Throwable t) {
+      Log.e(SocialLoginPlugin.LOG_TAG, "Cannot handle apple login intent");
+    }
+  }
 }

package/dist/docs.json

@@ -166,14 +166,14 @@
           "tags": [],
           "docs": "",
           "complexTypes": [],
-          "type": "{ clientId: string; } | undefined"
+          "type": "{ iOSClientId?: string | undefined; iOSServerClientId?: string | undefined; webclientId?: string | undefined; } | undefined"
         },
         {
           "name": "apple",
           "tags": [],
           "docs": "",
           "complexTypes": [],
-          "type": "{ clientId: string; redirectUrl: string; } | undefined"
+          "type": "{ clientId?: string | undefined; redirectUrl?: string | undefined; } | undefined"
         }
       ]
     },
@@ -383,7 +383,7 @@
           "tags": [],
           "docs": "",
           "complexTypes": [],
-          "type": "string"
+          "type": "string | null"
         }
       ]
     },
@@ -468,6 +468,18 @@
           "complexTypes": [],
           "type": "string[] | undefined"
         },
+        {
+          "name": "nonce",
+          "tags": [
+            {
+              "text": "nonce",
+              "name": "description"
+            }
+          ],
+          "docs": "Nonce",
+          "complexTypes": [],
+          "type": "string | undefined"
+        },
         {
           "name": "grantOfflineAccess",
           "tags": [
@@ -505,18 +517,6 @@
           "complexTypes": [],
           "type": "string[] | undefined"
         },
-        {
-          "name": "redirectURI",
-          "tags": [
-            {
-              "text": "redirect URI",
-              "name": "description"
-            }
-          ],
-          "docs": "Redirect URI",
-          "complexTypes": [],
-          "type": "string"
-        },
         {
           "name": "nonce",
           "tags": [

package/dist/esm/definitions.d.ts

@@ -8,22 +8,35 @@ export interface InitializeOptions {
     google?: {
         /**
          * The app's client ID, found and created in the Google Developers Console.
-         * Common for Android or iOS.
-         * The default is defined in the configuration.
+         * For iOS.
          * @example xxxxxx-xxxxxxxxxxxxxxxxxx.apps.googleusercontent.com
          * @since 3.1.0
          */
-        clientId: string;
+        iOSClientId?: string;
+        /**
+         * The app's server client ID, found and created in the Google Developers Console.
+         * For iOS.
+         * @example xxxxxx-xxxxxxxxxxxxxxxxxx.apps.googleusercontent.com
+         * @since 3.1.0
+         */
+        iOSServerClientId?: string;
+        /**
+         * The app's web client ID, found and created in the Google Developers Console.
+         * For Android (and web in the future).
+         * @example xxxxxx-xxxxxxxxxxxxxxxxxx.apps.googleusercontent.com
+         * @since 3.1.0
+         */
+        webclientId?: string;
     };
     apple?: {
         /**
          * Apple Client ID, provided by Apple
          */
-        clientId: string;
+        clientId?: string;
         /**
          * Apple Redirect URL, should be your backend url that is configured in your apple app, only for android
          */
-        redirectUrl: string;
+        redirectUrl?: string;
     };
 }
 export interface FacebookLoginOptions {
@@ -41,6 +54,11 @@ export interface GoogleLoginOptions {
      * @see [Google OAuth2 Scopes](https://developers.google.com/identity/protocols/oauth2/scopes)
      */
     scopes?: string[];
+    /**
+     * Nonce
+     * @description nonce
+     */
+    nonce?: string;
     /**
      * Set if your application needs to refresh access tokens when the user is not present at the browser.
      * In response use `serverAuthCode` key
@@ -68,11 +86,6 @@ export interface AppleProviderOptions {
      * @description select scopes to login with
      */
     scopes?: string[];
-    /**
-     * Redirect URI
-     * @description redirect URI
-     */
-    redirectURI: string;
     /**
      * Nonce
      * @description nonce
@@ -90,7 +103,7 @@ export interface AppleProviderResponse {
     givenName: string | null;
     familyName: string | null;
     identityToken: string | null;
-    authorizationCode: string;
+    authorizationCode: string | null;
 }
 export interface LoginOptions {
     /**

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface InitializeOptions {\n  facebook?: {\n    /**\n     * Facebook App ID, provided by Facebook for web, in mobile it's set in the native files\n     */\n    appId: string;\n  };\n\n  google?: {\n    /**\n     * The app's client ID, found and created in the Google Developers Console.\n     * Common for Android or iOS.\n     * The default is defined in the configuration.\n     * @example xxxxxx-xxxxxxxxxxxxxxxxxx.apps.googleusercontent.com\n     * @since 3.1.0\n     */\n    clientId: string;\n  };\n  apple?: {\n    /**\n     * Apple Client ID, provided by Apple\n     */\n    clientId: string;\n    /**\n     * Apple Redirect URL, should be your backend url that is configured in your apple app, only for android\n     */\n    redirectUrl: string;\n  };\n}\n\nexport interface FacebookLoginOptions {\n  /**\n   * Permissions\n   * @description select permissions to login with\n   */\n  permissions: string[];\n}\n\nexport interface GoogleLoginOptions {\n  /**\n   * Specifies the scopes required for accessing Google APIs\n   * The default is defined in the configuration.\n   * @example [\"profile\", \"email\"]\n   * @see [Google OAuth2 Scopes](https://developers.google.com/identity/protocols/oauth2/scopes)\n   */\n  scopes?: string[];\n\n  /**\n   * Set if your application needs to refresh access tokens when the user is not present at the browser.\n   * In response use `serverAuthCode` key\n   *\n   * @default false\n   * @since 3.1.0\n   * */\n  grantOfflineAccess?: boolean;\n}\n\nexport interface GoogleLoginResponse {\n  accessToken: AccessToken | null;\n  idToken: string | null;\n  profile: {\n    email: string | null;\n    familyName: string | null;\n    givenName: string | null;\n    id: string | null;\n    name: string | null;\n    imageUrl: string | null;\n  };\n}\n\nexport interface AppleProviderOptions {\n  /**\n   * Scopes\n   * @description select scopes to login with\n   */\n  scopes?: string[];\n  /**\n   * Redirect URI\n   * @description redirect URI\n   */\n  redirectURI: string;\n  /**\n   * Nonce\n   * @description nonce\n   */\n  nonce?: string;\n  /**\n   * State\n   * @description state\n   */\n  state?: string;\n}\n\nexport interface AppleProviderResponse {\n  user: string | null;\n  email: string | null;\n  givenName: string | null;\n  familyName: string | null;\n  identityToken: string | null;\n  authorizationCode: string;\n}\n\nexport interface LoginOptions {\n  /**\n   * Provider\n   * @description select provider to login with\n   */\n  provider: \"facebook\" | \"google\" | \"apple\" | \"twitter\";\n  /**\n   * Options\n   * @description payload to login with\n   */\n  options: FacebookLoginOptions | GoogleLoginOptions | AppleProviderOptions;\n}\n\nexport interface LoginResult {\n  /**\n   * Provider\n   * @description select provider to login with\n   */\n  provider: \"facebook\" | \"google\" | \"apple\" | \"twitter\";\n  /**\n   * Payload\n   * @description payload to login with\n   */\n  result: FacebookLoginResponse | GoogleLoginResponse | AppleProviderResponse;\n}\n\nexport interface AccessToken {\n  applicationId?: string;\n  declinedPermissions?: string[];\n  expires?: string;\n  isExpired?: boolean;\n  lastRefresh?: string;\n  permissions?: string[];\n  token: string;\n  userId?: string;\n}\n\nexport interface FacebookLoginResponse {\n  accessToken: AccessToken | null;\n  profile: {\n    fields: readonly string[];\n  };\n}\n\nexport interface AuthorizationCode {\n  /**\n   * Jwt\n   * @description A JSON web token\n   */\n  jwt: string;\n}\n\nexport interface AuthorizationCodeOptions {\n  /**\n   * Provider\n   * @description Provider for the authorization code\n   */\n  provider: \"apple\" | \"google\" | \"facebook\";\n}\n\nexport interface isLoggedInOptions {\n  /**\n   * Provider\n   * @description Provider for the isLoggedIn\n   */\n  provider: \"apple\" | \"google\" | \"facebook\";\n}\n\nexport interface SocialLoginPlugin {\n  /**\n   * Initialize the plugin\n   * @description initialize the plugin with the required options\n   */\n  initialize(options: InitializeOptions): Promise<void>;\n  /**\n   * Login with the selected provider\n   * @description login with the selected provider\n   */\n  login(options: LoginOptions): Promise<LoginResult>;\n  /**\n   * Logout\n   * @description logout the user\n   */\n  logout(options: { provider: \"apple\" | \"google\" | \"facebook\" }): Promise<void>;\n  /**\n   * IsLoggedIn\n   * @description logout the user\n   */\n  isLoggedIn(options: isLoggedInOptions): Promise<{ isLoggedIn: boolean }>;\n\n  /**\n   * Get the current access token\n   * @description get the current access token\n   */\n  getAuthorizationCode(\n    options: AuthorizationCodeOptions,\n  ): Promise<AuthorizationCode>;\n  /**\n   * Refresh the access token\n   * @description refresh the access token\n   */\n  refresh(options: LoginOptions): Promise<void>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface InitializeOptions {\n  facebook?: {\n    /**\n     * Facebook App ID, provided by Facebook for web, in mobile it's set in the native files\n     */\n    appId: string;\n  };\n\n  google?: {\n    /**\n     * The app's client ID, found and created in the Google Developers Console.\n     * For iOS.\n     * @example xxxxxx-xxxxxxxxxxxxxxxxxx.apps.googleusercontent.com\n     * @since 3.1.0\n     */\n    iOSClientId?: string;\n    /**\n     * The app's server client ID, found and created in the Google Developers Console.\n     * For iOS.\n     * @example xxxxxx-xxxxxxxxxxxxxxxxxx.apps.googleusercontent.com\n     * @since 3.1.0\n     */\n    iOSServerClientId?: string;\n    /**\n     * The app's web client ID, found and created in the Google Developers Console.\n     * For Android (and web in the future).\n     * @example xxxxxx-xxxxxxxxxxxxxxxxxx.apps.googleusercontent.com\n     * @since 3.1.0\n     */\n    webclientId?: string;\n  };\n  apple?: {\n    /**\n     * Apple Client ID, provided by Apple\n     */\n    clientId?: string;\n    /**\n     * Apple Redirect URL, should be your backend url that is configured in your apple app, only for android\n     */\n    redirectUrl?: string;\n  };\n}\n\nexport interface FacebookLoginOptions {\n  /**\n   * Permissions\n   * @description select permissions to login with\n   */\n  permissions: string[];\n}\n\nexport interface GoogleLoginOptions {\n  /**\n   * Specifies the scopes required for accessing Google APIs\n   * The default is defined in the configuration.\n   * @example [\"profile\", \"email\"]\n   * @see [Google OAuth2 Scopes](https://developers.google.com/identity/protocols/oauth2/scopes)\n   */\n  scopes?: string[];\n  /**\n   * Nonce\n   * @description nonce\n   */\n  nonce?: string;\n  /**\n   * Set if your application needs to refresh access tokens when the user is not present at the browser.\n   * In response use `serverAuthCode` key\n   *\n   * @default false\n   * @since 3.1.0\n   * */\n  grantOfflineAccess?: boolean;\n}\n\nexport interface GoogleLoginResponse {\n  accessToken: AccessToken | null;\n  idToken: string | null;\n  profile: {\n    email: string | null;\n    familyName: string | null;\n    givenName: string | null;\n    id: string | null;\n    name: string | null;\n    imageUrl: string | null;\n  };\n}\n\nexport interface AppleProviderOptions {\n  /**\n   * Scopes\n   * @description select scopes to login with\n   */\n  scopes?: string[];\n  /**\n   * Nonce\n   * @description nonce\n   */\n  nonce?: string;\n  /**\n   * State\n   * @description state\n   */\n  state?: string;\n}\n\nexport interface AppleProviderResponse {\n  user: string | null;\n  email: string | null;\n  givenName: string | null;\n  familyName: string | null;\n  identityToken: string | null;\n  authorizationCode: string | null;\n}\n\nexport interface LoginOptions {\n  /**\n   * Provider\n   * @description select provider to login with\n   */\n  provider: \"facebook\" | \"google\" | \"apple\" | \"twitter\";\n  /**\n   * Options\n   * @description payload to login with\n   */\n  options: FacebookLoginOptions | GoogleLoginOptions | AppleProviderOptions;\n}\n\nexport interface LoginResult {\n  /**\n   * Provider\n   * @description select provider to login with\n   */\n  provider: \"facebook\" | \"google\" | \"apple\" | \"twitter\";\n  /**\n   * Payload\n   * @description payload to login with\n   */\n  result: FacebookLoginResponse | GoogleLoginResponse | AppleProviderResponse;\n}\n\nexport interface AccessToken {\n  applicationId?: string;\n  declinedPermissions?: string[];\n  expires?: string;\n  isExpired?: boolean;\n  lastRefresh?: string;\n  permissions?: string[];\n  token: string;\n  userId?: string;\n}\n\nexport interface FacebookLoginResponse {\n  accessToken: AccessToken | null;\n  profile: {\n    fields: readonly string[];\n  };\n}\n\nexport interface AuthorizationCode {\n  /**\n   * Jwt\n   * @description A JSON web token\n   */\n  jwt: string;\n}\n\nexport interface AuthorizationCodeOptions {\n  /**\n   * Provider\n   * @description Provider for the authorization code\n   */\n  provider: \"apple\" | \"google\" | \"facebook\";\n}\n\nexport interface isLoggedInOptions {\n  /**\n   * Provider\n   * @description Provider for the isLoggedIn\n   */\n  provider: \"apple\" | \"google\" | \"facebook\";\n}\n\nexport interface SocialLoginPlugin {\n  /**\n   * Initialize the plugin\n   * @description initialize the plugin with the required options\n   */\n  initialize(options: InitializeOptions): Promise<void>;\n  /**\n   * Login with the selected provider\n   * @description login with the selected provider\n   */\n  login(options: LoginOptions): Promise<LoginResult>;\n  /**\n   * Logout\n   * @description logout the user\n   */\n  logout(options: { provider: \"apple\" | \"google\" | \"facebook\" }): Promise<void>;\n  /**\n   * IsLoggedIn\n   * @description logout the user\n   */\n  isLoggedIn(options: isLoggedInOptions): Promise<{ isLoggedIn: boolean }>;\n\n  /**\n   * Get the current access token\n   * @description get the current access token\n   */\n  getAuthorizationCode(\n    options: AuthorizationCodeOptions,\n  ): Promise<AuthorizationCode>;\n  /**\n   * Refresh the access token\n   * @description refresh the access token\n   */\n  refresh(options: LoginOptions): Promise<void>;\n}\n"]}

package/ios/Sources/SocialLoginPlugin/AppleProvider.swift

@@ -76,7 +76,6 @@ extension AppleProviderError: LocalizedError {
 }
 
 class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding {
-    private var clientId: String?
     private var completion: ((Result<AppleProviderResponse, Error>) -> Void)?
 
     // Instance variables
@@ -88,9 +87,10 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
     private let SHARED_PREFERENCE_NAME = "AppleProviderSharedPrefs_0eda2642"
     private var redirectUrl = ""
 
-    func initialize(clientId: String, redirectUrl: String) {
-        self.clientId = clientId
-        self.redirectUrl = redirectUrl
+    func initialize(redirectUrl: String? = nil) {
+        if let redirectUrl = redirectUrl {
+            self.redirectUrl = redirectUrl
+        }
 
         do {
             try retrieveState()
@@ -164,11 +164,6 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
     }
 
     func login(payload: [String: Any], completion: @escaping (Result<AppleProviderResponse, Error>) -> Void) {
-        guard let clientId = clientId else {
-            completion(.failure(NSError(domain: "AppleProvider", code: 0, userInfo: [NSLocalizedDescriptionKey: "Client ID not set"])))
-            return
-        }
-
         self.completion = completion
 
         let appleIDProvider = ASAuthorizationAppleIDProvider()

package/ios/Sources/SocialLoginPlugin/FacebookProvider.swift

@@ -1,5 +1,10 @@
 import Foundation
+
+#if canImport(FBSDKLoginKit)
 import FBSDKLoginKit
+#else
+import FacebookLogin
+#endif
 
 struct FacebookLoginResponse {
     let accessToken: [String: Any]

package/ios/Sources/SocialLoginPlugin/GoogleProvider.swift

@@ -5,12 +5,13 @@ class GoogleProvider {
     var configuration: GIDConfiguration!
     var forceAuthCode: Bool = false
     var additionalScopes: [String]!
+    var defaultGrantedScopes = ["email", "profile", "openid"]
 
-    func initialize(clientId: String) {
-        let serverClientId = getServerClientIdValue()
+    func initialize(clientId: String, serverClientId: String? = nil) {
         configuration = GIDConfiguration(clientID: clientId, serverClientID: serverClientId)
 
-        let defaultGrantedScopes = ["email", "profile", "openid"]
+        GIDSignIn.sharedInstance.configuration = configuration
+
         additionalScopes = []
 
         forceAuthCode = false
@@ -35,7 +36,7 @@ class GoogleProvider {
                 GIDSignIn.sharedInstance.signIn(
                     withPresenting: presentingVc,
                     hint: nil,
-                    additionalScopes: self.additionalScopes
+                    additionalScopes: payload["scopes"] as? [String] ?? self.defaultGrantedScopes
                 ) { result, error in
                     if let error = error {
                         completion(.failure(error))

package/ios/Sources/SocialLoginPlugin/SocialLoginPlugin.swift

@@ -37,16 +37,25 @@ public class SocialLoginPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         if let googleSettings = call.getObject("google") {
-            if let googleClientId = googleSettings["clientId"] as? String {
-                google.initialize(clientId: googleClientId)
+            let iOSClientId = googleSettings["iOSClientId"] as? String
+            let iOSServerClientId = googleSettings["iOSServerClientId"] as? String
+
+            if let clientId = iOSClientId {
+                if let serverClientId = iOSServerClientId {
+                    google.initialize(clientId: clientId, serverClientId: serverClientId)
+                } else {
+                    google.initialize(clientId: clientId, serverClientId: nil)
+                }
                 initialized = true
             }
         }
 
         if let appleSettings = call.getObject("apple") {
-            if let appleClientId = appleSettings["clientId"] as? String,
-               let redirectUrl = appleSettings["redirectUrl"] as? String {
-                apple.initialize(clientId: appleClientId, redirectUrl: redirectUrl)
+            if let redirectUrl = appleSettings["redirectUrl"] as? String {
+                apple.initialize(redirectUrl: redirectUrl)
+                initialized = true
+            } else {
+                apple.initialize()
                 initialized = true
             }
         }

package/package.json

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