Skip to content

Commit 7d8b430

Browse files
jyspermwangxiao
authored andcommitted
有关 disable-current-user 的若干优化 (#291)
* AV.Cloud.rpc 支持 sessionToken * File 不再调用 User.current 以免打印警告 * disbaleCurrentUser 相关的警告只打印一次并打印调用栈和文档链接、User#logout 总是返回一个 Promise * 总是打印 disbaleCurrentUser 相关的警告且不再包含调用栈
1 parent ee8b86e commit 7d8b430

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/cloudfunction.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ module.exports = function(AV) {
5252
._thenRunCallbacks(options);
5353
}
5454

55-
return AVRequest('call', name, null, 'POST', AV._encodeObjectOrArray(data)).then(function(resp) {
55+
return AVRequest('call', name, null, 'POST', AV._encodeObjectOrArray(data),
56+
options && options.sessionToken).then(function(resp) {
5657
return AV._decode('', resp).result;
5758
})._thenRunCallbacks(options);
5859
},

src/file.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ module.exports = function(AV) {
351351
let owner;
352352
if (data && data.owner) {
353353
owner = data.owner;
354-
} else {
354+
} else if (!AV._config.disableCurrentUser) {
355355
try {
356356
owner = AV.User.current();
357357
} catch (e) {

src/user.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ module.exports = function(AV) {
582582
*/
583583
authenticated: function() {
584584
return !!this._sessionToken &&
585-
(AV.User.current() && AV.User.current().id === this.id);
585+
(!AV._config.disableCurrentUser && AV.User.current() && AV.User.current().id === this.id);
586586
},
587587

588588
getSessionToken: function() {
@@ -796,7 +796,8 @@ module.exports = function(AV) {
796796
*/
797797
logOut: function() {
798798
if (AV._config.disableCurrentUser) {
799-
return console.warn('AV.User.current() was disabled in multi-user environment, call logOut() from user object instead');
799+
console.warn('AV.User.current() was disabled in multi-user environment, call logOut() from user object instead https://leancloud.cn/docs/leanengine-node-sdk-upgrade-1.html');
800+
return AV.Promise.as(null);
800801
}
801802

802803
if (AV.User._currentUser !== null) {
@@ -977,7 +978,7 @@ module.exports = function(AV) {
977978
*/
978979
currentAsync: function() {
979980
if (AV._config.disableCurrentUser) {
980-
console.warn('AV.User.currentAsync() was disabled in multi-user environment, access user from request instead');
981+
console.warn('AV.User.currentAsync() was disabled in multi-user environment, access user from request instead https://leancloud.cn/docs/leanengine-node-sdk-upgrade-1.html');
981982
return AV.Promise.as(null);
982983
}
983984

@@ -1026,7 +1027,7 @@ module.exports = function(AV) {
10261027
*/
10271028
current: function() {
10281029
if (AV._config.disableCurrentUser) {
1029-
console.warn('AV.User.current() was disabled in multi-user environment, access user from request instead');
1030+
console.warn('AV.User.current() was disabled in multi-user environment, access user from request instead https://leancloud.cn/docs/leanengine-node-sdk-upgrade-1.html');
10301031
return null;
10311032
}
10321033

@@ -1095,7 +1096,7 @@ module.exports = function(AV) {
10951096
_registerAuthenticationProvider: function(provider) {
10961097
AV.User._authProviders[provider.getAuthType()] = provider;
10971098
// Synchronize the current user with the auth provider.
1098-
if (AV.User.current()) {
1099+
if (!AV._config.disableCurrentUser && AV.User.current()) {
10991100
AV.User.current()._synchronizeAuthData(provider.getAuthType());
11001101
}
11011102
},

0 commit comments

Comments
 (0)