james/rocketchat2matrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve logging

Browse Source
This commit is contained in:
James Jennett-Wheeler 2023-10-26 17:53:40 +01:00
parent 55f524e91c
commit 6a6c2da584
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/handlers/users.ts
View File

@ -130,7 +130,15 @@ export async function createMapping(
export async function createUser(rcUser: RcUser): Promise<MatrixUser> { export async function createUser(rcUser: RcUser): Promise<MatrixUser> {
const user = mapUser(rcUser) const user = mapUser(rcUser)
var user_exists = false;
try { try {
await getUserData(user)
user_exists = true
} catch (error) {
user_exists = false
}
if (user_exists) {
const userData = await getUserData(user) const userData = await getUserData(user)
user.user_id = userData.name user.user_id = userData.name
user.displayname = userData.displayname user.displayname = userData.displayname
@ -138,9 +146,7 @@ export async function createUser(rcUser: RcUser): Promise<MatrixUser> {
const accessToken = await getUserLogin(user) const accessToken = await getUserLogin(user)
user.access_token = accessToken.access_token user.access_token = accessToken.access_token
log.info(`User ${rcUser.username} exists:`, user) log.info(`User ${rcUser.username} exists:`, user)
} catch (error) { } else {
log.error(`Error:`, error)
const nonce = await getUserRegistrationNonce() const nonce = await getUserRegistrationNonce()
const mac = generateHmac({ ...user, nonce }) const mac = generateHmac({ ...user, nonce })
const accessToken = await registerUser({ ...user, nonce, mac }) const accessToken = await registerUser({ ...user, nonce, mac })
@ -148,6 +154,7 @@ export async function createUser(rcUser: RcUser): Promise<MatrixUser> {
user.access_token = accessToken.access_token user.access_token = accessToken.access_token
log.info(`User ${rcUser.username} created:`, user) log.info(`User ${rcUser.username} created:`, user)
} }
await parseUserMemberships(rcUser) await parseUserMemberships(rcUser)
return user return user