Browse Source

Merge branch 'release' of gitlab.com:Isleward/isleward into release

tags/v0.10.6.3
Shaun 2 years ago
parent
commit
f452e80578
1 changed files with 0 additions and 46 deletions
  1. +0
    -46
      src/server/components/auth.js

+ 0
- 46
src/server/components/auth.js View File

@@ -288,27 +288,12 @@ module.exports = {
return; return;
} }


if (username === 'bbb' || username === 'aaa') {
await io.setAsync({
key: new Date(),
table: 'error',
value: username + '1'
});
}

const emBeforeLogin = { const emBeforeLogin = {
obj: this.obj, obj: this.obj,
success: true, success: true,
msg: null msg: null
}; };
await eventEmitter.emit('onBeforeLogin', emBeforeLogin); await eventEmitter.emit('onBeforeLogin', emBeforeLogin);
if (username === 'bbb' || username === 'aaa') {
await io.setAsync({
key: new Date(),
table: 'error',
value: username + '2'
});
}
if (!emBeforeLogin.success) { if (!emBeforeLogin.success) {
msg.callback(emBeforeLogin.msg); msg.callback(emBeforeLogin.msg);


@@ -317,13 +302,6 @@ module.exports = {
this.username = username; this.username = username;
await cons.logOut(this.obj); await cons.logOut(this.obj);
if (username === 'bbb' || username === 'aaa') {
await io.setAsync({
key: new Date(),
table: 'error',
value: username + '3'
});
}


this.initTracker(); this.initTracker();


@@ -336,14 +314,6 @@ module.exports = {
level: 0 level: 0
}; };


if (username === 'bbb' || username === 'aaa') {
await io.setAsync({
key: new Date(),
table: 'error',
value: username + '4'
});
}

const msgAccountInfo = { const msgAccountInfo = {
username, username,
accountInfo accountInfo
@@ -351,24 +321,8 @@ module.exports = {


await eventEmitter.emit('onBeforeGetAccountInfo', msgAccountInfo); await eventEmitter.emit('onBeforeGetAccountInfo', msgAccountInfo);


if (username === 'bbb' || username === 'aaa') {
await io.setAsync({
key: new Date(),
table: 'error',
value: username + '5'
});
}

await eventEmitter.emit('onAfterLogin', { username }); await eventEmitter.emit('onAfterLogin', { username });


if (username === 'bbb' || username === 'aaa') {
await io.setAsync({
key: new Date(),
table: 'error',
value: username + '6'
});
}

this.accountInfo = msgAccountInfo.accountInfo; this.accountInfo = msgAccountInfo.accountInfo;


msg.callback(); msg.callback();


Loading…
Cancel
Save