@capgo/capacitor-social-login 0.0.71 → 0.0.76

package/README.md

@@ -233,6 +233,7 @@ const res = await SocialLogin.login({
 * [`getAuthorizationCode(...)`](#getauthorizationcode)
 * [`refresh(...)`](#refresh)
 * [Interfaces](#interfaces)
+* [Type Aliases](#type-aliases)
 
 </docgen-index>
 
@@ -257,16 +258,16 @@ Initialize the plugin
 ### login(...)
 
 ```typescript
-login(options: LoginOptions) => Promise<LoginResult>
+login<T extends "apple" | "google" | "facebook">(options: Extract<LoginOptions, { provider: T; }>) => Promise<{ provider: T; result: ProviderResponseMap[T]; }>
 ```
 
 Login with the selected provider
 
-| Param         | Type                                                  |
-| ------------- | ----------------------------------------------------- |
-| **`options`** | <code><a href="#loginoptions">LoginOptions</a></code> |
+| Param         | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **`options`** | <code><a href="#extract">Extract</a>&lt;{ provider: 'facebook'; options: <a href="#facebookloginoptions">FacebookLoginOptions</a>; }, { provider: T; }&gt; \| <a href="#extract">Extract</a>&lt;{ provider: 'google'; options: <a href="#googleloginoptions">GoogleLoginOptions</a>; }, { provider: T; }&gt; \| <a href="#extract">Extract</a>&lt;{ provider: 'apple'; options: <a href="#appleprovideroptions">AppleProviderOptions</a>; }, { provider: T; }&gt;</code> |
 
-**Returns:** <code>Promise&lt;<a href="#loginresult">LoginResult</a>&gt;</code>
+**Returns:** <code>Promise&lt;{ provider: T; result: ProviderResponseMap[T]; }&gt;</code>
 
 --------------------
 
@@ -281,7 +282,7 @@ Logout
 
 | Param         | Type                                                          |
 | ------------- | ------------------------------------------------------------- |
-| **`options`** | <code>{ provider: 'facebook' \| 'google' \| 'apple'; }</code> |
+| **`options`** | <code>{ provider: 'apple' \| 'google' \| 'facebook'; }</code> |
 
 --------------------
 
@@ -347,14 +348,6 @@ Refresh the access token
 | **`apple`**    | <code>{ clientId?: string; redirectUrl?: string; }</code>                                |
 
 
-#### LoginResult
-
-| Prop           | Type                                                                                                                                                                                            | Description |
-| -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
-| **`provider`** | <code>'facebook' \| 'google' \| 'apple' \| 'twitter'</code>                                                                                                                                     | Provider    |
-| **`result`**   | <code><a href="#facebookloginresponse">FacebookLoginResponse</a> \| <a href="#googleloginresponse">GoogleLoginResponse</a> \| <a href="#appleproviderresponse">AppleProviderResponse</a></code> | Payload     |
-
-
 #### FacebookLoginResponse
 
 | Prop              | Type                                                                                                                                                                                                                                                                                                                                                            |
@@ -397,14 +390,6 @@ Refresh the access token
 | **`profile`**     | <code>{ user: string; email: string \| null; givenName: string \| null; familyName: string \| null; }</code> |
 
 
-#### LoginOptions
-
-| Prop           | Type                                                                                                                                                                                      | Description |
-| -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
-| **`provider`** | <code>'facebook' \| 'google' \| 'apple' \| 'twitter'</code>                                                                                                                               | Provider    |
-| **`options`**  | <code><a href="#facebookloginoptions">FacebookLoginOptions</a> \| <a href="#googleloginoptions">GoogleLoginOptions</a> \| <a href="#appleprovideroptions">AppleProviderOptions</a></code> | Options     |
-
-
 #### FacebookLoginOptions
 
 | Prop               | Type                  | Description      | Default            |
@@ -416,12 +401,11 @@ Refresh the access token
 
 #### GoogleLoginOptions
 
-| 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> | 0.0.69 |
-| **`newUI`**              | <code>boolean</code>  | New UI                                                                                                                                   | <code>false</code> | 0.1.0  |
+| 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. it will add offline_access to the scopes In response use `serverAuthCode` key | <code>false</code> | 0.0.69 |
 
 
 #### AppleProviderOptions
@@ -437,7 +421,7 @@ Refresh the access token
 
 | Prop           | Type                                           | Description |
 | -------------- | ---------------------------------------------- | ----------- |
-| **`provider`** | <code>'facebook' \| 'google' \| 'apple'</code> | Provider    |
+| **`provider`** | <code>'apple' \| 'google' \| 'facebook'</code> | Provider    |
 
 
 #### AuthorizationCode
@@ -451,6 +435,26 @@ Refresh the access token
 
 | Prop           | Type                                           | Description |
 | -------------- | ---------------------------------------------- | ----------- |
-| **`provider`** | <code>'facebook' \| 'google' \| 'apple'</code> | Provider    |
+| **`provider`** | <code>'apple' \| 'google' \| 'facebook'</code> | Provider    |
+
+
+### Type Aliases
+
+
+#### ProviderResponseMap
+
+<code>{ facebook: <a href="#facebookloginresponse">FacebookLoginResponse</a>; google: <a href="#googleloginresponse">GoogleLoginResponse</a>; apple: <a href="#appleproviderresponse">AppleProviderResponse</a>; }</code>
+
+
+#### LoginOptions
+
+<code>{ provider: "facebook"; options: <a href="#facebookloginoptions">FacebookLoginOptions</a>; } | { provider: "google"; options: <a href="#googleloginoptions">GoogleLoginOptions</a>; } | { provider: "apple"; options: <a href="#appleprovideroptions">AppleProviderOptions</a>; }</code>
+
+
+#### Extract
+
+<a href="#extract">Extract</a> from T those types that are assignable to U
+
+<code>T extends U ? T : never</code>
 
 </docgen-api>

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

@@ -11,7 +11,6 @@ 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;
@@ -21,6 +20,7 @@ import com.getcapacitor.PluginCall;
 import ee.forgr.capacitor.social.login.helpers.JsonHelper;
 import ee.forgr.capacitor.social.login.helpers.SocialProvider;
 import java.util.Collection;
+import java.util.concurrent.CountDownLatch;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -212,38 +212,48 @@ public class FacebookProvider implements SocialProvider {
 
   private JSObject createProfileObject(AccessToken accessToken) {
     JSObject profileObject = new JSObject();
+    CountDownLatch latch = new CountDownLatch(1);
+
     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", ""));
-              }
+      (object, 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
           }
         }
+        latch.countDown();
       }
     );
+
     Bundle parameters = new Bundle();
     parameters.putString("fields", "id,name,email,picture.type(large)");
     request.setParameters(parameters);
-    request.executeAndWait();
+
+    new Thread(() -> {
+      request.executeAndWait();
+    }).start();
+
+    try {
+      latch.await();
+    } catch (InterruptedException e) {
+      Log.e(LOG_TAG, "Interrupted while waiting for profile fetch", e);
+    }
+
     return profileObject;
   }
 }

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

@@ -23,6 +23,8 @@ 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.HashSet;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
@@ -93,6 +95,18 @@ public class GoogleProvider implements SocialProvider {
 
     // Extract scopes from the config
     JSONArray scopesArray = config.optJSONArray("scopes");
+    boolean grantOfflineAccess = config.optBoolean("grantOfflineAccess", false);
+    if (grantOfflineAccess) {
+      scopesArray.put("offline_access");
+    }
+    // Remove duplicates from scopes array
+    if (scopesArray != null) {
+        Set<String> uniqueScopes = new HashSet<>();
+        for (int i = 0; i < scopesArray.length(); i++) {
+            uniqueScopes.add(scopesArray.optString(i));
+        }
+        scopesArray = new JSONArray(uniqueScopes);
+    }
     if (scopesArray != null) {
       this.scopes = new String[scopesArray.length()];
       for (int i = 0; i < scopesArray.length(); i++) {
@@ -103,77 +117,40 @@ public class GoogleProvider implements SocialProvider {
       this.scopes = new String[] { "profile", "email" };
     }
 
-    if (config.optBoolean("newUI", false)) {
-      GetSignInWithGoogleOption.Builder googleIdOptionBuilder =
-        new GetSignInWithGoogleOption.Builder(this.clientId);
+    GetSignInWithGoogleOption.Builder googleIdOptionBuilder =
+      new GetSignInWithGoogleOption.Builder(this.clientId);
 
-      if (nonce != null && !nonce.isEmpty()) {
-        googleIdOptionBuilder.setNonce(nonce);
-      }
+    if (nonce != null && !nonce.isEmpty()) {
+      googleIdOptionBuilder.setNonce(nonce);
+    }
 
-      GetSignInWithGoogleOption googleIdOptionFiltered =
-        googleIdOptionBuilder.build();
-      GetCredentialRequest filteredRequest = new GetCredentialRequest.Builder()
-        .addCredentialOption(googleIdOptionFiltered)
-        .build();
-
-      Executor executor = Executors.newSingleThreadExecutor();
-      credentialManager.getCredentialAsync(
-        context,
-        filteredRequest,
-        null,
-        executor,
-        new CredentialManagerCallback<
-          GetCredentialResponse,
-          GetCredentialException
-        >() {
-          @Override
-          public void onResult(GetCredentialResponse result) {
-            handleSignInResult(result, call);
-          }
-
-          @Override
-          public void onError(GetCredentialException e) {
-            handleSignInError(e, call);
-          }
-        }
-      );
-    } else {
-      GetSignInWithGoogleOption.Builder googleIdOptionBuilder =
-        new GetSignInWithGoogleOption.Builder(this.clientId);
+    GetSignInWithGoogleOption googleIdOptionFiltered =
+      googleIdOptionBuilder.build();
+    GetCredentialRequest filteredRequest = new GetCredentialRequest.Builder()
+      .addCredentialOption(googleIdOptionFiltered)
+      .build();
 
-      if (nonce != null && !nonce.isEmpty()) {
-        googleIdOptionBuilder.setNonce(nonce);
-      }
+    Executor executor = Executors.newSingleThreadExecutor();
+    credentialManager.getCredentialAsync(
+      context,
+      filteredRequest,
+      null,
+      executor,
+      new CredentialManagerCallback<
+        GetCredentialResponse,
+        GetCredentialException
+      >() {
+        @Override
+        public void onResult(GetCredentialResponse result) {
+          handleSignInResult(result, call);
+        }
 
-      GetSignInWithGoogleOption googleIdOptionFiltered =
-        googleIdOptionBuilder.build();
-      GetCredentialRequest filteredRequest = new GetCredentialRequest.Builder()
-        .addCredentialOption(googleIdOptionFiltered)
-        .build();
-
-      Executor executor = Executors.newSingleThreadExecutor();
-      credentialManager.getCredentialAsync(
-        context,
-        filteredRequest,
-        null,
-        executor,
-        new CredentialManagerCallback<
-          GetCredentialResponse,
-          GetCredentialException
-        >() {
-          @Override
-          public void onResult(GetCredentialResponse result) {
-            handleSignInResult(result, call);
-          }
-
-          @Override
-          public void onError(GetCredentialException e) {
-            handleSignInError(e, call);
-          }
+        @Override
+        public void onError(GetCredentialException e) {
+          handleSignInError(e, call);
         }
-      );
-    }
+      }
+    );
   }
 
   private void persistState(String idToken) throws JSONException {

package/dist/docs.json

@@ -30,15 +30,15 @@
       },
       {
         "name": "login",
-        "signature": "(options: LoginOptions) => Promise<LoginResult>",
+        "signature": "<T extends \"apple\" | \"google\" | \"facebook\">(options: Extract<LoginOptions, { provider: T; }>) => Promise<{ provider: T; result: ProviderResponseMap[T]; }>",
         "parameters": [
           {
             "name": "options",
             "docs": "",
-            "type": "LoginOptions"
+            "type": "Extract<{ provider: 'facebook'; options: FacebookLoginOptions; }, { provider: T; }> | Extract<{ provider: 'google'; options: GoogleLoginOptions; }, { provider: T; }> | Extract<{ provider: 'apple'; options: AppleProviderOptions; }, { provider: T; }>"
           }
         ],
-        "returns": "Promise<LoginResult>",
+        "returns": "Promise<{ provider: T; result: ProviderResponseMap[T]; }>",
         "tags": [
           {
             "name": "description",
@@ -47,8 +47,10 @@
         ],
         "docs": "Login with the selected provider",
         "complexTypes": [
-          "LoginResult",
-          "LoginOptions"
+          "T",
+          "ProviderResponseMap",
+          "LoginOptions",
+          "Extract"
         ],
         "slug": "login"
       },
@@ -59,7 +61,7 @@
           {
             "name": "options",
             "docs": "",
-            "type": "{ provider: 'facebook' | 'google' | 'apple'; }"
+            "type": "{ provider: 'apple' | 'google' | 'facebook'; }"
           }
         ],
         "returns": "Promise<void>",
@@ -177,43 +179,6 @@
         }
       ]
     },
-    {
-      "name": "LoginResult",
-      "slug": "loginresult",
-      "docs": "",
-      "tags": [],
-      "methods": [],
-      "properties": [
-        {
-          "name": "provider",
-          "tags": [
-            {
-              "text": "select provider to login with",
-              "name": "description"
-            }
-          ],
-          "docs": "Provider",
-          "complexTypes": [],
-          "type": "'facebook' | 'google' | 'apple' | 'twitter'"
-        },
-        {
-          "name": "result",
-          "tags": [
-            {
-              "text": "payload to login with",
-              "name": "description"
-            }
-          ],
-          "docs": "Payload",
-          "complexTypes": [
-            "FacebookLoginResponse",
-            "GoogleLoginResponse",
-            "AppleProviderResponse"
-          ],
-          "type": "FacebookLoginResponse | GoogleLoginResponse | AppleProviderResponse"
-        }
-      ]
-    },
     {
       "name": "FacebookLoginResponse",
       "slug": "facebookloginresponse",
@@ -382,43 +347,6 @@
         }
       ]
     },
-    {
-      "name": "LoginOptions",
-      "slug": "loginoptions",
-      "docs": "",
-      "tags": [],
-      "methods": [],
-      "properties": [
-        {
-          "name": "provider",
-          "tags": [
-            {
-              "text": "select provider to login with",
-              "name": "description"
-            }
-          ],
-          "docs": "Provider",
-          "complexTypes": [],
-          "type": "'facebook' | 'google' | 'apple' | 'twitter'"
-        },
-        {
-          "name": "options",
-          "tags": [
-            {
-              "text": "payload to login with",
-              "name": "description"
-            }
-          ],
-          "docs": "Options",
-          "complexTypes": [
-            "FacebookLoginOptions",
-            "GoogleLoginOptions",
-            "AppleProviderOptions"
-          ],
-          "type": "FacebookLoginOptions | GoogleLoginOptions | AppleProviderOptions"
-        }
-      ]
-    },
     {
       "name": "FacebookLoginOptions",
       "slug": "facebookloginoptions",
@@ -515,27 +443,7 @@
               "name": "since"
             }
           ],
-          "docs": "Set if your application needs to refresh access tokens when the user is not present at the browser.\nIn response use `serverAuthCode` key",
-          "complexTypes": [],
-          "type": "boolean | undefined"
-        },
-        {
-          "name": "newUI",
-          "tags": [
-            {
-              "text": "use new UI for Google login",
-              "name": "description"
-            },
-            {
-              "text": "false",
-              "name": "default"
-            },
-            {
-              "text": "0.1.0",
-              "name": "since"
-            }
-          ],
-          "docs": "New UI",
+          "docs": "Set if your application needs to refresh access tokens when the user is not present at the browser. it will add offline_access to the scopes\nIn response use `serverAuthCode` key",
           "complexTypes": [],
           "type": "boolean | undefined"
         }
@@ -607,7 +515,7 @@
           ],
           "docs": "Provider",
           "complexTypes": [],
-          "type": "'facebook' | 'google' | 'apple'"
+          "type": "'apple' | 'google' | 'facebook'"
         }
       ]
     },
@@ -649,12 +557,67 @@
           ],
           "docs": "Provider",
           "complexTypes": [],
-          "type": "'facebook' | 'google' | 'apple'"
+          "type": "'apple' | 'google' | 'facebook'"
         }
       ]
     }
   ],
   "enums": [],
-  "typeAliases": [],
+  "typeAliases": [
+    {
+      "name": "ProviderResponseMap",
+      "slug": "providerresponsemap",
+      "docs": "",
+      "types": [
+        {
+          "text": "{\n  facebook: FacebookLoginResponse;\n  google: GoogleLoginResponse;\n  apple: AppleProviderResponse;\n}",
+          "complexTypes": [
+            "FacebookLoginResponse",
+            "GoogleLoginResponse",
+            "AppleProviderResponse"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "LoginOptions",
+      "slug": "loginoptions",
+      "docs": "",
+      "types": [
+        {
+          "text": "{\n      provider: \"facebook\";\n      options: FacebookLoginOptions;\n    }",
+          "complexTypes": [
+            "FacebookLoginOptions"
+          ]
+        },
+        {
+          "text": "{\n      provider: \"google\";\n      options: GoogleLoginOptions;\n    }",
+          "complexTypes": [
+            "GoogleLoginOptions"
+          ]
+        },
+        {
+          "text": "{\n      provider: \"apple\";\n      options: AppleProviderOptions;\n    }",
+          "complexTypes": [
+            "AppleProviderOptions"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Extract",
+      "slug": "extract",
+      "docs": "Extract from T those types that are assignable to U",
+      "types": [
+        {
+          "text": "T extends U ? T : never",
+          "complexTypes": [
+            "T",
+            "U"
+          ]
+        }
+      ]
+    }
+  ],
   "pluginConfigs": []
 }