Merge pull request #85 from NativeScript/tbozhikov/access-token

tbozhikov · web-flow · commit 5149c1db52f5 · 2018-02-19T12:11:35.000+02:00
Provide a way to get the current access token
diff --git a/demo-angular/app/pages/home/home.component.html b/demo-angular/app/pages/home/home.component.html
@@ -9,5 +9,6 @@
     <StackLayout class="buttons">
         <FacebookLoginButton (logout)="onLogout($event)"></FacebookLoginButton>
         <Button text="Log out (custom)" (tap)="logout()"></Button>
+        <Button text="Get current access token" (tap)="getCurrentAccessToken()"></Button>
     </StackLayout>
 </StackLayout>
diff --git a/demo-angular/app/pages/home/home.component.ts b/demo-angular/app/pages/home/home.component.ts
@@ -52,4 +52,10 @@ export class HomeComponent {
             this.navigationService.go(['login'], "slideRight");
         });
     }
+
+    public getCurrentAccessToken() {
+        let accessToken = Facebook.getCurrentAccessToken();
+
+        alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));
+    }
 }
diff --git a/demo-angular/app/pages/login/login.component.html b/demo-angular/app/pages/login/login.component.html
@@ -1,4 +1,5 @@
 <StackLayout class="login-buttons">
     <FacebookLoginButton (login)="onLogin($event)"></FacebookLoginButton>
     <Button text="Continue with Facebook (custom)" (tap)="login()"></Button>
+    <Button text="Get current access token" (tap)="getCurrentAccessToken()"></Button>
 </StackLayout>
diff --git a/demo-angular/app/pages/login/login.component.ts b/demo-angular/app/pages/login/login.component.ts
@@ -33,4 +33,10 @@ export class LoginComponent {
             }
         });
     }
+
+    public getCurrentAccessToken() {
+        let accessToken = Facebook.getCurrentAccessToken();
+
+        alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));
+    }
 }
diff --git a/demo-angular/package.json b/demo-angular/package.json
@@ -52,7 +52,8 @@
     "typescript": "~2.4.2",
     "webpack": "~3.8.1",
     "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-sources": "~1.0.1"
+    "webpack-sources": "~1.0.1",
+    "uglifyjs-webpack-plugin": "~1.1.6"
   },
   "scripts": {
     "ns-bundle": "ns-bundle",
diff --git a/demo/app/home-page.xml b/demo/app/home-page.xml
@@ -12,6 +12,7 @@
     <StackLayout class="buttons">
       <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>
     </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 } from "nativescript-facebook";
+import { LoginEventData, logout as fbLogout, getCurrentAccessToken } from "nativescript-facebook";
 
 let frameModule = require("tns-core-modules/ui/frame");
 let appSettings = require("tns-core-modules/application-settings");
@@ -13,22 +13,22 @@ export class HomeViewModel extends Observable {
 
   constructor() {
     super();
-        // Get logged in user's info
-        http.getJSON(config.FACEBOOK_GRAPH_API_URL + "/me?access_token=" + this.accessToken).then((res) => {
-            this.set("username", res.name);
-            this.set("userId", res.id);
-
-            // Get logged in user's avatar
-            // ref: https://github.com/NativeScript/NativeScript/issues/2176
-            console.log(config.FACEBOOK_GRAPH_API_URL + "/" + this.get("userId") + "/picture?type=large&redirect=false&access_token=" + this.accessToken);
-            http.getJSON(config.FACEBOOK_GRAPH_API_URL + "/" + this.get("userId") + "/picture?type=large&redirect=false&access_token=" + this.accessToken).then((res) => {
-                this.set("avatarUrl", res.data.url);
-            }, function (err) {
-                alert("Error getting user info: " + err);
-            });
-        }, function (err) {
-            alert("Error getting user info: " + err);
-        });
+    // Get logged in user's info
+    http.getJSON(config.FACEBOOK_GRAPH_API_URL + "/me?access_token=" + this.accessToken).then((res) => {
+      this.set("username", res.name);
+      this.set("userId", res.id);
+
+      // Get logged in user's avatar
+      // ref: https://github.com/NativeScript/NativeScript/issues/2176
+      console.log(config.FACEBOOK_GRAPH_API_URL + "/" + this.get("userId") + "/picture?type=large&redirect=false&access_token=" + this.accessToken);
+      http.getJSON(config.FACEBOOK_GRAPH_API_URL + "/" + this.get("userId") + "/picture?type=large&redirect=false&access_token=" + this.accessToken).then((res) => {
+        this.set("avatarUrl", res.data.url);
+      }, function (err) {
+        alert("Error getting user info: " + err);
+      });
+    }, function (err) {
+      alert("Error getting user info: " + err);
+    });
   }
 
   private _navigate(path: string) {
@@ -50,4 +50,10 @@ export class HomeViewModel extends Observable {
       this._navigate("login-page");
     });
   }
+
+  public getCurrentAccessToken() {
+    let accessToken = getCurrentAccessToken();
+
+    alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));
+  }
 }
diff --git a/demo/app/login-page.xml b/demo/app/login-page.xml
@@ -4,5 +4,6 @@
   <StackLayout class="login-buttons">
     <Facebook:LoginButton automationText="fbLogin" login="{{ onLogin }}"></Facebook:LoginButton>
     <Button tap="{{ login }}" text="Continue with Facebook (custom)"></Button>
+    <Button tap="{{ getCurrentAccessToken }}" text="Get current access token"></Button>
   </StackLayout>
 </Page>
diff --git a/demo/app/login-view-model.ts b/demo/app/login-view-model.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'tns-core-modules/data/observable';
-import { LoginEventData, login as fbLogin } from "nativescript-facebook";
+import { LoginEventData, login as fbLogin, getCurrentAccessToken } from "nativescript-facebook";
 let frameModule = require("tns-core-modules/ui/frame");
 let appSettings = require("tns-core-modules/application-settings");
 
@@ -32,4 +32,10 @@ export class LoginViewModel extends Observable {
       }
     });
   }
+
+  public getCurrentAccessToken() {
+    let accessToken = getCurrentAccessToken();
+
+    alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));
+  }
 }
diff --git a/demo/package.json b/demo/package.json
@@ -1,11 +1,11 @@
 {
   "nativescript": {
     "id": "org.nativescript.demo",
-    "tns-ios": {
-      "version": "3.4.0"
-    },
     "tns-android": {
       "version": "3.4.0"
+    },
+    "tns-ios": {
+      "version": "3.4.1"
     }
   },
   "dependencies": {
@@ -43,7 +43,8 @@
     "wd": "~1.1.1",
     "webpack": "~3.8.1",
     "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-sources": "~1.0.1"
+    "webpack-sources": "~1.0.1",
+    "uglifyjs-webpack-plugin": "~1.1.6"
   },
   "scripts": {
     "ns-bundle": "ns-bundle",
diff --git a/src/facebook-access-token.d.ts b/src/facebook-access-token.d.ts
@@ -0,0 +1,6 @@
+export declare class FacebookAccessToken {
+    accessToken: string;
+    userId: string;
+    refreshDate: string;
+    expirationDate: string;
+}
diff --git a/src/facebook-access-token.ts b/src/facebook-access-token.ts
@@ -0,0 +1,6 @@
+export class FacebookAccessToken {
+    public accessToken: string = "";
+    public userId: string = "";
+    public refreshDate: string = "";
+    public expirationDate: string = "";
+}
diff --git a/src/index.android.ts b/src/index.android.ts
@@ -1,4 +1,4 @@
 export * from "./login-manager";
-export * from  "./login-button";
+export * from "./ui/login-button";
 export * from "./login-event-data";
 export * from "./login-behavior";
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -1,5 +1,5 @@
 export * from "./login-manager";
-export * from "./login-button";
+export * from "./ui/login-button";
 export * from "./login-response";
 export * from "./login-event-data";
 export * from "./login-behavior";
diff --git a/src/index.ios.ts b/src/index.ios.ts
@@ -1,5 +1,5 @@
 import * as applicationModule from "tns-core-modules/application";
-export * from "./login-button";
+export * from "./ui/login-button";
 export * from "./login-manager";
 export * from "./login-event-data";
 export * from "./login-behavior";
diff --git a/src/login-manager.android.ts b/src/login-manager.android.ts
@@ -1,5 +1,6 @@
 import * as application from "tns-core-modules/application";
 import { LoginResponse } from './login-response';
+import { FacebookAccessToken } from "./facebook-access-token";
 declare let com: any;
 
 const LOGIN_PERMISSIONS = ["public_profile", "email"];
@@ -104,10 +105,28 @@ export function login(callback: Function) {
   requestReadPermissions(LOGIN_PERMISSIONS, callback);
 }
 
+export function getCurrentAccessToken() {
+  let sdkAccessToken = com.facebook.AccessToken.getCurrentAccessToken();
+  let accessToken = null;
+
+  if (sdkAccessToken) {
+    accessToken = new FacebookAccessToken();
+    accessToken.accessToken = sdkAccessToken.getToken();
+    accessToken.userId = sdkAccessToken.getUserId();
+    accessToken.expirationDate = convertToISOStringDate(sdkAccessToken.getExpires().toGMTString());
+    accessToken.refreshDate = convertToISOStringDate(sdkAccessToken.getLastRefresh().toGMTString());
+  }
+
+  return accessToken;
+}
+
 export function logout(callback: Function) {
   loginManager.logOut();
   if (callback) {
     callback();
   }
 }
 
+function convertToISOStringDate(GMTStringDate: string) {
+  return new Date(GMTStringDate).toISOString();
+}
diff --git a/src/login-manager.d.ts b/src/login-manager.d.ts
@@ -3,6 +3,7 @@ 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.
@@ -31,4 +32,8 @@ export declare function login(callback: Function): void;
 * Trigger a logout procedure.
 * @param {Function} callback Function reference to be executed when the logout is executed.
 */
-export declare function logout(callback: Function): void;
+export declare function logout(callback: Function): void;
+/**
+* Get the current access token.
+*/
+export declare function getCurrentAccessToken(): FacebookAccessToken;
diff --git a/src/login-manager.ios.ts b/src/login-manager.ios.ts
@@ -1,7 +1,9 @@
 import * as applicationModule from "tns-core-modules/application";
 import { LoginResponse } from './login-response';
 import { LoginBehavior } from './login-behavior';
+import { FacebookAccessToken } from "./facebook-access-token";
 declare let FBSDKLoginManager: any;
+declare let FBSDKAccessToken: any;
 declare let FBSDKSettings: any;
 declare class FBSDKLoginManagerLoginResult { isCancelled: boolean; token: any; }
 declare class UIResponder { }
@@ -77,6 +79,21 @@ export function login(callback: Function) {
   requestReadPermissions(LOGIN_PERMISSIONS, callback);
 }
 
+export function getCurrentAccessToken() {
+  let sdkAccessToken = FBSDKAccessToken.currentAccessToken();
+  let accessToken = null;
+
+  if (sdkAccessToken) {
+    accessToken = new FacebookAccessToken();
+    accessToken.accessToken = sdkAccessToken.tokenString;
+    accessToken.userId = sdkAccessToken.userID;
+    accessToken.refreshDate = sdkAccessToken.refreshDate;
+    accessToken.expirationDate = sdkAccessToken.expirationDate;
+  }
+
+  return accessToken;
+}
+
 export function logout(callback: Function) {
   loginManager.logOut();
   if (callback) {
diff --git a/src/ui/login-button.android.ts b/src/ui/login-button.android.ts
diff --git a/src/ui/login-button.common.ts b/src/ui/login-button.common.ts
@@ -1,7 +1,7 @@
 import { View, Property } from "tns-core-modules/ui/core/view";
-import * as loginManager from './login-manager';
-import { LoginResponse } from './login-response';
-import { LoginEventData } from './login-event-data';
+import * as loginManager from './../login-manager';
+import { LoginResponse } from './../login-response';
+import { LoginEventData } from './../login-event-data';
 import { EventData } from "tns-core-modules/data/observable";
 
 export abstract class LoginButtonBase extends View {
diff --git a/src/ui/login-button.d.ts b/src/ui/login-button.d.ts
@@ -1,4 +1,4 @@
-import { LoginEventData } from './login-event-data';
+import { LoginEventData } from './../login-event-data';
 import { EventData } from "tns-core-modules/data/observable";
 import { View } from "tns-core-modules/ui/core/view";
 
diff --git a/src/ui/login-button.ios.ts b/src/ui/login-button.ios.ts
@@ -1,6 +1,6 @@
 import * as applicationModule from "tns-core-modules/application";
 import { LoginButtonBase } from './login-button.common';
-import * as loginManager from './login-manager';
+import * as loginManager from './../login-manager';
 
 declare let FBSDKLoginButton: any;
 declare class FBSDKLoginButtonDelegate { }

Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,10 @@ export class HomeComponent {`
`52`	`52`	`this.navigationService.go(['login'], "slideRight");`
`53`	`53`	`});`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ public getCurrentAccessToken() {`
	`57`	`+ let accessToken = Facebook.getCurrentAccessToken();`
	`58`	`+`
	`59`	`+ alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));`
	`60`	`+ }`
`55`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,10 @@ export class LoginComponent {`
`33`	`33`	`}`
`34`	`34`	`});`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public getCurrentAccessToken() {`
	`38`	`+ let accessToken = Facebook.getCurrentAccessToken();`
	`39`	`+`
	`40`	`+ alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));`
	`41`	`+ }`
`36`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { Observable } from 'tns-core-modules/data/observable';`
`2`		`-import { LoginEventData, login as fbLogin } from "nativescript-facebook";`
	`2`	`+import { LoginEventData, login as fbLogin, getCurrentAccessToken } from "nativescript-facebook";`
`3`	`3`	`let frameModule = require("tns-core-modules/ui/frame");`
`4`	`4`	`let appSettings = require("tns-core-modules/application-settings");`
`5`	`5`
`@@ -32,4 +32,10 @@ export class LoginViewModel extends Observable {`
`32`	`32`	`}`
`33`	`33`	`});`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ public getCurrentAccessToken() {`
	`37`	`+ let accessToken = getCurrentAccessToken();`
	`38`	`+`
	`39`	`+ alert("Current access token: " + JSON.stringify(accessToken, null, '\t'));`
	`40`	`+ }`
`35`	`41`	`}`