Merge beta to main

migrations/20200422165711-apiv3-migration.js

@@ -148,7 +148,8 @@ module.exports = {
       console.log('- Changing the name of the new UUID field to "id" and make it the primary key')
       await migration.renameColumn('Groups', 'id2', 'id', { transaction })
 
-      await migration.addConstraint('Groups', ['id'], {
+      await migration.addConstraint('Groups', {
+        fields: ['id'],
         type: 'primary key',
         transaction,
       })

package.json

@@ -21,6 +21,7 @@
     "@log4js-node/gelf": "^1.0.2",
     "@log4js-node/slack": "^1.0.0",
     "@log4js-node/smtp": "^1.1.0",
+    "apn": "^2.2.0",
     "axios": "^0.21.1",
     "bcrypt": "^3.0.7",
     "date-fns": "^2.8.1",
@@ -30,7 +31,7 @@
     "gulp-cli": "^2.2.0",
     "i18next": "^19.0.1",
     "join-js": "xlexi/joinjs",
-    "knex": "^0.20.4",
+    "knex": "~2.4.2",
     "koa": "^2.11.0",
     "koa-body": "^4.1.1",
     "koa-conditional-get": "^2.0.0",
@@ -42,16 +43,17 @@
     "maxmind": "3.1.2",
     "mysql": "^2.17.1",
     "nanoid": "^3.1.3",
-    "nodemailer": "^6.4.2",
+    "nodemailer": "^6.9.3",
     "npid": "^0.4.0",
     "otplib": "^12.0.1",
     "pg": "^8.5.1",
     "pure-uuid": "^1.5.7",
-    "sequelize": "^5.21.2",
+    "sequelize": "^6.32.1",
     "sharp": "^0.28.3",
     "sinon": "^7.5.0",
     "twitter": "^1.7.1",
-    "ua-parser-js": "^0.7.20",
+    "ua-parser-js": "^1.0.35",
+    "web-push": "^3.5.0",
     "workerpool": "^5.0.2",
     "ws": "^7.2.0",
     "yayson": "^2.0.8"

rollup.config.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import babel from '@rollup/plugin-babel'
+import { babel } from '@rollup/plugin-babel'
 import json from '@rollup/plugin-json'
 import resolve from '@rollup/plugin-node-resolve'
 import fs from 'fs'

src/classes/Anope.mjs

@@ -231,7 +231,7 @@ class Anope {
 
     account.user = await User.findOne({
       where: {
-        email: { iLike: account.email },
+        email: { iLike: account.email, status: 'active' },
       },
     })
     return account
@@ -265,7 +265,7 @@ class Anope {
 
     account.user = await User.findOne({
       where: {
-        email: { iLike: account.email },
+        email: { iLike: account.email, status: 'active' },
       },
     })
     return account

src/classes/Authentication.mjs

@@ -36,7 +36,13 @@ class Authentication {
 
     // const user = await User.findByEmail(email)
 
-    const user = await User.findOne({ where: { email: { ilike: email } } })
+    const user = await User.findOne({
+      where: {
+        email: { ilike: email },
+        suspended: null,
+        status: 'active',
+      },
+    })
     if (!user) {
       return undefined
     }
@@ -70,7 +76,13 @@ class Authentication {
         where: { id: user.id },
       })
     }
-    return User.findOne({ where: { email: { ilike: email } } })
+    return User.findOne({
+      where: {
+        email: { ilike: email },
+        suspended: null,
+        status: 'active',
+      },
+    })
   }
 
   /**
@@ -92,7 +104,13 @@ class Authentication {
       throw new GoneAPIError({})
     }
 
-    const user = await User.findOne({ where: { id: token.userId } })
+    const user = await User.findOne({
+      where: {
+        id: token.userId,
+        suspended: null,
+        status: 'active',
+      },
+    })
     return {
       user,
       scope: token.scope,

src/config.mjs

@@ -89,6 +89,17 @@ const config = {
     token: optional('FRAPI_TWITTER_TOKEN', [], undefined),
     tokenSecret: optional('FRAPI_TWITTER_TOKEN_SECRET', [], undefined),
   },
+  webpush: {
+    privateKey: recommended('FRAPI_WEBPUSH_PRIVATE_KEY', [], undefined),
+    publicKey: recommended('FRAPI_WEBPUSH_PUBLIC_KEY', [], undefined),
+  },
+  apn: {
+    token: {
+      key: recommended('FRAPI_APN_PATH', [], undefined),
+      keyId: recommended('FRAPI_APN_ID', [], undefined),
+      teamId: recommended('FRAPI_APN_TEAM', [], undefined),
+    },
+  },
 }
 
 ensureValidConfig()

src/db/ApplePushSubscription.mjs

@@ -0,0 +1,49 @@
+import Model, { column, table, validate, type } from './Model'
+
+/**
+ * Model class for user sessions
+ */
+@table({
+  indexes: [{
+    fields: ['deviceToken', 'userId'],
+  }],
+})
+export default class ApplePushSubscription extends Model {
+  @validate({ isUUID: 4 })
+  @column(type.UUID, { primaryKey: true })
+  static id = type.UUIDV4
+
+  @column(type.STRING, { unique: true })
+  static deviceToken = undefined
+
+  @validate({ isUUID: 4 })
+  @column(type.UUID)
+  static userId = undefined
+
+  /**
+   * @inheritdoc
+   */
+  static getScopes (models) {
+    return {
+      defaultScope: [{
+        include: [
+          {
+            model: models.User,
+            as: 'user',
+            required: true,
+          },
+        ],
+      }, {
+        override: true,
+      }],
+    }
+  }
+
+  /**
+   * @inheritdoc
+   */
+  static associate (models) {
+    super.associate(models)
+    models.ApplePushSubscription.belongsTo(models.User, { as: 'user' })
+  }
+}

src/db/WebPushSubscription.mjs

@@ -0,0 +1,73 @@
+import Model, { column, table, validate, type } from './Model'
+
+/**
+ * Model class for user sessions
+ */
+@table({
+  indexes: [{
+    fields: ['endpoint', 'userId'],
+  }],
+})
+export default class WebPushSubscription extends Model {
+  @validate({ isUUID: 4 })
+  @column(type.UUID, { primaryKey: true })
+  static id = type.UUIDV4
+
+  @column(type.STRING, { unique: true })
+  static endpoint = undefined
+
+  @column(type.INTEGER, { allowNull: true })
+  static expirationTime = undefined
+
+  @column(type.STRING)
+  static auth = undefined
+
+  @column(type.STRING)
+  static p256dh = undefined
+
+  @column(type.BOOLEAN)
+  static alertsOnly = true
+
+  @column(type.BOOLEAN)
+  static pc = true
+
+  @column(type.BOOLEAN)
+  static xb = true
+
+  @column(type.BOOLEAN)
+  static ps = true
+
+  @column(type.BOOLEAN)
+  static odyssey = true
+
+  @validate({ isUUID: 4 })
+  @column(type.UUID)
+  static userId = undefined
+
+  /**
+   * @inheritdoc
+   */
+  static getScopes (models) {
+    return {
+      defaultScope: [{
+        include: [
+          {
+            model: models.User,
+            as: 'user',
+            required: true,
+          },
+        ],
+      }, {
+        override: true,
+      }],
+    }
+  }
+
+  /**
+   * @inheritdoc
+   */
+  static associate (models) {
+    super.associate(models)
+    models.WebPushSubscription.belongsTo(models.User, { as: 'user' })
+  }
+}

src/db/index.mjs

@@ -2,6 +2,7 @@ import Sequelize from 'sequelize'
 import config from '../config'
 import logger from '../logging'
 
+import ApplePushSubscription from './ApplePushSubscription'
 import Authenticator from './Authenticator'
 import Avatar from './Avatar'
 import Client from './Client'
@@ -22,8 +23,10 @@ import Token from './Token'
 import User from './User'
 import UserGroups from './UserGroups'
 import VerificationToken from './VerificationToken'
+import WebPushSubscription from './WebPushSubscription'
 
 const models = {
+  ApplePushSubscription,
   User,
   Authenticator,
   Avatar,
@@ -42,6 +45,7 @@ const models = {
   UserGroups,
   VerificationToken,
   Session,
+  WebPushSubscription,
 }
 
 const {
@@ -137,6 +141,7 @@ export {
   db as sequelize,
   Sequelize,
   Op,
+  ApplePushSubscription,
   Authenticator,
   Avatar,
   Client,
@@ -157,4 +162,5 @@ export {
   User,
   UserGroups,
   VerificationToken,
+  WebPushSubscription,
 }