diff --git a/src/api/admin.ts b/src/api/admin.ts index bcc122d..becf450 100644 --- a/src/api/admin.ts +++ b/src/api/admin.ts @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -import { Router } from 'express' -import { Database } from '../database' -import { WebsocketApi } from '../websocket' -import { setStatusMessage, getStatusMessage } from '../function/statusmessage' -import * as escape from 'escape-html' import { json } from 'body-parser' +import * as escape from 'escape-html' +import { Router } from 'express' import { BadRequest } from 'http-errors' +import { Database } from '../database' +import { getStatusMessage, setStatusMessage } from '../function/statusmessage' +import { WebsocketApi } from '../websocket' export const createAdminRouter = ({ database, websocket }: { database: Database @@ -57,7 +57,7 @@ export const createAdminRouter = ({ database, websocket }: { websocket.triggerImportantSyncAtAllDevicesInBackground() - res.json({ok: true}) + res.json({ ok: true }) } catch (ex) { next(ex) } diff --git a/src/database/adddevicetoken.ts b/src/database/adddevicetoken.ts index 2ea6a13..fa25710 100644 --- a/src/database/adddevicetoken.ts +++ b/src/database/adddevicetoken.ts @@ -41,4 +41,4 @@ export const attributes: SequelizeAttributes = { createdAt: { ...timestampColumn } } -export const createAddDeviceTokenModel = (sequelize: Sequelize.Sequelize): AddDeviceTokenModelStatic => sequelize.define('AddDeviceToken', attributes) +export const createAddDeviceTokenModel = (sequelize: Sequelize.Sequelize): AddDeviceTokenModelStatic => sequelize.define('AddDeviceToken', attributes) as AddDeviceTokenModelStatic diff --git a/src/database/app.ts b/src/database/app.ts index b928294..9eaadb1 100644 --- a/src/database/app.ts +++ b/src/database/app.ts @@ -56,4 +56,4 @@ export const attributes: SequelizeAttributes = { recommendation: createEnumColumn(appRecommendationValues) } -export const createAppModel = (sequelize: Sequelize.Sequelize): AppModelStatic => sequelize.define('App', attributes) +export const createAppModel = (sequelize: Sequelize.Sequelize): AppModelStatic => sequelize.define('App', attributes) as AppModelStatic diff --git a/src/database/appactivity.ts b/src/database/appactivity.ts index 64c9aca..c04922f 100644 --- a/src/database/appactivity.ts +++ b/src/database/appactivity.ts @@ -60,4 +60,4 @@ export const attributes: SequelizeAttributes = { title: { ...optionalLabelColumn } } -export const createAppActivityModel = (sequelize: Sequelize.Sequelize): AppActivityModelStatic => sequelize.define('AppActivity', attributes) +export const createAppActivityModel = (sequelize: Sequelize.Sequelize): AppActivityModelStatic => sequelize.define('AppActivity', attributes) as AppActivityModelStatic diff --git a/src/database/authtoken.ts b/src/database/authtoken.ts index 0cef023..473a556 100644 --- a/src/database/authtoken.ts +++ b/src/database/authtoken.ts @@ -45,4 +45,4 @@ export const attributes: SequelizeAttributes = { createdAt: { ...timestampColumn } } -export const createAuthtokenModel = (sequelize: Sequelize.Sequelize): AuthTokenModelStatic => sequelize.define('AuthToken', attributes) +export const createAuthtokenModel = (sequelize: Sequelize.Sequelize): AuthTokenModelStatic => sequelize.define('AuthToken', attributes) as AuthTokenModelStatic diff --git a/src/database/category.ts b/src/database/category.ts index 392797d..d1dba5f 100644 --- a/src/database/category.ts +++ b/src/database/category.ts @@ -126,4 +126,4 @@ export const attributes: SequelizeAttributes = { ...attributesVersion4 } -export const createCategoryModel = (sequelize: Sequelize.Sequelize): CategoryModelStatic => sequelize.define('Category', attributes) +export const createCategoryModel = (sequelize: Sequelize.Sequelize): CategoryModelStatic => sequelize.define('Category', attributes) as CategoryModelStatic diff --git a/src/database/categoryapp.ts b/src/database/categoryapp.ts index 58b51c1..9f71f01 100644 --- a/src/database/categoryapp.ts +++ b/src/database/categoryapp.ts @@ -49,4 +49,4 @@ export const attributes: SequelizeAttributes = { } } -export const createCategoryAppModel = (sequelize: Sequelize.Sequelize): CategoryAppModelStatic => sequelize.define('CategoryApp', attributes) +export const createCategoryAppModel = (sequelize: Sequelize.Sequelize): CategoryAppModelStatic => sequelize.define('CategoryApp', attributes) as CategoryAppModelStatic diff --git a/src/database/config.ts b/src/database/config.ts index e925b69..6fed9f4 100644 --- a/src/database/config.ts +++ b/src/database/config.ts @@ -43,7 +43,7 @@ export const attributes: SequelizeAttributes = { } } -export const createConfigModel = (sequelize: Sequelize.Sequelize): ConfigModelStatic => sequelize.define('Config', attributes) +export const createConfigModel = (sequelize: Sequelize.Sequelize): ConfigModelStatic => sequelize.define('Config', attributes) as ConfigModelStatic export const configItemIds = { statusMessage: 'status_message' diff --git a/src/database/device.ts b/src/database/device.ts index 3819495..3b5ad9b 100644 --- a/src/database/device.ts +++ b/src/database/device.ts @@ -246,7 +246,7 @@ export const attributes: SequelizeAttributes = { ...attributesVersion10 } -export const createDeviceModel = (sequelize: Sequelize.Sequelize): DeviceModelStatic => sequelize.define('Device', attributes) +export const createDeviceModel = (sequelize: Sequelize.Sequelize): DeviceModelStatic => sequelize.define('Device', attributes) as DeviceModelStatic export const hasDeviceManipulation = (device: DeviceAttributes) => { const manipulationOfProtectionLevel = device.currentProtectionLevel !== device.highestProtectionLevel const manipulationOfUsageStats = device.currentUsageStatsPermission !== device.highestUsageStatsPermission diff --git a/src/database/family.ts b/src/database/family.ts index 498cd75..05c9d68 100644 --- a/src/database/family.ts +++ b/src/database/family.ts @@ -47,4 +47,4 @@ export const attributes: SequelizeAttributes = { hasFullVersion: { ...booleanColumn } } -export const createFamilyModel = (sequelize: Sequelize.Sequelize): FamilyModelStatic => sequelize.define('Family', attributes) +export const createFamilyModel = (sequelize: Sequelize.Sequelize): FamilyModelStatic => sequelize.define('Family', attributes) as FamilyModelStatic diff --git a/src/database/maillogintoken.ts b/src/database/maillogintoken.ts index e8f4acb..ae16a94 100644 --- a/src/database/maillogintoken.ts +++ b/src/database/maillogintoken.ts @@ -61,4 +61,4 @@ export const attributes: SequelizeAttributes = { } } -export const createMailLoginTokenModel = (sequelize: Sequelize.Sequelize): MailLoginTokenModelStatic => sequelize.define('MailLoginToken', attributes) +export const createMailLoginTokenModel = (sequelize: Sequelize.Sequelize): MailLoginTokenModelStatic => sequelize.define('MailLoginToken', attributes) as MailLoginTokenModelStatic diff --git a/src/database/olddevice.ts b/src/database/olddevice.ts index 6154602..3b6d429 100644 --- a/src/database/olddevice.ts +++ b/src/database/olddevice.ts @@ -35,4 +35,4 @@ export const attributes: SequelizeAttributes = { } } -export const createOldDeviceModel = (sequelize: Sequelize.Sequelize): OldDeviceModelStatic => sequelize.define('OldDevice', attributes) +export const createOldDeviceModel = (sequelize: Sequelize.Sequelize): OldDeviceModelStatic => sequelize.define('OldDevice', attributes) as OldDeviceModelStatic diff --git a/src/database/purchase.ts b/src/database/purchase.ts index 63155fc..8a10661 100644 --- a/src/database/purchase.ts +++ b/src/database/purchase.ts @@ -50,4 +50,4 @@ export const attributes: SequelizeAttributes = { newFullVersionEndTime: timestampColumn } -export const createPurchaseModel = (sequelize: Sequelize.Sequelize): PurchaseModelStatic => sequelize.define('Purchase', attributes) +export const createPurchaseModel = (sequelize: Sequelize.Sequelize): PurchaseModelStatic => sequelize.define('Purchase', attributes) as PurchaseModelStatic diff --git a/src/database/timelimitrule.ts b/src/database/timelimitrule.ts index af9a2b4..3fec9ed 100644 --- a/src/database/timelimitrule.ts +++ b/src/database/timelimitrule.ts @@ -61,4 +61,4 @@ export const attributes: SequelizeAttributes = { } } -export const createTimelimitRuleModel = (sequelize: Sequelize.Sequelize): TimelimitRuleModelStatic => sequelize.define('TimelimitRule', attributes) +export const createTimelimitRuleModel = (sequelize: Sequelize.Sequelize): TimelimitRuleModelStatic => sequelize.define('TimelimitRule', attributes) as TimelimitRuleModelStatic diff --git a/src/database/usedtime.ts b/src/database/usedtime.ts index 81beb44..6f2639c 100644 --- a/src/database/usedtime.ts +++ b/src/database/usedtime.ts @@ -75,4 +75,4 @@ export const attributes = { ...attributesVersion2 } -export const createUsedTimeModel = (sequelize: Sequelize.Sequelize): UsedTimeModelStatic => sequelize.define('UsedTime', attributes) +export const createUsedTimeModel = (sequelize: Sequelize.Sequelize): UsedTimeModelStatic => sequelize.define('UsedTime', attributes) as UsedTimeModelStatic diff --git a/src/database/user.ts b/src/database/user.ts index b5fffd9..b646e32 100644 --- a/src/database/user.ts +++ b/src/database/user.ts @@ -130,4 +130,4 @@ export const attributes: SequelizeAttributes = { ...attributesVersion4 } -export const createUserModel = (sequelize: Sequelize.Sequelize): UserModelStatic => sequelize.define('User', attributes) +export const createUserModel = (sequelize: Sequelize.Sequelize): UserModelStatic => sequelize.define('User', attributes) as UserModelStatic diff --git a/src/function/statusmessage/index.ts b/src/function/statusmessage/index.ts index 87eefca..e66576f 100644 --- a/src/function/statusmessage/index.ts +++ b/src/function/statusmessage/index.ts @@ -15,9 +15,9 @@ * along with this program. If not, see . */ +import * as Sequelize from 'sequelize' import { Database } from '../../database' import { configItemIds } from '../../database/config' -import * as Sequelize from 'sequelize' export const getStatusMessage = async ({ database, transaction }: { database: Database diff --git a/src/function/sync/get-server-data-status.ts b/src/function/sync/get-server-data-status.ts index 33ea8e3..2a128e9 100644 --- a/src/function/sync/get-server-data-status.ts +++ b/src/function/sync/get-server-data-status.ts @@ -18,13 +18,13 @@ import { difference, filter, intersection } from 'lodash' import * as Sequelize from 'sequelize' import { Database } from '../../database' +import { getStatusMessage } from '../../function/statusmessage' import { ClientDataStatus } from '../../object/clientdatastatus' import { ServerDataStatus, ServerInstalledAppsData, ServerUpdatedCategoryAssignedApps, ServerUpdatedCategoryBaseData, ServerUpdatedCategoryUsedTimes, ServerUpdatedTimeLimitRules } from '../../object/serverdatastatus' -import { getStatusMessage } from '../../function/statusmessage' export const generateServerDataStatus = async ({ database, clientStatus, familyId, transaction }: { database: Database, diff --git a/src/websocket/index.ts b/src/websocket/index.ts index 3d8be30..ac71887 100644 --- a/src/websocket/index.ts +++ b/src/websocket/index.ts @@ -15,11 +15,11 @@ * along with this program. If not, see . */ +import * as EventEmitter from 'events' import * as io from 'socket.io' import { ConnectedDevicesManager, VisibleConnectedDevicesManager } from '../connected-devices' import { Database } from '../database' import { deviceByAuthTokenRoom } from './rooms' -import * as EventEmitter from 'events' export const createWebsocketHandler = ({ connectedDevicesManager, database }: { connectedDevicesManager: VisibleConnectedDevicesManager