Added PhoneGap specific features

userapp-io · Apr 25, 2014 · 1877bae · 1877bae
1 parent 4cf7748
commit 1877bae
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ AngularJS module that adds user authentication to your app with [UserApp](https:
 * [Services](#services)
 * [Directives](#directives)
 * [Events](#events)
+* [PhoneGap](#phonegap)
 * [Example](#example)
 * [Help](#help)  
 * [License](#license)
@@ -519,6 +520,12 @@ To connect your AngularJS app to a back-end API, perform the AJAX requests on th
   });
   ```
 
+## PhoneGap
+
+This module works perfectly out of the box with [PhoneGap](http://phonegap.com/). 
+But if you want persistent sessions (like the Facebook, Twitter, and Instagram apps has), you need to include [userapp-phonegap](https://github.com/userapp-io/userapp-phonegap) into your project.
+It will automatically extend the AngularJS module with functionality that sets up persistent sessions.
+
 ## Example
 
 See [example/](https://github.com/userapp-io/userapp-angular/tree/master/example) for a demo app based on [angular-seed](https://github.com/angular/angular-seed).

diff --git a/angularjs.userapp.js b/angularjs.userapp.js
@@ -142,11 +142,19 @@ var userappModule = angular.module('UserApp', []);
                 // If a UserApp token is present, use that for authentication
                 var remoteToken;
                 if (!token && (remoteToken = $location.search().ua_token)) {
-                    token = remoteToken;
+                    this.activate(remoteToken, function() {
+                        if (UserApp.setupPersistentToken) {
+                            UserApp.setupPersistentToken(function(error, token) {
+                                if (token) {
+                                    that.token(token.value);
+                                }
+                            });
+                        }
+                    });
+                } else if (token) {
+                    this.activate(token);
                 }
 
-                token && this.activate(token);
-
                 // Listen for route changes
                 if ($state) {
                     $rootScope.$on('$stateChangeStart', function(ev, toState) {
@@ -324,7 +332,7 @@ var userappModule = angular.module('UserApp', []);
 
                 UserApp.User.save(user, function(error, result) {
                     if (!error) {
-                        // check lock
+                        // Check locks
                         if (result.locks && result.locks.length > 0 && result.locks[0].type == 'EMAIL_NOT_VERIFIED') {
                             callback && callback({ name: 'EMAIL_NOT_VERIFIED' }, result);
                             return;
@@ -364,15 +372,16 @@ var userappModule = angular.module('UserApp', []);
                             callback && callback({ name: 'LOCKED', message: 'Your account has been locked.' }, result);
                         } else {
                             that.activate(result.token, function() {
-                                /*if (UserApp.setupPersistentToken) {
-                                    UserApp.setupPersistentToken(function(token) {
-                                        that.token(token.value);
+                                if (UserApp.setupPersistentToken) {
+                                    UserApp.setupPersistentToken(function(error, token) {
+                                        if (token) {
+                                            that.token(token.value);
+                                        }
                                         callback && callback(error, result);
                                     });
-                                    console.log("Create persistent connection");
-                                } else {*/
+                                } else {
                                     callback && callback(error, result);
-                                //}
+                                }
                             });
                         }
                     } else {
@@ -385,20 +394,19 @@ var userappModule = angular.module('UserApp', []);
             logout: function(callback) {
                 var that = this;
 
-                /*if (UserApp.removePersistentToken) {
-                    UserApp.removePersistentToken(function(success) {
+                if (UserApp.removePersistentToken) {
+                    UserApp.removePersistentToken(function(error) {
                         that.reset();
+                        $rootScope.$broadcast('user.logout');
+                        callback && callback(error);
                     });
-                } else {*/
+                } else {
                     UserApp.User.logout(function(error) {
-                    	that.reset();
-                    	$rootScope.$broadcast('user.logout');
-	                callback && callback(error);
+                        that.reset();
+                        $rootScope.$broadcast('user.logout');
+                        callback && callback(error);
                     });  
-                //}
-
-                //$rootScope.$broadcast('user.logout');
-                //callback && callback(error);
+                }
             },
 
             // Send reset password email
@@ -500,9 +508,9 @@ var userappModule = angular.module('UserApp', []);
             startHeartbeat: function(interval) {
                 var that = this;
 
-		if (interval != undefined && interval < 10000) {
-			return;
-		}
+        		if (interval != undefined && interval < 10000) {
+        			return;
+        		}
 
                 clearInterval(heartBeatInterval);
                 heartBeatInterval = setInterval(function() {

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
         "name": "userapp-angular",
-        "version": "1.5.1",
+        "version": "1.6.0",
         "main": "./angularjs.userapp.js",
 	"dependencies": {
 		"userapp": "latest"