@capgo/capacitor-social-login 0.0.72 → 0.0.77-alpha.0

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> |
 
 --------------------
 
@@ -340,19 +341,11 @@ Refresh the access token
 
 #### InitializeOptions
 
-| Prop           | Type                                                                                     |
-| -------------- | ---------------------------------------------------------------------------------------- |
-| **`facebook`** | <code>{ appId: string; clientToken: string; }</code>                                     |
-| **`google`**   | <code>{ iOSClientId?: string; iOSServerClientId?: string; webClientId?: string; }</code> |
-| **`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     |
+| Prop           | Type                                                                                                                   |
+| -------------- | ---------------------------------------------------------------------------------------------------------------------- |
+| **`facebook`** | <code>{ appId: string; clientToken: string; }</code>                                                                   |
+| **`google`**   | <code>{ iOSClientId?: string; iOSServerClientId?: string; webClientId?: string; mode?: 'online' \| 'offline'; }</code> |
+| **`apple`**    | <code>{ clientId?: string; redirectUrl?: string; }</code>                                                              |
 
 
 #### FacebookLoginResponse
@@ -379,13 +372,22 @@ Refresh the access token
 | **`userId`**              | <code>string</code>   |
 
 
-#### GoogleLoginResponse
+#### GoogleLoginResponseOnline
+
+| Prop               | Type                                                                                                                                                               |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **`accessToken`**  | <code><a href="#accesstoken">AccessToken</a> \| null</code>                                                                                                        |
+| **`idToken`**      | <code>string \| null</code>                                                                                                                                        |
+| **`profile`**      | <code>{ email: string \| null; familyName: string \| null; givenName: string \| null; id: string \| null; name: string \| null; imageUrl: string \| null; }</code> |
+| **`responseType`** | <code>'online'</code>                                                                                                                                              |
 
-| Prop              | Type                                                                                                                                                               |
-| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **`accessToken`** | <code><a href="#accesstoken">AccessToken</a> \| null</code>                                                                                                        |
-| **`idToken`**     | <code>string \| null</code>                                                                                                                                        |
-| **`profile`**     | <code>{ email: string \| null; familyName: string \| null; givenName: string \| null; id: string \| null; name: string \| null; imageUrl: string \| null; }</code> |
+
+#### GoogleLoginResponseOffline
+
+| Prop                 | Type                   |
+| -------------------- | ---------------------- |
+| **`serverAuthCode`** | <code>string</code>    |
+| **`responseType`**   | <code>'offline'</code> |
 
 
 #### AppleProviderResponse
@@ -397,14 +399,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,11 +410,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 |
+| Prop                    | Type                  | Description                                                                                          | Default            |
+| ----------------------- | --------------------- | ---------------------------------------------------------------------------------------------------- | ------------------ |
+| **`scopes`**            | <code>string[]</code> | Specifies the scopes required for accessing Google APIs The default is defined in the configuration. |                    |
+| **`nonce`**             | <code>string</code>   | Nonce                                                                                                |                    |
+| **`forceRefreshToken`** | <code>boolean</code>  | Force refresh token (only for Android)                                                               | <code>false</code> |
 
 
 #### AppleProviderOptions
@@ -436,20 +430,46 @@ Refresh the access token
 
 | Prop           | Type                                           | Description |
 | -------------- | ---------------------------------------------- | ----------- |
-| **`provider`** | <code>'facebook' \| 'google' \| 'apple'</code> | Provider    |
+| **`provider`** | <code>'apple' \| 'google' \| 'facebook'</code> | Provider    |
 
 
 #### AuthorizationCode
 
-| Prop      | Type                | Description |
-| --------- | ------------------- | ----------- |
-| **`jwt`** | <code>string</code> | Jwt         |
+| Prop              | Type                | Description  |
+| ----------------- | ------------------- | ------------ |
+| **`jwt`**         | <code>string</code> | Jwt          |
+| **`accessToken`** | <code>string</code> | Access Token |
 
 
 #### AuthorizationCodeOptions
 
 | 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>
+
+
+#### GoogleLoginResponse
+
+<code><a href="#googleloginresponseonline">GoogleLoginResponseOnline</a> | <a href="#googleloginresponseoffline">GoogleLoginResponseOffline</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/build.gradle

@@ -63,4 +63,5 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation 'androidx.concurrent:concurrent-futures:1.2.0'
 }

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

@@ -189,16 +189,15 @@ public class AppleProvider implements SocialProvider {
       }
     }
 
-    this.appleAuthURLFull =
-      AUTHURL +
-      "?client_id=" +
-      this.clientId +
-      "&redirect_uri=" +
-      this.redirectUrl +
-      "&response_type=code&scope=" +
-      scopes +
-      "&response_mode=form_post&state=" +
-      state;
+    this.appleAuthURLFull = AUTHURL +
+    "?client_id=" +
+    this.clientId +
+    "&redirect_uri=" +
+    this.redirectUrl +
+    "&response_type=code&scope=" +
+    scopes +
+    "&response_mode=form_post&state=" +
+    state;
 
     if (nonce != null) {
       this.appleAuthURLFull += "&nonce=" + nonce;

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;
   }
 }