clear console.log
This commit is contained in:
parent
f09a97d74a
commit
3628a0cdf1
@ -23,7 +23,6 @@ export class Org extends Model {
|
|||||||
async addUser(user: User, opts?: { operateId?: string; role: string; needPermission?: boolean; isAdmin?: boolean }) {
|
async addUser(user: User, opts?: { operateId?: string; role: string; needPermission?: boolean; isAdmin?: boolean }) {
|
||||||
const hasUser = this.users.find((u) => u.uid === user.id);
|
const hasUser = this.users.find((u) => u.uid === user.id);
|
||||||
if (hasUser) {
|
if (hasUser) {
|
||||||
console.log('current org', this.username, 'has', user.username);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (user.type !== 'user') {
|
if (user.type !== 'user') {
|
||||||
@ -70,11 +69,6 @@ export class Org extends Model {
|
|||||||
}
|
}
|
||||||
await Org.update({ users }, { where: { id: this.id } });
|
await Org.update({ users }, { where: { id: this.id } });
|
||||||
|
|
||||||
console.log(
|
|
||||||
'org users',
|
|
||||||
this.username,
|
|
||||||
users.map((u) => [u.uid, u.role]),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* operateId 是真实操作者的id
|
* operateId 是真实操作者的id
|
||||||
@ -95,11 +89,6 @@ export class Org extends Model {
|
|||||||
}
|
}
|
||||||
await user.expireOrgs();
|
await user.expireOrgs();
|
||||||
const users = this.users.filter((u) => u.uid !== user.id || u.role === 'owner');
|
const users = this.users.filter((u) => u.uid !== user.id || u.role === 'owner');
|
||||||
console.log(
|
|
||||||
'org users',
|
|
||||||
this.username,
|
|
||||||
users.map((u) => [u.uid, u.role]),
|
|
||||||
);
|
|
||||||
await Org.update({ users }, { where: { id: this.id } });
|
await Org.update({ users }, { where: { id: this.id } });
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -168,7 +168,6 @@ export class User extends Model {
|
|||||||
if (this.tokenUser && this.tokenUser.uid) {
|
if (this.tokenUser && this.tokenUser.uid) {
|
||||||
id = this.tokenUser.uid;
|
id = this.tokenUser.uid;
|
||||||
} else {
|
} else {
|
||||||
console.log('getOrgs', 'no uid', this.id, this.username);
|
|
||||||
throw new CustomError('Permission denied');
|
throw new CustomError('Permission denied');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -94,10 +94,8 @@ export class RedisTokenStore implements Store<OauthUser> {
|
|||||||
try {
|
try {
|
||||||
const value = await this.get(key);
|
const value = await this.get(key);
|
||||||
if (!value) {
|
if (!value) {
|
||||||
console.log('getObject key not found', key);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
console.log('getObject key found', key, value);
|
|
||||||
return JSON.parse(value);
|
return JSON.parse(value);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('get key parse error', error);
|
console.log('get key parse error', error);
|
||||||
@ -106,7 +104,7 @@ export class RedisTokenStore implements Store<OauthUser> {
|
|||||||
}
|
}
|
||||||
async del(key: string) {
|
async del(key: string) {
|
||||||
const number = await this.redis.del(this.prefix + key);
|
const number = await this.redis.del(this.prefix + key);
|
||||||
console.log('del', key, number);
|
return number;
|
||||||
}
|
}
|
||||||
async setObject(key: string, value: OauthUser, opts?: StoreSetOpts) {
|
async setObject(key: string, value: OauthUser, opts?: StoreSetOpts) {
|
||||||
await this.set(key, JSON.stringify(value), opts?.expire);
|
await this.set(key, JSON.stringify(value), opts?.expire);
|
||||||
@ -119,7 +117,6 @@ export class RedisTokenStore implements Store<OauthUser> {
|
|||||||
if (value?.orgId) {
|
if (value?.orgId) {
|
||||||
userPrefix = 'org:' + value?.orgId + ':user:' + value?.id;
|
userPrefix = 'org:' + value?.orgId + ':user:' + value?.id;
|
||||||
}
|
}
|
||||||
console.log('delObject userPrefix', userPrefix, refreshToken, accessToken);
|
|
||||||
if (refreshToken) {
|
if (refreshToken) {
|
||||||
await this.del(refreshToken);
|
await this.del(refreshToken);
|
||||||
await this.del(userPrefix + ':refreshToken:' + refreshToken);
|
await this.del(userPrefix + ':refreshToken:' + refreshToken);
|
||||||
@ -212,10 +209,7 @@ export class OAuth<T extends OauthUser> {
|
|||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
async verifyToken(token: string) {
|
async verifyToken(token: string) {
|
||||||
console.log('verifyToken get token', token);
|
|
||||||
const res = await this.store.getObject(token);
|
const res = await this.store.getObject(token);
|
||||||
console.log('verifyToken get res', res);
|
|
||||||
console.log('resetToken token', await this.store.keys());
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user