several fixes

ytlabs · Jul 14, 2015 · ea4668d · ea4668d
1 parent e9fa3c0
commit ea4668d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "basyt-angular",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "basyt AngularJS Module",
   "repository": {
     "type": "git",

diff --git a/dist/basyt.angular.js b/dist/basyt.angular.js
@@ -17,7 +17,7 @@ angular.module('basyt.angular', ['ui.router'])
                 if (!Auth.isAuthenticated(next.role)) {
                     if($alert) {
                         $alert({
-                            title: BasytAuthMessages.loginRequired,
+                            title: BasytAuthMessages.authFailed,
                             type: 'danger',
                             duration: 6
                         })
@@ -112,13 +112,6 @@ angular.module('basyt.angular')
                                 if (angular.isUndefined(User.id))
                                     return false;
                                 $rootScope.activeUser = User;
-                                if($alert) {
-                                    $alert({
-                                        title: BasytAuthMessages.loginSuccess,
-                                        type: 'info',
-                                        duration: 3
-                                    })
-                                }
                                 $rootScope.activeUser.user_state = Auth.isLord()
                                     ? 'LORD'
                                     : Auth.isAdmin()
@@ -162,6 +155,7 @@ angular.module('basyt.angular')
                     }, logout);
                 }
             };
+        $rootScope.activeUser = User;
         return Auth;
     }]);
 angular.module('basyt.angular')

diff --git a/dist/basyt.angular.min.js b/dist/basyt.angular.min.js
diff --git a/module.js b/module.js
@@ -17,7 +17,7 @@ angular.module('basyt.angular', ['ui.router'])
                 if (!Auth.isAuthenticated(next.role)) {
                     if($alert) {
                         $alert({
-                            title: BasytAuthMessages.loginRequired,
+                            title: BasytAuthMessages.authFailed,
                             type: 'danger',
                             duration: 6
                         })

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basyt-angular",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "basyt AngularJS Module",
   "repository": {
     "type": "git",

diff --git a/services/Auth.js b/services/Auth.js
@@ -71,13 +71,6 @@ angular.module('basyt.angular')
                                 if (angular.isUndefined(User.id))
                                     return false;
                                 $rootScope.activeUser = User;
-                                if($alert) {
-                                    $alert({
-                                        title: BasytAuthMessages.loginSuccess,
-                                        type: 'info',
-                                        duration: 3
-                                    })
-                                }
                                 $rootScope.activeUser.user_state = Auth.isLord()
                                     ? 'LORD'
                                     : Auth.isAdmin()
@@ -121,5 +114,6 @@ angular.module('basyt.angular')
                     }, logout);
                 }
             };
+        $rootScope.activeUser = User;
         return Auth;
     }]);