Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/db/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import AllModel from './models/all/index.js'
import GroupModel from './models/group/index.js'
import TeamModel from './models/team/index.js'
import UserModel from './models/user/index.js'
import DeviceModel from './models/device/index.js'

const concatModels = <T extends object[]>(...models: T) =>
Object.assign({}, ...models)
Expand All @@ -12,5 +14,7 @@ const concatModels = <T extends object[]>(...models: T) =>
export default concatModels(
AllModel,
GroupModel,
TeamModel
) as typeof AllModel & typeof GroupModel & typeof TeamModel
TeamModel,
UserModel,
DeviceModel,
) as typeof AllModel & typeof GroupModel & typeof TeamModel & typeof UserModel & typeof DeviceModel
3 changes: 2 additions & 1 deletion lib/db/handlers/group/scheduler.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import db from '../../index.js'
import logger from '../../../util/logger.js'

import mongo from 'mongodb'
import UserModel from '../../models/user/index.js'

const log = logger.createLogger('groups-scheduler')

Expand Down Expand Up @@ -211,7 +212,7 @@ export default class GroupsScheduler {
await dbapi.updateDevicesCurrentGroupFromOrigin(group.devices)
}

await dbapi.updateUserGroupDuration(group.owner.email, group.duration, duration)
await UserModel.updateUserGroupDuration(group.owner.email, group.duration, duration)
await this.scheduleAllGroupsTasks()
}
catch (err) {
Expand Down
103 changes: 103 additions & 0 deletions lib/db/handlers/user/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
import _ from 'lodash'
import logger from '../../../util/logger.js'
import wireutil from '../../../wire/util.js'
import wire from '../../../wire/index.js'
import timeutil from '../../../util/timeutil.js'

class UserChangeHandler {

isPrepared = false
log = logger.createLogger('change-handler-users')

init(push, pushdev, channelRouter) {
this.pushdev = pushdev
this.isPrepared = !!this.pushdev
}

sendUserChange = (user, isAddedGroup, groups, action, targets) => {
function wireUserField() {
const wireUser = _.cloneDeep(user)
delete wireUser._id
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:(
Can we do better?

delete wireUser.ip
delete wireUser.group
delete wireUser.lastLoggedInAt
delete wireUser.createdAt
delete wireUser.forwards
delete wireUser.acceptedPolicy
delete wireUser.groups.lock
delete wireUser.groups.defaultGroupsDuration
delete wireUser.groups.defaultGroupsNumber
delete wireUser.groups.defaultGroupsRepetitions
delete wireUser.groups.repetitions
return wireUser
}
const userField = wireUserField()
this.pushdev.send([
wireutil.global,
wireutil.envelope(new wire.UserChangeMessage(
userField
, isAddedGroup
, groups
, action
, targets
, timeutil.now('nano')
))
])
}

updateUserHandler = (oldUser, newUser) => {
if (newUser === null && oldUser === null) {
this.log.info('New user doc and old user doc is NULL')
return false
}
const targets = []
if (newUser?.groups && oldUser?.groups) {
if (newUser.groups.quotas && oldUser.groups.quotas) {
if (!_.isEqual(newUser.groups.quotas.allocated, oldUser.groups.quotas.allocated)) {
targets.push('settings')
targets.push('view')
}
else if (!_.isEqual(newUser.groups.quotas.consumed, oldUser.groups.quotas.consumed)) {
targets.push('view')
}
else if (newUser.groups.quotas.defaultGroupsNumber !==
oldUser.groups.quotas.defaultGroupsNumber ||
newUser.groups.quotas.defaultGroupsDuration !==
oldUser.groups.quotas.defaultGroupsDuration ||
newUser.groups.quotas.defaultGroupsRepetitions !==
oldUser.groups.quotas.defaultGroupsRepetitions ||
newUser.groups.quotas.repetitions !==
oldUser.groups.quotas.repetitions ||
!_.isEqual(newUser.groups.subscribed, oldUser.groups.subscribed)) {
targets.push('settings')
}
}
}
if (!_.isEqual(newUser?.settings.alertMessage, oldUser?.settings.alertMessage)) {
targets.push('menu')
}
if (targets.length) {
this.sendUserChange(newUser, newUser.groups.subscribed.length > oldUser.groups.subscribed.length
, _.xor(newUser.groups.subscribed, oldUser.groups.subscribed), 'updated', targets)
}
return !_.isEqual(newUser, oldUser)
}

}

// Temporary solution needed to avoid situations
// where a unit may not initialize the change handler,
// but use the db module. In this case, any methods of this handler
// do nothing and will not cause an error.
/** @type {UserChangeHandler} */
export default new Proxy(new UserChangeHandler(), {

/** @param {string} prop */
get(target, prop) {
if (target.isPrepared || prop === 'init' || typeof target[prop] !== 'function') {
return target[prop]
}

return () => {}
}
})
3 changes: 2 additions & 1 deletion lib/db/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import _setup from './setup.js'
import srv from '../util/srv.js'
import EventEmitter from 'events'
import GroupChangeHandler from './handlers/group/index.js'
import UserChangeHandler from './handlers/user/index.js'
import * as zmqutil from '../util/zmqutil.js'
import lifecycle from '../util/lifecycle.js'
import logger from '../util/logger.js'
Expand All @@ -27,7 +28,7 @@ const handlers: {
channelRouter?: EventEmitter
) => Promise<void> | void;
isPrepared: boolean;
}[] = [GroupChangeHandler]
}[] = [GroupChangeHandler, UserChangeHandler]

export default class DbClient {
static connection: mongo.Db
Expand Down
Loading