Merge pull request #195 from narusevic/master

elena-p · web-flow · commit 72c9285e8174 · 2019-06-11T17:09:47.000+03:00
Update Analytics pull request
diff --git a/README.md b/README.md
@@ -46,6 +46,7 @@ NativeScript : Facebook SDK ![apple](https://cdn3.iconfinder.com/data/icons/pico
         - [Hide Custom Button If Can't share](#hide-custom-button-1)
 - [Login Response](#login-response)
 - [Get Current Access Token](#get-current-access-token)
+- [Basic Analytics](#basic-analytics)
 - [Graph API Example](#graph-api-example)
 - [Release notes](#release-notes)
 - [FAQ](#faq)
@@ -595,6 +596,34 @@ The callback that have to be provided to Facebook.login method receives 2 argume
 ## Get Current Access Token
 The plugin allows to get the current access token, if any, via getCurrentAccessToken() method.
 
+## Basic Analytics
+The plugin allows to log analytics events. At the initialization of the application you need to init analytics:
+
+```Typescript
+application.on(application.launchEvent, function (args) {
+    nsFacebook.init("{facebook_app_id}");
+    nsFacebook.initAnalytics();
+});
+```
+
+Events logging:
+
+```Typescript
+nsFacebook.logEvent('Lead');
+```
+
+Logging event with parameters:
+
+```Typescript
+const value = 5;
+const parameters = [{
+    key: 'value',
+    value: value.toString(),
+}];
+
+nsFacebook.logEvent(FundsAdded, parameters);
+```
+
 ## Graph API Example
 Once the Facebook access token is retrieved you can execute Graph API requests. In the example below after successful login, the access token is stored in application settings. And then on the home view it is retrieved and 2 Graph API calls are executed.
 1. Get Facebook id of the logged in user
diff --git a/demo-angular/app/app.module.ts b/demo-angular/app/app.module.ts
@@ -2,16 +2,15 @@ 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, initAnalytics } from "nativescript-facebook";
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");
+    initAnalytics();
 });
 
 @NgModule({
diff --git a/demo-vue/app/app.js b/demo-vue/app/app.js
@@ -4,7 +4,7 @@ import Login from "./components/Login";
 
 import {
     init,
-    LoginBehavior
+    initAnalytics,
 } from 'nativescript-facebook';
 
 import FacebookPlugin from "nativescript-facebook/vue";
@@ -13,7 +13,8 @@ Vue.use(FacebookPlugin);
 Vue.config.silent = true;
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");    
+    initAnalytics();
 });
 
 new Vue({
diff --git a/demo-vue/app/components/Home.vue b/demo-vue/app/components/Home.vue
@@ -12,13 +12,14 @@
             <FacebookLoginButton @logout="onLogout"></FacebookLoginButton>
             <Button @tap="logout" text="Log out (Custom)"></Button>
             <Button @tap="getAccessToken" text="Get current access token"></Button>
+            <Button @tap="logEventAction" text="Log event"></Button>
             </StackLayout>
         </StackLayout>
     </Page>
 </template>
 
 <script>
-    import { logout as fbLogout, getCurrentAccessToken } from "nativescript-facebook";
+    import { logout as fbLogout, getCurrentAccessToken, logEvent } from "nativescript-facebook";
     import Login from "./Login";
     let appSettings = require("tns-core-modules/application-settings");
     let http = require("tns-core-modules/http");
@@ -64,6 +65,12 @@
             getAccessToken: function() {
                 let accessToken = getCurrentAccessToken();
                 alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));
+            },
+            logEventAction() {
+                logEvent('Initial', [{
+                    key: 'number',
+                    value: '',
+                }]);
             }
         }
     };
diff --git a/demo-vue/app/components/Login.vue b/demo-vue/app/components/Login.vue
@@ -15,6 +15,7 @@
             <Button @tap="onShareDialogPhotos" text="Open Share dialog (photos)" :visibility="canShowPhotosShareDialog ? 'visible' : 'collapsed'"></Button>
             <Button @tap="onSendDialog" text="Share Message (link)" :visibility="canShowLinksMessageDialog ? 'visible' : 'collapsed'"></Button>
             <Button @tap="onSendGenericDialog" text="Share Message (generic)" :visibility="canShowGenericMessageDialog ? 'visible' : 'collapsed'"></Button>
+            <Button @tap="logEventAction" text="Log event"></Button>
         </StackLayout>
     </Page>
 </template>
@@ -34,7 +35,8 @@
         showShareDialog,
         showMessageDialog,
         canShareDialogShow,
-        canMessageDialogShow
+        canMessageDialogShow,
+        logEvent
     } from 'nativescript-facebook';
     let appSettings = require('tns-core-modules/application-settings');
 
@@ -139,6 +141,12 @@
             },
             onSendGenericDialog: function() {
                 showMessageDialog(this.genericContent);
+            },
+            logEventAction() {
+                logEvent('Initial', [{
+                    key: 'number',
+                    value: '',
+                }]);
             }
         }
     };
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,9 @@
 ﻿import * as application from 'tns-core-modules/application';
-import { init, LoginBehavior } from "nativescript-facebook";
+import { init, initAnalytics } from "nativescript-facebook";
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");
+    initAnalytics();
 });
 
 application.run({ moduleName: "app-root" });
diff --git a/demo/app/home-page.xml b/demo/app/home-page.xml
@@ -13,6 +13,7 @@
       <Facebook:LoginButton logout="{{ onLogout }}"></Facebook:LoginButton>
       <Button automationText="customLogOut" tap="{{ logout }}" text="Log out (Custom)"></Button>
       <Button automationText="getCurrentAccessToken" tap="{{ getCurrentAccessToken }}" text="Get current access token"></Button>
+      <Button tap="{{ logEventAction }}" text="Log Event"></Button>
     </StackLayout>
   </StackLayout>
 </Page>
diff --git a/demo/app/home-view-model.ts b/demo/app/home-view-model.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'tns-core-modules/data/observable';
-import { LoginEventData, logout as fbLogout, getCurrentAccessToken } from "nativescript-facebook";
+import { LoginEventData, logout as fbLogout, logEvent, getCurrentAccessToken } from "nativescript-facebook";
 
 let frameModule = require("tns-core-modules/ui/frame");
 let appSettings = require("tns-core-modules/application-settings");
@@ -56,4 +56,11 @@ export class HomeViewModel extends Observable {
 
     alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));
   }
+
+  public logEventAction() {
+    logEvent('Initial', [{
+      key: 'number',
+      value: '',
+    }]);
+  }
 }
diff --git a/demo/app/login-page.xml b/demo/app/login-page.xml
@@ -12,5 +12,6 @@
     <Button tap="{{ onShareDialogPhotos }}" text="Open Share dialog (photos)" visibility="{{ canShowPhotosShareDialog ? 'visible' : 'collapsed' }}"></Button>
     <Button tap="{{ onSendDialog }}" text="Open Message Share dialog" visibility="{{ canShowLinksMessageDialog ? 'visible' : 'collapsed' }}"></Button>
     <Button tap="{{ onSendGenericDialog }}" text="Share Message Generic Template" visibility="{{ canShowGenericMessageDialog ? 'visible' : 'collapsed' }}"></Button>
+    <Button tap="{{ logEventAction }}" text="Log Event"></Button>
   </StackLayout>
 </Page>
diff --git a/demo/app/login-view-model.ts b/demo/app/login-view-model.ts
@@ -11,7 +11,8 @@ import {
     showShareDialog,
     showMessageDialog,
     canShareDialogShow,
-    canMessageDialogShow
+    canMessageDialogShow,
+    logEvent
 } from 'nativescript-facebook';
 
 let frameModule = require('tns-core-modules/ui/frame');
@@ -118,4 +119,11 @@ export class LoginViewModel extends Observable {
     public onSendGenericDialog() {
         showMessageDialog(this.genericContent);
     }
+
+    public logEventAction() {
+        logEvent('Initial', [{
+            key: 'number',
+            value: '',
+        }]);
+    }
 }
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/app-events.android.ts b/src/app-events.android.ts
@@ -21,6 +21,5 @@ export function logEvent(name: string, parameters?: any) {
             }
         }
     }
-
     appEventsLogger.logEvent(name, bundle);
 }
diff --git a/src/index.android.ts b/src/index.android.ts
@@ -1,6 +1,6 @@
 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";
+export * from "./ui/share-button";
+export * from "./app-events";
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -2,7 +2,6 @@ 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";
 export * from "./app-events";
diff --git a/src/index.ios.ts b/src/index.ios.ts
@@ -2,9 +2,9 @@ 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";
+export * from "./app-events";
 
 declare interface UIApplicationDelegate { }
 
@@ -13,11 +13,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
diff --git a/src/platforms/ios/Podfile b/src/platforms/ios/Podfile
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
