Return JWT token for limited login

Author: jerbob92

src/login.common.ts

@@ -277,7 +277,7 @@ export class FacebookLoginResult {
 
     // Success fields.
     Id: string;
-    AccessToken: string;
+    AccessToken: string; // Note: this is a JWT OIDC Token when using LimitedLogin.
     ProfileDataFields: {[key: string]: any};
 }
 
@@ -407,4 +407,4 @@ export class SignInWithAppleNameComponents {
 
     // The phonetic representation of the user's name.
     PhoneticRepresentation?: SignInWithAppleNameComponents;
-}
+}

src/login.ios.ts

@@ -43,9 +43,9 @@ let authorizationController: any /* ASAuthorizationController */;
 let authorizationControllerDelegateImpl: ASAuthorizationControllerDelegateImpl;
 
 interface GoogleEventData {
-    Result: GIDSignInResult;
-    User: GIDGoogleUser;
-    Error: NSError;
+    Result?: GIDSignInResult;
+    User?: GIDGoogleUser;
+    Error?: NSError;
 }
 
 @NativeClass()
@@ -401,11 +401,16 @@ export function startGoogleSignIn(googleSignInOptions: GoogleSignInOptions): Pro
             });
 
             GIDSignIn.sharedInstance.signInWithPresentingViewControllerCompletion(Application.ios.rootController, (p1: GIDSignInResult, p2: NSError) =>  {
-                googleDidSignIn.next({
-                    Result: p1,
-                    User: p1.user,
-                    Error: p2,
-                });
+                if (p2) {
+                    googleDidSignIn.next({
+                        Error: p2,
+                    });
+                } else {
+                    googleDidSignIn.next({
+                        Result: p1,
+                        User: p1.user,
+                    });
+                }
             });
         } catch (e) {
             const result = new GoogleSignInResult();
@@ -506,6 +511,7 @@ export function startFacebookLogin(facebookLoginOptions: FacebookLoginOptions):
 
                 // Access token is not available in limited login mode.
                 let accessToken: FBSDKAccessToken;
+                let authenticationToken: FBSDKAuthenticationToken;
                 if (!facebookLoginOptions.LimitedLogin) {
                     accessToken = result.token;
                     if (!accessToken) {
@@ -515,6 +521,15 @@ export function startFacebookLogin(facebookLoginOptions: FacebookLoginOptions):
                         resolve(loginResult);
                         return;
                     }
+                } else {
+                    authenticationToken = result.authenticationToken;
+                    if (!authenticationToken) {
+                        loginResult.ResultType = FacebookLoginResultType.FAILED;
+                        loginResult.ErrorCode = 0;
+                        loginResult.ErrorMessage = "No authentication token returned";
+                        resolve(loginResult);
+                        return;
+                    }
                 }
 
                 loginResult.ResultType = FacebookLoginResultType.SUCCESS;
@@ -612,6 +627,8 @@ export function startFacebookLogin(facebookLoginOptions: FacebookLoginOptions):
                     if (!facebookLoginOptions.LimitedLogin) {
                         loginResult.AccessToken = accessToken.tokenString;
                         loginResult.Id = accessToken.userID;
+                    } else {
+                        loginResult.AccessToken = authenticationToken.tokenString;
                     }
 
                     if (!facebookLoginOptions.LimitedLogin && facebookLoginOptions.RequestProfileData) {

src/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@klippa/nativescript-login",
-	"version": "4.0.1",
+	"version": "4.0.4",
 	"description": "The best way to do social logins in NativeScript, a plugin with modern SDKs to allow authentication to various providers with access to all SDK features",
 	"main": "login",
 	"typings": "index.d.ts",