@capgo/capacitor-social-login 0.0.49 → 0.0.51

package/README.md

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

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

@@ -8,12 +8,16 @@ import com.facebook.AccessToken;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
+import com.facebook.FacebookSdk;
 import com.facebook.GraphRequest;
 import com.facebook.GraphResponse;
+import com.facebook.login.LoginBehavior;
 import com.facebook.login.LoginManager;
 import com.facebook.login.LoginResult;
+import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
+import androidx.activity.result.ActivityResultRegistryOwner;
 import ee.forgr.capacitor.social.login.helpers.JsonHelper;
 import ee.forgr.capacitor.social.login.helpers.SocialProvider;
 import java.util.Collection;
@@ -31,67 +35,92 @@ public class FacebookProvider implements SocialProvider {
     this.activity = activity;
   }
 
-  public void initialize(JSONObject _config) {
-    this.callbackManager = CallbackManager.Factory.create();
-
-    LoginManager.getInstance()
-      .registerCallback(
-        callbackManager,
-        new FacebookCallback<LoginResult>() {
-          @Override
-          public void onSuccess(LoginResult loginResult) {
-            Log.d(LOG_TAG, "LoginManager.onSuccess");
-          }
-
-          @Override
-          public void onCancel() {
-            Log.d(LOG_TAG, "LoginManager.onCancel");
-          }
-
-          @Override
-          public void onError(FacebookException exception) {
-            Log.e(LOG_TAG, "LoginManager.onError", exception);
-          }
-        }
-      );
+  public void initialize(JSONObject config) {
+    try {
+        // Set Facebook App ID
+        String facebookAppId = config.getString("appId");
+        FacebookSdk.setApplicationId(facebookAppId);
+        
+        // Set Facebook Client Token
+        String facebookClientToken = config.getString("clientToken");
+        FacebookSdk.setClientToken(facebookClientToken);
+        
+        // Initialize Facebook SDK
+        FacebookSdk.sdkInitialize(activity.getApplicationContext());
+        
+        this.callbackManager = CallbackManager.Factory.create();
+
+        LoginManager.getInstance().registerCallback(callbackManager,
+            new FacebookCallback<LoginResult>() {
+                @Override
+                public void onSuccess(LoginResult loginResult) {
+                    Log.d(LOG_TAG, "LoginManager.onSuccess");
+                }
+
+                @Override
+                public void onCancel() {
+                    Log.d(LOG_TAG, "LoginManager.onCancel");
+                }
+
+                @Override
+                public void onError(FacebookException exception) {
+                    Log.e(LOG_TAG, "LoginManager.onError", exception);
+                }
+            });
+    } catch (JSONException e) {
+        Log.e(LOG_TAG, "Error initializing Facebook SDK", e);
+        throw new RuntimeException("Failed to initialize Facebook SDK: " + e.getMessage());
+    }
   }
 
   @Override
   public void login(PluginCall call, JSONObject config) {
     try {
-      Collection<String> permissions = JsonHelper.jsonArrayToList(
-        config.getJSONArray("permissions")
-      );
-      LoginManager.getInstance()
-        .registerCallback(
-          callbackManager,
-          new FacebookCallback<LoginResult>() {
-            @Override
-            public void onSuccess(LoginResult loginResult) {
-              Log.d(LOG_TAG, "LoginManager.onSuccess");
-              AccessToken accessToken = loginResult.getAccessToken();
-              JSObject result = new JSObject();
-              result.put("accessToken", accessToken.getToken());
-              result.put("userId", accessToken.getUserId());
-              call.resolve(result);
-            }
-
-            @Override
-            public void onCancel() {
-              Log.d(LOG_TAG, "LoginManager.onCancel");
-              call.reject("Login cancelled");
-            }
-
-            @Override
-            public void onError(FacebookException exception) {
-              Log.e(LOG_TAG, "LoginManager.onError", exception);
-              call.reject(exception.getMessage());
-            }
-          }
+        Collection<String> permissions = JsonHelper.jsonArrayToList(
+            config.getJSONArray("permissions")
         );
-      LoginManager.getInstance().logIn(activity, permissions);
+        boolean limitedLogin = config.optBoolean("limitedLogin", false);
+        String nonce = config.optString("nonce", "");
+
+        LoginManager.getInstance().registerCallback(callbackManager,
+            new FacebookCallback<LoginResult>() {
+                @Override
+                public void onSuccess(LoginResult loginResult) {
+                    Log.d(LOG_TAG, "LoginManager.onSuccess");
+                    AccessToken accessToken = loginResult.getAccessToken();
+                    JSObject result = new JSObject();
+                    result.put("accessToken", createAccessTokenObject(accessToken));
+                    result.put("authenticationToken", loginResult.getAuthenticationToken() != null ? loginResult.getAuthenticationToken().getToken() : null);
+                    // TODO: Fetch profile information and add it to the result
+                    call.resolve(result);
+                }
+
+                @Override
+                public void onCancel() {
+                    Log.d(LOG_TAG, "LoginManager.onCancel");
+                    call.reject("Login cancelled");
+                }
+
+                @Override
+                public void onError(FacebookException exception) {
+                    Log.e(LOG_TAG, "LoginManager.onError", exception);
+                    call.reject(exception.getMessage());
+                }
+            });
+
+        LoginManager loginManager = LoginManager.getInstance();
+        if (limitedLogin) {
+            Log.w(LOG_TAG, "Limited login is not available for Android");
+        }
+        
+        loginManager.setLoginBehavior(LoginBehavior.NATIVE_WITH_FALLBACK);
+        if (!nonce.isEmpty()) {
+            loginManager.logIn((ActivityResultRegistryOwner) activity, callbackManager, permissions, nonce);
+        } else {
+            loginManager.logIn((ActivityResultRegistryOwner) activity, callbackManager, permissions);
+        }
     } catch (JSONException e) {
-      call.reject("Invalid permissions format");
+        call.reject("Invalid login options format");
     }
   }
 
@@ -170,6 +199,23 @@ public class FacebookProvider implements SocialProvider {
     int resultCode,
     Intent data
   ) {
-    return callbackManager.onActivityResult(requestCode, resultCode, data);
+    Log.d(LOG_TAG, "FacebookProvider.handleOnActivityResult called");
+    if (callbackManager != null) {
+        return callbackManager.onActivityResult(requestCode, resultCode, data);
+    }
+    return false;
+  }
+
+  private JSObject createAccessTokenObject(AccessToken accessToken) {
+    JSObject tokenObject = new JSObject();
+    tokenObject.put("applicationId", accessToken.getApplicationId());
+    tokenObject.put("declinedPermissions", new JSArray(accessToken.getDeclinedPermissions()));
+    tokenObject.put("expires", accessToken.getExpires().getTime());
+    tokenObject.put("isExpired", accessToken.isExpired());
+    tokenObject.put("lastRefresh", accessToken.getLastRefresh().getTime());
+    tokenObject.put("permissions", new JSArray(accessToken.getPermissions()));
+    tokenObject.put("token", accessToken.getToken());
+    tokenObject.put("userId", accessToken.getUserId());
+    return tokenObject;
   }
 }

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

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

package/dist/docs.json

@@ -159,7 +159,7 @@
           "tags": [],
           "docs": "",
           "complexTypes": [],
-          "type": "{ appId: string; } | undefined"
+          "type": "{ appId: string; clientToken: string; } | undefined"
         },
         {
           "name": "google",

package/dist/esm/definitions.d.ts

@@ -4,6 +4,10 @@ export interface InitializeOptions {
          * Facebook App ID, provided by Facebook for web, in mobile it's set in the native files
          */
         appId: string;
+        /**
+         * Facebook Client Token, provided by Facebook for web, in mobile it's set in the native files
+         */
+        clientToken: string;
     };
     google?: {
         /**

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     * 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 for web and Android\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   * Is Limited Login\n   * @description use limited login for Facebook IOS\n   * @default false\n   */\n  limitedLogin?: boolean;\n  /**\n   * Nonce\n   * @description A custom nonce to use for the login request\n   */\n  nonce?: 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    userID: string;\n    email: string | null;\n    friendIDs: string[];\n    birthday: string | null;\n    ageRange: { min?: number; max?: number } | null;\n    gender: string | null;\n    location: { id: string; name: string } | null;\n    hometown: { id: string; name: string } | null;\n    profileURL: string | null;\n    name: string | null;\n    imageURL: string | null;\n  };\n  authenticationToken: string | null;\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     * Facebook Client Token, provided by Facebook for web, in mobile it's set in the native files\n     */\n    clientToken: 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 for web and Android\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   * Is Limited Login\n   * @description use limited login for Facebook IOS\n   * @default false\n   */\n  limitedLogin?: boolean;\n  /**\n   * Nonce\n   * @description A custom nonce to use for the login request\n   */\n  nonce?: 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    userID: string;\n    email: string | null;\n    friendIDs: string[];\n    birthday: string | null;\n    ageRange: { min?: number; max?: number } | null;\n    gender: string | null;\n    location: { id: string; name: string } | null;\n    hometown: { id: string; name: string } | null;\n    profileURL: string | null;\n    name: string | null;\n    imageURL: string | null;\n  };\n  authenticationToken: string | null;\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

@@ -2,9 +2,13 @@ import Foundation
 import AuthenticationServices
 import Alamofire
 
-struct AppleProviderResponse {
-    //    let user: String
+struct AppleProviderResponse: Codable {
+    let user: String
+    let email: String?
+    let givenName: String?
+    let familyName: String?
     let identityToken: String
+    let authorizationCode: String
 }
 
 // Define the Decodable structs for the response
@@ -86,6 +90,7 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
     private let TOKEN_URL = "https://appleid.apple.com/auth/token"
     private let SHARED_PREFERENCE_NAME = "AppleProviderSharedPrefs_0eda2642"
     private var redirectUrl = ""
+    private let USER_INFO_KEY = "AppleUserInfo"
 
     func initialize(redirectUrl: String? = nil) {
         if let redirectUrl = redirectUrl {
@@ -199,21 +204,27 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
     }
 
     func getCurrentUser(completion: @escaping (Result<AppleProviderResponse?, Error>) -> Void) {
-        let appleIDProvider = ASAuthorizationAppleIDProvider()
-        appleIDProvider.getCredentialState(forUserID: "currentUserIdentifier") { (credentialState, error) in
-            if let error = error {
-                completion(.failure(error))
-                return
-            }
+        retrieveUserInfo { userInfo in
+            if let userInfo = userInfo {
+                completion(.success(userInfo))
+            } else {
+                let appleIDProvider = ASAuthorizationAppleIDProvider()
+                appleIDProvider.getCredentialState(forUserID: "currentUserIdentifier") { (credentialState, error) in
+                    if let error = error {
+                        completion(.failure(error))
+                        return
+                    }
 
-            switch credentialState {
-            case .authorized:
-                // User is authorized, you might want to fetch more details here
-                completion(.success(nil))
-            case .revoked, .notFound, .transferred:
-                completion(.success(nil))
-            @unknown default:
-                completion(.failure(NSError(domain: "AppleProvider", code: 0, userInfo: [NSLocalizedDescriptionKey: "Unknown credential state"])))
+                    switch credentialState {
+                    case .authorized:
+                        // User is authorized, but we don't have their info
+                        completion(.success(nil))
+                    case .revoked, .notFound, .transferred:
+                        completion(.success(nil))
+                    @unknown default:
+                        completion(.failure(NSError(domain: "AppleProvider", code: 0, userInfo: [NSLocalizedDescriptionKey: "Unknown credential state"])))
+                    }
+                }
             }
         }
     }
@@ -227,52 +238,44 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
 
     func authorizationController(controller: ASAuthorizationController, didCompleteWithAuthorization authorization: ASAuthorization) {
         if let appleIDCredential = authorization.credential as? ASAuthorizationAppleIDCredential {
-            let _ = appleIDCredential.user
+            let userIdentifier = appleIDCredential.user
             let fullName = appleIDCredential.fullName
             let email = appleIDCredential.email
 
-            //            let response = AppleProviderResponse(
-            //                user: userIdentifier,
-            //                email: email,
-            //                givenName: fullName?.givenName,
-            //                familyName: fullName?.familyName,
-            //                identityToken: String(data: appleIDCredential.identityToken ?? Data(), encoding: .utf8) ?? "",
-            //                authorizationCode: String(data: appleIDCredential.authorizationCode ?? Data(), encoding: .utf8) ?? ""
-            //            )
-
-            let errorCompletion: ((Result<AppleProviderResponse, AppleProviderError>) -> Void) = { result in
-                do {
-                    let finalResult = try result.get()
-                    self.completion?(.success(finalResult))
-                } catch {
-                    self.completion?(.failure(error))
-                }
-            }
-
-            let authorizationCode = String(data: appleIDCredential.authorizationCode ?? Data(), encoding: .utf8) ?? ""
-            let identityToken = String(data: appleIDCredential.identityToken ?? Data(), encoding: .utf8) ?? ""
-
-            if !self.redirectUrl.isEmpty {
-                let firstName = fullName?.givenName ?? "Jhon"
-                let lastName = fullName?.familyName ?? "Doe"
-
-                if let _ = fullName?.givenName {
-                    sendRequest(code: authorizationCode, identityToken: identityToken, email: email ?? "", firstName: firstName, lastName: lastName, completion: errorCompletion, skipUser: false)
+            retrieveUserInfo { savedUserInfo in
+                let response = AppleProviderResponse(
+                    user: userIdentifier,
+                    email: email ?? savedUserInfo?.email,
+                    givenName: fullName?.givenName ?? savedUserInfo?.givenName,
+                    familyName: fullName?.familyName ?? savedUserInfo?.familyName,
+                    identityToken: String(data: appleIDCredential.identityToken ?? Data(), encoding: .utf8) ?? "",
+                    authorizationCode: String(data: appleIDCredential.authorizationCode ?? Data(), encoding: .utf8) ?? ""
+                )
+
+                // Persist user info
+                self.persistUserInfo(userInfo: response)
+
+                if !self.redirectUrl.isEmpty {
+                    let firstName = fullName?.givenName ?? ""
+                    let lastName = fullName?.familyName ?? ""
+
+                    self.sendRequest(code: response.authorizationCode, identityToken: response.identityToken, email: email ?? "", firstName: firstName, lastName: lastName, completion: { result in
+                        switch result {
+                        case .success(let appleResponse):
+                            self.completion?(.success(appleResponse))
+                        case .failure(let error):
+                            self.completion?(.failure(error))
+                        }
+                    }, skipUser: fullName?.givenName == nil)
                 } else {
-                    sendRequest(code: authorizationCode, identityToken: identityToken, email: email ?? "", firstName: firstName, lastName: lastName, completion: errorCompletion, skipUser: true)
-                }
-            } else {
-                do {
-                    try self.persistState(idToken: identityToken, refreshToken: "", accessToken: "")
-                    let appleResponse = AppleProviderResponse(identityToken: identityToken)
-                    completion?(.success(appleResponse))
-                    return
-                } catch {
-                    completion?(.failure(AppleProviderError.specificJsonWritingError(error)))
-                    return
+                    do {
+                        try self.persistState(idToken: response.identityToken, refreshToken: "", accessToken: "")
+                        self.completion?(.success(response))
+                    } catch {
+                        self.completion?(.failure(AppleProviderError.specificJsonWritingError(error)))
+                    }
                 }
             }
-            // completion?(.success(response))
         }
     }
 
@@ -365,7 +368,14 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
 
                                 do {
                                     try self.persistState(idToken: idToken, refreshToken: refreshToken, accessToken: accessToken)
-                                    let appleResponse = AppleProviderResponse(identityToken: idToken)
+                                    let appleResponse = AppleProviderResponse(
+                                        user: "", // We don't have this information at this point
+                                        email: nil, // We don't have this information at this point
+                                        givenName: nil, // We don't have this information at this point
+                                        familyName: nil, // We don't have this information at this point
+                                        identityToken: idToken,
+                                        authorizationCode: "" // We don't have this information at this point
+                                    )
                                     completion(.success(appleResponse))
                                     return
                                 } catch {
@@ -375,8 +385,14 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
                             }
 
                             if (pathComponents.filter { $0.name == "ios_no_code" }).first != nil {
-                                // identityToken provided by apple
-                                let appleResponse = AppleProviderResponse(identityToken: identityToken)
+                                let appleResponse = AppleProviderResponse(
+                                    user: "", // You might want to extract this from the identityToken
+                                    email: email,
+                                    givenName: firstName,
+                                    familyName: lastName,
+                                    identityToken: identityToken,
+                                    authorizationCode: code
+                                )
 
                                 do {
                                     try self.persistState(idToken: identityToken, refreshToken: "", accessToken: "")
@@ -470,7 +486,14 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
                        let userData = try? JSONSerialization.jsonObject(with: decodedData, options: []) as? [String: Any],
                        let userId = userData["sub"] as? String {
                         // Create the response object
-                        let appleResponse = AppleProviderResponse(identityToken: idToken)
+                        let appleResponse = AppleProviderResponse(
+                            user: userId,
+                            email: nil, // You might want to extract this from the idToken if available
+                            givenName: nil,
+                            familyName: nil,
+                            identityToken: idToken,
+                            authorizationCode: code
+                        )
 
                         // Log the tokens (replace with your logging mechanism)
                         print("Apple Access Token is: \(accessToken)")
@@ -513,4 +536,25 @@ class AppleProvider: NSObject, ASAuthorizationControllerDelegate, ASAuthorizatio
     func presentationAnchor(for controller: ASAuthorizationController) -> ASPresentationAnchor {
         return UIApplication.shared.windows.first!
     }
+
+    func persistUserInfo(userInfo: AppleProviderResponse) {
+        let encoder = JSONEncoder()
+        if let encoded = try? encoder.encode(userInfo) {
+            UserDefaults.standard.set(encoded, forKey: USER_INFO_KEY)
+            print("Successfully saved user info locally")
+        }
+    }
+
+    func retrieveUserInfo(completion: @escaping (AppleProviderResponse?) -> Void) {
+        if let savedUserInfo = UserDefaults.standard.object(forKey: USER_INFO_KEY) as? Data {
+            let decoder = JSONDecoder()
+            if let loadedUserInfo = try? decoder.decode(AppleProviderResponse.self, from: savedUserInfo) {
+                completion(loadedUserInfo)
+            } else {
+                completion(nil)
+            }
+        } else {
+            completion(nil)
+        }
+    }
 }

package/ios/Sources/SocialLoginPlugin/FacebookProvider.swift

@@ -52,10 +52,20 @@ class FacebookProvider {
             return
         }
 
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            
+            // Check if a user is already logged in
+            if AccessToken.current != nil {
+                // User is already logged in, return current session info
+                let response = self.createLoginResponse()
+                completion(.success(response))
+                return
+            }
+            
             self.loginManager.logIn(configuration: configuration) { result in
                 switch result {
-                case .success:
+                case .success(_, _, _):
                     let response = self.createLoginResponse()
                     completion(.success(response))
                 case .failed(let error):
@@ -63,7 +73,6 @@ class FacebookProvider {
                 case .cancelled:
                     completion(.failure(NSError(domain: "FacebookProvider", code: 0, userInfo: [NSLocalizedDescriptionKey: "Login cancelled"])))
                 }
-
             }
         }
     }
@@ -123,28 +132,32 @@ class FacebookProvider {
     }
 
     func logout(completion: @escaping (Result<Void, Error>) -> Void) {
-        loginManager.logOut()
-        completion(.success(()))
+        DispatchQueue.main.async { [weak self] in
+            self?.loginManager.logOut()
+            completion(.success(()))
+        }
     }
 
     func getCurrentUser(completion: @escaping (Result<[String: Any]?, Error>) -> Void) {
-        if let accessToken = AccessToken.current {
-            let response: [String: Any] = [
-                "accessToken": [
-                    "applicationID": accessToken.appID,
-                    "declinedPermissions": accessToken.declinedPermissions.map { $0.name },
-                    "expirationDate": accessToken.expirationDate,
-                    "isExpired": accessToken.isExpired,
-                    "refreshDate": accessToken.refreshDate,
-                    "permissions": accessToken.permissions.map { $0.name },
-                    "tokenString": accessToken.tokenString,
-                    "userID": accessToken.userID
-                ],
-                "profile": [:]
-            ]
-            completion(.success(response))
-        } else {
-            completion(.success(nil))
+        DispatchQueue.main.async {
+            if let accessToken = AccessToken.current {
+                let response: [String: Any] = [
+                    "accessToken": [
+                        "applicationID": accessToken.appID,
+                        "declinedPermissions": accessToken.declinedPermissions.map { $0.name },
+                        "expirationDate": accessToken.expirationDate,
+                        "isExpired": accessToken.isExpired,
+                        "refreshDate": accessToken.refreshDate,
+                        "permissions": accessToken.permissions.map { $0.name },
+                        "tokenString": accessToken.tokenString,
+                        "userID": accessToken.userID
+                    ],
+                    "profile": [:]
+                ]
+                completion(.success(response))
+            } else {
+                completion(.success(nil))
+            }
         }
     }
 

package/ios/Sources/SocialLoginPlugin/SocialLoginPlugin.swift

@@ -199,7 +199,23 @@ public class SocialLoginPlugin: CAPPlugin, CAPBridgedPlugin {
             }
         case "apple":
             apple.getCurrentUser { result in
-                self.handleCurrentUserResult(result, call: call)
+                switch result {
+                case .success(let appleResponse):
+                    if let response = appleResponse {
+                        call.resolve([
+                            "user": response.user,
+                            "email": response.email ?? "",
+                            "givenName": response.givenName ?? "",
+                            "familyName": response.familyName ?? "",
+                            "identityToken": response.identityToken,
+                            "authorizationCode": response.authorizationCode
+                        ])
+                    } else {
+                        call.resolve([:])
+                    }
+                case .failure(let error):
+                    call.reject(error.localizedDescription)
+                }
             }
         default:
             call.reject("Invalid provider")
@@ -280,10 +296,16 @@ public class SocialLoginPlugin: CAPPlugin, CAPBridgedPlugin {
         switch result {
         case .success(let response):
             if let appleResponse = response as? AppleProviderResponse {
+                // The user info is already persisted in the AppleProvider class
                 call.resolve([
                     "provider": "apple",
                     "result": [
-                        "identityToken": appleResponse.identityToken
+                        "user": appleResponse.user,
+                        "email": appleResponse.email ?? "",
+                        "givenName": appleResponse.givenName ?? "",
+                        "familyName": appleResponse.familyName ?? "",
+                        "identityToken": appleResponse.identityToken,
+                        "authorizationCode": appleResponse.authorizationCode
                     ]
                 ])
             } else if let googleResponse = response as? GoogleLoginResponse {

package/package.json

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