|
|
|
|
@ -6,28 +6,28 @@ import { extractProps } from '../meta/helpers/extractProps';
|
|
|
|
|
import NocoCache from '../cache/NocoCache'; |
|
|
|
|
import { NcError } from '../meta/helpers/catchError'; |
|
|
|
|
export default class User implements UserType { |
|
|
|
|
id: string; |
|
|
|
|
id: string |
|
|
|
|
|
|
|
|
|
/** @format email */ |
|
|
|
|
email: string; |
|
|
|
|
|
|
|
|
|
password?: string; |
|
|
|
|
salt?: string; |
|
|
|
|
firstname: string; |
|
|
|
|
lastname: string; |
|
|
|
|
username?: string; |
|
|
|
|
refresh_token?: string; |
|
|
|
|
invite_token?: string; |
|
|
|
|
invite_token_expires?: number | Date; |
|
|
|
|
reset_password_expires?: number | Date; |
|
|
|
|
reset_password_token?: string; |
|
|
|
|
email_verification_token?: string; |
|
|
|
|
email_verified: boolean; |
|
|
|
|
roles?: string; |
|
|
|
|
token_version?: string; |
|
|
|
|
email: string |
|
|
|
|
|
|
|
|
|
password?: string |
|
|
|
|
salt?: string |
|
|
|
|
firstname: string |
|
|
|
|
lastname: string |
|
|
|
|
username?: string |
|
|
|
|
refresh_token?: string |
|
|
|
|
invite_token?: string |
|
|
|
|
invite_token_expires?: number | Date |
|
|
|
|
reset_password_expires?: number | Date |
|
|
|
|
reset_password_token?: string |
|
|
|
|
email_verification_token?: string |
|
|
|
|
email_verified: boolean |
|
|
|
|
roles?: string |
|
|
|
|
token_version?: string |
|
|
|
|
|
|
|
|
|
constructor(data: User) { |
|
|
|
|
Object.assign(this, data); |
|
|
|
|
Object.assign(this, data) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public static async insert(user: Partial<User>, ncMeta = Noco.ncMeta) { |
|
|
|
|
@ -48,22 +48,22 @@ export default class User implements UserType {
|
|
|
|
|
'email_verified', |
|
|
|
|
'roles', |
|
|
|
|
'token_version', |
|
|
|
|
]); |
|
|
|
|
]) |
|
|
|
|
|
|
|
|
|
if (insertObj.email) { |
|
|
|
|
insertObj.email = insertObj.email.toLowerCase(); |
|
|
|
|
insertObj.email = insertObj.email.toLowerCase() |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const { id } = await ncMeta.metaInsert2( |
|
|
|
|
null, |
|
|
|
|
null, |
|
|
|
|
MetaTable.USERS, |
|
|
|
|
insertObj |
|
|
|
|
); |
|
|
|
|
insertObj, |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
await NocoCache.del(CacheScope.INSTANCE_META); |
|
|
|
|
await NocoCache.del(CacheScope.INSTANCE_META) |
|
|
|
|
|
|
|
|
|
return this.get(id, ncMeta); |
|
|
|
|
return this.get(id, ncMeta) |
|
|
|
|
} |
|
|
|
|
public static async update(id, user: Partial<User>, ncMeta = Noco.ncMeta) { |
|
|
|
|
const updateObj = extractProps(user, [ |
|
|
|
|
@ -82,13 +82,13 @@ export default class User implements UserType {
|
|
|
|
|
'email_verified', |
|
|
|
|
'roles', |
|
|
|
|
'token_version', |
|
|
|
|
]); |
|
|
|
|
]) |
|
|
|
|
|
|
|
|
|
if (updateObj.email) { |
|
|
|
|
updateObj.email = updateObj.email.toLowerCase(); |
|
|
|
|
updateObj.email = updateObj.email.toLowerCase() |
|
|
|
|
} else { |
|
|
|
|
// set email prop to avoid generation of invalid cache key
|
|
|
|
|
updateObj.email = (await this.get(id, ncMeta))?.email?.toLowerCase(); |
|
|
|
|
updateObj.email = (await this.get(id, ncMeta))?.email?.toLowerCase() |
|
|
|
|
} |
|
|
|
|
// get existing cache
|
|
|
|
|
const keys = [ |
|
|
|
|
@ -96,43 +96,43 @@ export default class User implements UserType {
|
|
|
|
|
`${CacheScope.USER}:${id}`, |
|
|
|
|
// update user:<email>
|
|
|
|
|
`${CacheScope.USER}:${user.email}`, |
|
|
|
|
]; |
|
|
|
|
] |
|
|
|
|
for (const key of keys) { |
|
|
|
|
let o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT); |
|
|
|
|
let o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT) |
|
|
|
|
if (o) { |
|
|
|
|
o = { ...o, ...updateObj }; |
|
|
|
|
o = { ...o, ...updateObj } |
|
|
|
|
// set cache
|
|
|
|
|
await NocoCache.set(key, o); |
|
|
|
|
await NocoCache.set(key, o) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// as <projectId> is unknown, delete user:<email>___<projectId> in cache
|
|
|
|
|
await NocoCache.delAll(CacheScope.USER, `${user.email}___*`); |
|
|
|
|
await NocoCache.delAll(CacheScope.USER, `${user.email}___*`) |
|
|
|
|
|
|
|
|
|
// set meta
|
|
|
|
|
return await ncMeta.metaUpdate(null, null, MetaTable.USERS, updateObj, id); |
|
|
|
|
return await ncMeta.metaUpdate(null, null, MetaTable.USERS, updateObj, id) |
|
|
|
|
} |
|
|
|
|
public static async getByEmail(_email: string, ncMeta = Noco.ncMeta) { |
|
|
|
|
const email = _email?.toLowerCase(); |
|
|
|
|
const email = _email?.toLowerCase() |
|
|
|
|
let user = |
|
|
|
|
email && |
|
|
|
|
(await NocoCache.get( |
|
|
|
|
`${CacheScope.USER}:${email}`, |
|
|
|
|
CacheGetType.TYPE_OBJECT |
|
|
|
|
)); |
|
|
|
|
CacheGetType.TYPE_OBJECT, |
|
|
|
|
)) |
|
|
|
|
if (!user) { |
|
|
|
|
user = await ncMeta.metaGet2(null, null, MetaTable.USERS, { |
|
|
|
|
email, |
|
|
|
|
}); |
|
|
|
|
await NocoCache.set(`${CacheScope.USER}:${email}`, user); |
|
|
|
|
}) |
|
|
|
|
await NocoCache.set(`${CacheScope.USER}:${email}`, user) |
|
|
|
|
} |
|
|
|
|
return user; |
|
|
|
|
return user |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static async isFirst(ncMeta = Noco.ncMeta) { |
|
|
|
|
const isFirst = !(await NocoCache.getAll(`${CacheScope.USER}:*`))?.length; |
|
|
|
|
const isFirst = !(await NocoCache.getAll(`${CacheScope.USER}:*`))?.length |
|
|
|
|
if (isFirst) |
|
|
|
|
return !(await ncMeta.metaGet2(null, null, MetaTable.USERS, {})); |
|
|
|
|
return false; |
|
|
|
|
return !(await ncMeta.metaGet2(null, null, MetaTable.USERS, {})) |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public static async count( |
|
|
|
|
@ -141,15 +141,15 @@ export default class User implements UserType {
|
|
|
|
|
}: { |
|
|
|
|
query?: string; |
|
|
|
|
} = {}, |
|
|
|
|
ncMeta = Noco.ncMeta |
|
|
|
|
ncMeta = Noco.ncMeta, |
|
|
|
|
): Promise<number> { |
|
|
|
|
const qb = ncMeta.knex(MetaTable.USERS); |
|
|
|
|
const qb = ncMeta.knex(MetaTable.USERS) |
|
|
|
|
|
|
|
|
|
if (query) { |
|
|
|
|
qb.where('email', 'like', `%${query.toLowerCase?.()}%`); |
|
|
|
|
qb.where('email', 'like', `%${query.toLowerCase?.()}%`) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return (await qb.count('id', { as: 'count' }).first()).count; |
|
|
|
|
return (await qb.count('id', { as: 'count' }).first()).count |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static async get(userId, ncMeta = Noco.ncMeta): Promise<UserType> { |
|
|
|
|
@ -157,20 +157,20 @@ export default class User implements UserType {
|
|
|
|
|
userId && |
|
|
|
|
(await NocoCache.get( |
|
|
|
|
`${CacheScope.USER}:${userId}`, |
|
|
|
|
CacheGetType.TYPE_OBJECT |
|
|
|
|
)); |
|
|
|
|
CacheGetType.TYPE_OBJECT, |
|
|
|
|
)) |
|
|
|
|
if (!user) { |
|
|
|
|
user = await ncMeta.metaGet2(null, null, MetaTable.USERS, userId); |
|
|
|
|
await NocoCache.set(`${CacheScope.USER}:${userId}`, user); |
|
|
|
|
user = await ncMeta.metaGet2(null, null, MetaTable.USERS, userId) |
|
|
|
|
await NocoCache.set(`${CacheScope.USER}:${userId}`, user) |
|
|
|
|
} |
|
|
|
|
return user; |
|
|
|
|
return user |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static async getByRefreshToken(refresh_token, ncMeta = Noco.ncMeta) { |
|
|
|
|
const user = await ncMeta.metaGet2(null, null, MetaTable.USERS, { |
|
|
|
|
refresh_token, |
|
|
|
|
}); |
|
|
|
|
return user; |
|
|
|
|
}) |
|
|
|
|
return user |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public static async list( |
|
|
|
|
@ -183,7 +183,7 @@ export default class User implements UserType {
|
|
|
|
|
offset?: number | undefined; |
|
|
|
|
query?: string; |
|
|
|
|
} = {}, |
|
|
|
|
ncMeta = Noco.ncMeta |
|
|
|
|
ncMeta = Noco.ncMeta, |
|
|
|
|
) { |
|
|
|
|
let queryBuilder = ncMeta.knex(MetaTable.USERS); |
|
|
|
|
|
|
|
|
|
@ -214,7 +214,7 @@ export default class User implements UserType {
|
|
|
|
|
.as('projectsCount') |
|
|
|
|
); |
|
|
|
|
if (query) { |
|
|
|
|
queryBuilder.where('email', 'like', `%${query.toLowerCase?.()}%`); |
|
|
|
|
queryBuilder.where('email', 'like', `%${query.toLowerCase?.()}%`) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return queryBuilder; |
|
|
|
|
@ -226,8 +226,4 @@ export default class User implements UserType {
|
|
|
|
|
await NocoCache.del(`${CacheScope.USER}:${userId}`); |
|
|
|
|
await ncMeta.metaDelete(null, null, MetaTable.USERS, userId); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static async delete(_userId: string) { |
|
|
|
|
NcError.notImplemented(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Pranav C
2 years ago