Add workaround for session duration change logic bug

package.json

@@ -38,11 +38,12 @@
     "@types/lodash": "^4.14.166",
     "@types/node": "^16.11.59",
     "@types/nodemailer": "^6.4.4",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@types/umzug": "^2.3.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^5.10.0",
     "eslint": "^8.7.0",
     "rimraf": "^3.0.2",
-    "typescript": "^5.5.4",
+    "typescript": "^4.4.4",
     "typescript-json-schema": "^0.52.0"
   },
   "dependencies": {
@@ -62,7 +63,8 @@
     "rate-limiter-flexible": "^2.1.15",
     "sequelize": "^6.25.5",
     "socket.io": "^4.0.1",
-    "umzug": "^3.8.1"
+    "sqlite3": "^4.0.0",
+    "umzug": "^2.3.0"
   },
   "optionalDependencies": {
     "sqlite3": "^5.0.0"

scripts/build-schemas.js

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2024 Jonas Lochmann
+ * Copyright (C) 2019 - 2023 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -58,9 +58,7 @@ const allTypes = [
 
 const settings = {
   required: true,
-  noExtraProps: true,
+  noExtraProps: true
-  // otherwise it finds errors in dependencies that we don't care about
-  ignoreErrors: true
 };
 
 const compilerOptions = {

src/database/devicedhkey.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2024 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -26,7 +26,7 @@ export const config = {
   expireTimeRounding: 1000 * 60 * 15
 }
 
-export function calculateExpireTime(now: bigint): bigint {
+export function calculateExpireTime(now: bigint): BigInt {
   const expireBaseTime = now + BigInt(config.expireDelay)
   const expireTime = expireBaseTime - expireBaseTime % BigInt(config.expireTimeRounding) + BigInt(config.expireTimeRounding)
 

src/database/migration/umzug.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2024 Jonas Lochmann
+ * Copyright (C) 2019 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,26 +17,18 @@
 
 import { resolve } from 'path'
 import { Sequelize } from 'sequelize'
-import { Umzug, SequelizeStorage } from 'umzug'
+import * as Umzug from 'umzug'
 
 export const createUmzug = (sequelize: Sequelize) => (
   new Umzug({
-    storage: new SequelizeStorage({ sequelize }),
+    storage: 'sequelize',
+    storageOptions: {
+      sequelize
+    },
     migrations: {
-      glob: resolve(__dirname, '../../../build/database/migration/migrations/*.js'),
+      params: [sequelize.getQueryInterface(), sequelize],
-      resolve: ({ name, path }) => {
+      path: resolve(__dirname, '../../../build/database/migration/migrations'),
-        if (!path) throw new Error()
+      pattern: /^\d+[\w-]+\.js$/
-
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const migration = require(path)
-
-        return {
-          name,
-          up: async () => migration.up(sequelize.getQueryInterface(), sequelize),
-          down: async () => migration.down(sequelize.getQueryInterface(), sequelize),
     }
-      },
-    },
-    logger: console
   })
 )

tsconfig.json

@@ -11,8 +11,7 @@
     "noUnusedParameters": false,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "sourceMap": true,
+    "sourceMap": true
-    "skipLibCheck": true
   },
   "include": [
     "./src/**/*"