Skip to content

Commit b212698

Browse files
committed
async functions get user async
1 parent 081d763 commit b212698

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

src/ParseUser.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -484,13 +484,13 @@ class ParseUser extends ParseObject {
484484
* @param {...any} args
485485
* @returns {Parse.User}
486486
*/
487-
destroy(...args: Array<any>): Promise<ParseUser> {
488-
return super.destroy.apply(this, args).then(() => {
489-
if (this.isCurrent()) {
490-
return CoreManager.getUserController().removeUserFromDisk();
491-
}
492-
return this;
493-
});
487+
async destroy(...args: Array<any>): Promise<ParseUser> {
488+
await super.destroy.apply(this, args);
489+
const current = await this.isCurrentAsync();
490+
if (current) {
491+
return CoreManager.getUserController().removeUserFromDisk();
492+
}
493+
return this;
494494
}
495495

496496
/**
@@ -500,13 +500,13 @@ class ParseUser extends ParseObject {
500500
* @param {...any} args
501501
* @returns {Parse.User}
502502
*/
503-
fetch(...args: Array<any>): Promise<ParseUser> {
504-
return super.fetch.apply(this, args).then(() => {
505-
if (this.isCurrent()) {
506-
return CoreManager.getUserController().updateUserOnDisk(this);
507-
}
508-
return this;
509-
});
503+
async fetch(...args: Array<any>): Promise<ParseUser> {
504+
await super.fetch.apply(this, args);
505+
const current = await this.isCurrentAsync();
506+
if (current) {
507+
return CoreManager.getUserController().updateUserOnDisk(this);
508+
}
509+
return this;
510510
}
511511

512512
/**
@@ -516,13 +516,13 @@ class ParseUser extends ParseObject {
516516
* @param {...any} args
517517
* @returns {Parse.User}
518518
*/
519-
fetchWithInclude(...args: Array<any>): Promise<ParseUser> {
520-
return super.fetchWithInclude.apply(this, args).then(() => {
521-
if (this.isCurrent()) {
522-
return CoreManager.getUserController().updateUserOnDisk(this);
523-
}
524-
return this;
525-
});
519+
async fetchWithInclude(...args: Array<any>): Promise<ParseUser> {
520+
await super.fetchWithInclude.apply(this, args);
521+
const current = await this.isCurrentAsync();
522+
if (current) {
523+
return CoreManager.getUserController().updateUserOnDisk(this);
524+
}
525+
return this;
526526
}
527527

528528
/**
@@ -1171,7 +1171,7 @@ const DefaultController = {
11711171
return RESTController.request('POST', 'requestPasswordReset', { email: email }, options);
11721172
},
11731173

1174-
upgradeToRevocableSession(user: ParseUser, options: RequestOptions) {
1174+
async upgradeToRevocableSession(user: ParseUser, options: RequestOptions) {
11751175
const token = user.getSessionToken();
11761176
if (!token) {
11771177
return Promise.reject(
@@ -1182,15 +1182,15 @@ const DefaultController = {
11821182
options.sessionToken = token;
11831183

11841184
const RESTController = CoreManager.getRESTController();
1185-
return RESTController.request('POST', 'upgradeToRevocableSession', {}, options).then(result => {
1186-
const session = new ParseSession();
1187-
session._finishFetch(result);
1188-
user._finishFetch({ sessionToken: session.getSessionToken() });
1189-
if (user.isCurrent()) {
1190-
return DefaultController.setCurrentUser(user);
1191-
}
1192-
return Promise.resolve(user);
1193-
});
1185+
const result = await RESTController.request('POST', 'upgradeToRevocableSession', {}, options);
1186+
const session = new ParseSession();
1187+
session._finishFetch(result);
1188+
user._finishFetch({ sessionToken: session.getSessionToken() });
1189+
const current = await user.isCurrentAsync();
1190+
if (current) {
1191+
return DefaultController.setCurrentUser(user);
1192+
}
1193+
return Promise.resolve(user);
11941194
},
11951195

11961196
linkWith(user: ParseUser, authData: AuthData, options: FullOptions) {

0 commit comments

Comments
 (0)