feat: upgrade to latest native iOS Facebook SDK frameworks (#189)

Vladimir Amiorkov · web-flow · commit 66212924107b · 2019-06-10T15:56:55.000+03:00
* feat: upgrade to latest native iOS Facebook SDK frameworks

* chore: update "custom login" test to latest native framework changes

* chore: update e2e test in Vue demo
diff --git a/demo-angular/app/app.module.ts b/demo-angular/app/app.module.ts
@@ -2,16 +2,14 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 import { AppComponent } from "./app.component";
-import { LoginModule } from "./pages/login/login.module";
-import { HomeModule } from "./pages/home/home.module";
 import { NativeScriptFacebookModule } from "nativescript-facebook/angular";
 import * as application from 'tns-core-modules/application';
 import { routes } from "./app.routing";
 import { NavigationService } from "./services/navigation.service";
-import { init, LoginBehavior } from "nativescript-facebook";
+import { init } from "nativescript-facebook";
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");
 });
 
 @NgModule({
diff --git a/demo-vue/app/app.js b/demo-vue/app/app.js
@@ -4,7 +4,6 @@ import Login from "./components/Login";
 
 import {
     init,
-    LoginBehavior
 } from 'nativescript-facebook';
 
 import FacebookPlugin from "nativescript-facebook/vue";
@@ -13,7 +12,7 @@ Vue.use(FacebookPlugin);
 Vue.config.silent = true;
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");
 });
 
 new Vue({
diff --git a/demo-vue/e2e/test.e2e.ts b/demo-vue/e2e/test.e2e.ts
@@ -77,6 +77,9 @@ describe("Facebook tests", async function () {
             await driver.wait(1000);
             await allFields[0].sendKeys(USERNAME);
         } else {
+            const continueBtn = await driver.findElementByText("Continue");
+            await continueBtn.click();
+            
             const passField = await driver.findElementByClassName(driver.locators.getElementByName("securetextfield"));
             await passField.click();
             await passField.sendKeys(PASSWORD);
diff --git a/demo/app/app.ts b/demo/app/app.ts
@@ -1,8 +1,8 @@
 ﻿import * as application from 'tns-core-modules/application';
-import { init, LoginBehavior } from "nativescript-facebook";
+import { init } from "nativescript-facebook";
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");
 });
 
 application.run({ moduleName: "app-root" });
diff --git a/demo/e2e/test.e2e.ts b/demo/e2e/test.e2e.ts
@@ -41,7 +41,7 @@ describe("Facebook tests", async function () {
         console.log("Driver successfully quit");
     });
 
-    afterEach(async function (){
+    afterEach(async function () {
         if (this.currentTest.state && this.currentTest.state === "failed") {
             let png = await driver.logScreenshot(this.currentTest.title);
             fs.copyFile(png, './mochawesome-report/' + this.currentTest.title + '.png', function (err) {
@@ -52,13 +52,14 @@ describe("Facebook tests", async function () {
             });
             addContext(this, './' + this.currentTest.title + '.png');
         }
-    })
+    });
 
     it("should log in via custom button", async function () {
+        let userNameLabelElement;
         if (isAndroid) {
-            var userNameLabelElement = "[@text='Nativescript User']";
+            userNameLabelElement = "[@text='Nativescript User']";
         } else {
-            var userNameLabelElement = "[@name='Nativescript User']";
+            userNameLabelElement = "[@name='Nativescript User']";
         }
 
         const facebookButton = await driver.findElementByText("Custom", SearchOptions.contains);
@@ -81,6 +82,9 @@ describe("Facebook tests", async function () {
             await driver.wait(1000);
             await allFields[0].sendKeys(USERNAME);
         } else {
+            const continueBtn = await driver.findElementByText("Continue");
+            await continueBtn.click();
+
             const passField = await driver.findElementByClassName(driver.locators.getElementByName("securetextfield"));
             await passField.click();
             await passField.sendKeys(PASSWORD);
diff --git a/src/index.android.ts b/src/index.android.ts
@@ -1,6 +1,5 @@
 export * from "./login-manager";
 export * from "./ui/login-button";
 export * from "./login-event-data";
-export * from "./login-behavior";
 export * from './share-manager';
 export * from "./ui/share-button";
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -2,6 +2,5 @@ export * from "./login-manager";
 export * from "./ui/login-button";
 export * from "./login-response";
 export * from "./login-event-data";
-export * from "./login-behavior";
 export * from './share-manager';
 export * from "./ui/share-button";
diff --git a/src/index.ios.ts b/src/index.ios.ts
@@ -2,7 +2,6 @@ import * as applicationModule from "tns-core-modules/application";
 export * from "./ui/login-button";
 export * from "./login-manager";
 export * from "./login-event-data";
-export * from "./login-behavior";
 export * from './share-manager';
 export * from "./ui/share-button";
 
@@ -13,11 +12,11 @@ class BaseDelegate extends UIResponder implements UIApplicationDelegate {
   public static ObjCProtocols = [UIApplicationDelegate];
 
   applicationDidFinishLaunchingWithOptions(application: UIApplication, launchOptions: NSDictionary<any, any>): boolean {
-    return FBSDKApplicationDelegate.sharedInstance().applicationDidFinishLaunchingWithOptions(application, launchOptions);
+    return FBSDKApplicationDelegate.sharedInstance.applicationDidFinishLaunchingWithOptions(application, launchOptions);
   }
 
   applicationOpenURLSourceApplicationAnnotation(application, url, sourceApplication, annotation) {
-    return FBSDKApplicationDelegate.sharedInstance().applicationOpenURLSourceApplicationAnnotation(application, url, sourceApplication, annotation);
+    return FBSDKApplicationDelegate.sharedInstance.applicationOpenURLSourceApplicationAnnotation(application, url, sourceApplication, annotation);
   }
 
   applicationDidBecomeActive(application: UIApplication): void {
diff --git a/src/login-behavior.d.ts b/src/login-behavior.d.ts
diff --git a/src/login-behavior.ts b/src/login-behavior.ts
diff --git a/src/login-manager.android.ts b/src/login-manager.android.ts
@@ -1,7 +1,6 @@
 import * as application from "tns-core-modules/application";
 import { LoginResponse } from './login-response';
 import { FacebookAccessToken } from "./facebook-access-token";
-import { LoginBehavior } from "./login-behavior";
 
 const LOGIN_PERMISSIONS = ["public_profile", "email"];
 
@@ -15,7 +14,7 @@ export function _registerLogoutCallback(callback: Function) {
   onLogoutCallback = callback;
 }
 
-export function init(fbId: string, fbLoginBehavior: LoginBehavior = LoginBehavior.LoginBehaviorBrowser) {
+export function init(fbId: string) {
   com.facebook.FacebookSdk.setAutoLogAppEventsEnabled(true);
   setAppId(fbId);
   androidApplication = application.android;
diff --git a/src/login-manager.d.ts b/src/login-manager.d.ts
@@ -2,15 +2,13 @@ export declare function _registerLoginCallback(callback: Function): void;
 export declare function _registerLogoutCallback(callback: Function): void;
 export declare let onLoginCallback: Function;
 export declare let onLogoutCallback: Function;
-import { LoginBehavior } from "./login-behavior";
 import { FacebookAccessToken } from "./facebook-access-token";
 
 /**
 * Sets the Facebook application Id for the current app and init the native facebook sdk.
 * @param {string} fbAppId the application Id
-* @param {LoginBehavior} fbLoginBehavior (iOS only) specifies the login behavior, default value: LoginBehavior.FBSDKLoginBehaviorSystemAccount
 */
-export declare function init(fbId: string, fbLoginBehavior?: LoginBehavior): void;
+export declare function init(fbId: string): void;
 /**
 * Request the specified publish permissions.
 * @param {string[]} permissions Array of the requested publish permissions.
diff --git a/src/login-manager.ios.ts b/src/login-manager.ios.ts
@@ -1,6 +1,4 @@
-import * as applicationModule from "tns-core-modules/application";
 import { LoginResponse } from './login-response';
-import { LoginBehavior } from './login-behavior';
 import { FacebookAccessToken } from "./facebook-access-token";
 
 const LOGIN_PERMISSIONS = ["public_profile", "email"];
@@ -11,10 +9,10 @@ export let onLogoutCallback;
 
 let loginManager;
 
-export function init(fbId: string, fbLoginBehavior: LoginBehavior = LoginBehavior.LoginBehaviorBrowser) {
+export function init(fbId: string) {
   setAppId(fbId);
   loginManager = FBSDKLoginManager.alloc().init();
-  loginManager.loginBehavior = fbLoginBehavior;
+  loginManager.loginBehavior = FBSDKLoginBehavior.Browser;
 }
 
 export function _registerLogoutCallback(callback: Function) {
@@ -53,7 +51,7 @@ export function _registerLoginCallback(callback: Function) {
 }
 
 function setAppId(fbAppId: string) {
-  FBSDKSettings.setAppID(fbAppId);
+  FBSDKSettings.appID = fbAppId;
 }
 
 export function requestPublishPermissions(permissions: string[], callback: Function) {
@@ -63,15 +61,15 @@ export function requestPublishPermissions(permissions: string[], callback: Funct
 
 export function requestReadPermissions(permissions: string[], callback: Function) {
   _registerLoginCallback(callback);
-  loginManager.logInWithReadPermissionsHandler(permissions, onLoginCallback);
+  loginManager.logInWithPermissionsFromViewControllerHandler(permissions, undefined, onLoginCallback);
 }
 
 export function login(callback: Function) {
   requestReadPermissions(LOGIN_PERMISSIONS, callback);
 }
 
 export function getCurrentAccessToken() {
-  let sdkAccessToken = FBSDKAccessToken.currentAccessToken();
+  let sdkAccessToken = FBSDKAccessToken.currentAccessToken;
   let accessToken = null;
 
   if (sdkAccessToken) {
diff --git a/src/platforms/ios/Podfile b/src/platforms/ios/Podfile
@@ -1,3 +1,3 @@
-pod 'FBSDKCoreKit', '~> 4.38.0'
-pod 'FBSDKLoginKit', '~> 4.38.0'
-pod 'FBSDKShareKit', '~> 4.38.0'
+pod 'FBSDKCoreKit', '~> 5.0'
+pod 'FBSDKLoginKit', '~> 5.0'
+pod 'FBSDKShareKit', '~> 5.0'
diff --git a/src/platforms/ios/typings/objc!FBSDKCoreKit.d.ts b/src/platforms/ios/typings/objc!FBSDKCoreKit.d.ts
diff --git a/src/platforms/ios/typings/objc!FBSDKLoginKit.d.ts b/src/platforms/ios/typings/objc!FBSDKLoginKit.d.ts
diff --git a/src/platforms/ios/typings/objc!FBSDKShareKit.d.ts b/src/platforms/ios/typings/objc!FBSDKShareKit.d.ts
