@@ -20,31 +20,31 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
2020 * @param {Function } callback - optional, function(error, user)
2121 * @return {Promise }
2222 */
23- login : function ( user , callback ) {
23+ login ( user , callback ) {
2424 return $http . post ( '/auth/local' , {
2525 email : user . email ,
2626 password : user . password
2727 } )
28- . then ( function ( res ) {
29- $cookies . put ( 'token' , res . data . token ) ;
30- currentUser = User . get ( ) ;
31- return currentUser . $promise ;
32- } )
33- . then ( function ( user ) {
34- safeCb ( callback ) ( null , user ) ;
35- return user ;
36- } )
37- . catch ( function ( err ) {
38- Auth . logout ( ) ;
39- safeCb ( callback ) ( err . data ) ;
40- return $q . reject ( err . data ) ;
41- } ) ;
28+ . then ( res => {
29+ $cookies . put ( 'token' , res . data . token ) ;
30+ currentUser = User . get ( ) ;
31+ return currentUser . $promise ;
32+ } )
33+ . then ( user => {
34+ safeCb ( callback ) ( null , user ) ;
35+ return user ;
36+ } )
37+ . catch ( err => {
38+ Auth . logout ( ) ;
39+ safeCb ( callback ) ( err . data ) ;
40+ return $q . reject ( err . data ) ;
41+ } ) ;
4242 } ,
4343
4444 /**
4545 * Delete access token and user info
4646 */
47- logout : function ( ) {
47+ logout ( ) {
4848 $cookies . remove ( 'token' ) ;
4949 currentUser = { } ;
5050 } ,
@@ -56,7 +56,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
5656 * @param {Function } callback - optional, function(error, user)
5757 * @return {Promise }
5858 */
59- createUser : function ( user , callback ) {
59+ createUser ( user , callback ) {
6060 return User . save ( user ,
6161 function ( data ) {
6262 $cookies . put ( 'token' , data . token ) ;
@@ -77,7 +77,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
7777 * @param {Function } callback - optional, function(error, user)
7878 * @return {Promise }
7979 */
80- changePassword : function ( oldPassword , newPassword , callback ) {
80+ changePassword ( oldPassword , newPassword , callback ) {
8181 return User . changePassword ( { id : currentUser . _id } , {
8282 oldPassword : oldPassword ,
8383 newPassword : newPassword
@@ -95,18 +95,18 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
9595 * @param {Function|* } callback - optional, funciton(user)
9696 * @return {Object|Promise }
9797 */
98- getCurrentUser : function ( callback ) {
98+ getCurrentUser ( callback ) {
9999 if ( arguments . length === 0 ) {
100100 return currentUser ;
101101 }
102102
103103 var value = ( currentUser . hasOwnProperty ( '$promise' ) ) ?
104104 currentUser . $promise : currentUser ;
105105 return $q . when ( value )
106- . then ( function ( user ) {
106+ . then ( user => {
107107 safeCb ( callback ) ( user ) ;
108108 return user ;
109- } , function ( ) {
109+ } , ( ) => {
110110 safeCb ( callback ) ( { } ) ;
111111 return { } ;
112112 } ) ;
@@ -119,13 +119,13 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
119119 * @param {Function|* } callback - optional, function(is)
120120 * @return {Bool|Promise }
121121 */
122- isLoggedIn : function ( callback ) {
122+ isLoggedIn ( callback ) {
123123 if ( arguments . length === 0 ) {
124124 return currentUser . hasOwnProperty ( 'role' ) ;
125125 }
126126
127127 return Auth . getCurrentUser ( null )
128- . then ( function ( user ) {
128+ . then ( user => {
129129 var is = user . hasOwnProperty ( 'role' ) ;
130130 safeCb ( callback ) ( is ) ;
131131 return is ;
@@ -140,7 +140,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
140140 * @param {Function|* } callback - optional, function(has)
141141 * @return {Bool|Promise }
142142 */
143- hasRole : function ( role , callback ) {
143+ hasRole ( role , callback ) {
144144 var hasRole = function ( r , h ) {
145145 return userRoles . indexOf ( r ) >= userRoles . indexOf ( h ) ;
146146 } ;
@@ -150,7 +150,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
150150 }
151151
152152 return Auth . getCurrentUser ( null )
153- . then ( function ( user ) {
153+ . then ( user => {
154154 var has = ( user . hasOwnProperty ( 'role' ) ) ?
155155 hasRole ( user . role , role ) : false ;
156156 safeCb ( callback ) ( has ) ;
@@ -165,7 +165,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
165165 * @param {Function|* } callback - optional, function(is)
166166 * @return {Bool|Promise }
167167 */
168- isAdmin : function ( ) {
168+ isAdmin ( ) {
169169 return Auth . hasRole
170170 . apply ( Auth , [ ] . concat . apply ( [ 'admin' ] , arguments ) ) ;
171171 } ,
@@ -175,7 +175,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
175175 *
176176 * @return {String } - a token string used for authenticating
177177 */
178- getToken : function ( ) {
178+ getToken ( ) {
179179 return $cookies . get ( 'token' ) ;
180180 }
181181 } ;
0 commit comments