File tree Expand file tree Collapse file tree 1 file changed +11
-11
lines changed
Expand file tree Collapse file tree 1 file changed +11
-11
lines changed Original file line number Diff line number Diff line change 16861686 getCurrentUser : function ( ) {
16871687 if ( currentUser ) {
16881688 return this . _getUserFromResponse ( currentUser ) ;
1689- } else if ( Backendless . LocalCache . get ( "stayLoggedIn" ) ) {
1690- var userId = Backendless . LocalCache . get ( "current-user-id" ) ;
1691- return Backendless . Data . of ( Backendless . User ) . findById ( userId ) ;
1692- } else {
1693- return null ;
16941689 }
1690+
1691+ var stayLoggedIn = Backendless . LocalCache . get ( "stayLoggedIn" ) ;
1692+ var currentUserId = stayLoggedIn && Backendless . LocalCache . get ( "current-user-id" ) ;
1693+
1694+ return currentUserId && persistence . of ( User ) . findById ( currentUserId ) || null ;
16951695 } ,
16961696
16971697 update : function ( user , async ) {
43604360
43614361 UserService . prototype . getCurrentUser = function ( ) {
43624362 if ( currentUser ) {
4363- return Promise . resolve ( currentUser ) ;
4364- } else if ( Backendless . LocalCache . get ( "stayLoggedIn" ) ) {
4365- var userId = Backendless . LocalCache . get ( "current-user-id" ) ;
4366- return Backendless . Data . of ( Backendless . User ) . findById ( userId ) ;
4367- } else {
4368- return Promise . resolve ( null ) ;
4363+ return Promise . resolve ( this . _getUserFromResponse ( currentUser ) ) ;
43694364 }
4365+
4366+ var stayLoggedIn = Backendless . LocalCache . get ( "stayLoggedIn" ) ;
4367+ var currentUserId = stayLoggedIn && Backendless . LocalCache . get ( "current-user-id" ) ;
4368+
4369+ return currentUserId && persistence . of ( User ) . findById ( currentUserId ) || Promise . resolve ( null ) ;
43704370 } ;
43714371
43724372 UserService . prototype . isValidLogin = function ( ) {
You can’t perform that action at this time.
0 commit comments