@@ -61,12 +61,12 @@ const getAuthForSessionToken = async function({ config, cacheController, session
61
61
62
62
let results ;
63
63
if ( config ) {
64
- var restOptions = {
64
+ const restOptions = {
65
65
limit : 1 ,
66
66
include : 'user'
67
67
} ;
68
68
69
- var query = new RestQuery ( config , master ( config ) , '_Session' , { sessionToken} , restOptions ) ;
69
+ const query = new RestQuery ( config , master ( config ) , '_Session' , { sessionToken } , restOptions ) ;
70
70
results = ( await query . execute ( ) ) . results ;
71
71
} else {
72
72
results = ( await new Parse . Query ( Parse . Session )
@@ -79,28 +79,28 @@ const getAuthForSessionToken = async function({ config, cacheController, session
79
79
if ( results . length !== 1 || ! results [ 0 ] [ 'user' ] ) {
80
80
throw new Parse . Error ( Parse . Error . INVALID_SESSION_TOKEN , 'Invalid session token' ) ;
81
81
}
82
- var now = new Date ( ) ,
82
+ const now = new Date ( ) ,
83
83
expiresAt = results [ 0 ] . expiresAt ? new Date ( results [ 0 ] . expiresAt . iso ) : undefined ;
84
84
if ( expiresAt < now ) {
85
85
throw new Parse . Error ( Parse . Error . INVALID_SESSION_TOKEN ,
86
86
'Session token is expired.' ) ;
87
87
}
88
- var obj = results [ 0 ] [ 'user' ] ;
88
+ const obj = results [ 0 ] [ 'user' ] ;
89
89
delete obj . password ;
90
90
obj [ 'className' ] = '_User' ;
91
91
obj [ 'sessionToken' ] = sessionToken ;
92
92
if ( cacheController ) {
93
93
cacheController . user . put ( sessionToken , obj ) ;
94
94
}
95
95
const userObject = Parse . Object . fromJSON ( obj ) ;
96
- return new Auth ( { config, cacheController, isMaster : false , installationId, user : userObject } ) ;
96
+ return new Auth ( { config, cacheController, isMaster : false , installationId, user : userObject } ) ;
97
97
} ;
98
98
99
- var getAuthForLegacySessionToken = function ( { config, sessionToken, installationId } ) {
99
+ var getAuthForLegacySessionToken = function ( { config, sessionToken, installationId } ) {
100
100
var restOptions = {
101
101
limit : 1
102
102
} ;
103
- var query = new RestQuery ( config , master ( config ) , '_User' , { sessionToken : sessionToken } , restOptions ) ;
103
+ var query = new RestQuery ( config , master ( config ) , '_User' , { sessionToken } , restOptions ) ;
104
104
return query . execute ( ) . then ( ( response ) => {
105
105
var results = response . results ;
106
106
if ( results . length !== 1 ) {
@@ -109,7 +109,7 @@ var getAuthForLegacySessionToken = function({config, sessionToken, installationI
109
109
const obj = results [ 0 ] ;
110
110
obj . className = '_User' ;
111
111
const userObject = Parse . Object . fromJSON ( obj ) ;
112
- return new Auth ( { config, isMaster : false , installationId, user : userObject } ) ;
112
+ return new Auth ( { config, isMaster : false , installationId, user : userObject } ) ;
113
113
} ) ;
114
114
}
115
115
@@ -138,9 +138,7 @@ Auth.prototype.getRolesForUser = function() {
138
138
}
139
139
} ;
140
140
const query = new RestQuery ( this . config , master ( this . config ) , '_Role' , restWhere , { } ) ;
141
- return query . execute ( ) . then ( ( { results } ) => {
142
- return results ;
143
- } ) ;
141
+ return query . execute ( ) . then ( ( { results } ) => results ) ;
144
142
}
145
143
146
144
return new Parse . Query ( Parse . Role )
@@ -149,7 +147,7 @@ Auth.prototype.getRolesForUser = function() {
149
147
. then ( ( results ) => results . map ( ( obj ) => obj . toJSON ( ) ) ) ;
150
148
}
151
149
152
- // Iterates through the role tree and compiles a users roles
150
+ // Iterates through the role tree and compiles a user's roles
153
151
Auth . prototype . _loadRoles = async function ( ) {
154
152
if ( this . cacheController ) {
155
153
const cachedRoles = await this . cacheController . role . get ( this . user . id ) ;
0 commit comments