Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6439-fix-terms-and-condition+data-privacy-links-on-registration

.github/workflows/test-e2e.yml

@@ -27,6 +27,10 @@ jobs:
       - name: cypress | Fullstack tests
         id: e2e-tests
         run: |
+          cd backend
+          yarn install
+          yarn build
+          cd ..
           yarn install
           yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
 

backend/jest.config.js

@@ -1,18 +1,19 @@
 module.exports = {
   verbose: true,
+  preset: 'ts-jest',
   collectCoverage: true,
   collectCoverageFrom: [
-    '**/*.js',
+    '**/*.ts',
     '!**/node_modules/**',
     '!**/test/**',
     '!**/build/**',
-    '!**/src/**/?(*.)+(spec|test).js?(x)'
+    '!**/src/**/?(*.)+(spec|test).ts?(x)'
   ],
   coverageThreshold: {
     global: {
       lines: 57,
     },
   },
-  testMatch: ['**/src/**/?(*.)+(spec|test).js?(x)'],
-  setupFilesAfterEnv: ['<rootDir>/test/setup.js']
+  testMatch: ['**/src/**/?(*.)+(spec|test).ts?(x)'],
+  setupFilesAfterEnv: ['<rootDir>/test/setup.ts']
 }

backend/package.json

@@ -6,21 +6,21 @@
   "author": "ocelot.social Community",
   "license": "MIT",
   "private": false,
-  "main": "src/index.js",
+  "main": "src/index.ts",
   "scripts": {
-    "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
+    "__migrate": "migrate --compiler 'ts:./src/db/compiler.ts' --migrations-dir ./src/db/migrations",
     "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js",
     "start": "node build/",
     "build": "tsc && ./scripts/build.copy.files.sh",
     "dev": "nodemon --exec ts-node src/ -e js,ts,gql",
-    "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql",
+    "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,ts,gql",
     "lint": "eslint src --config .eslintrc.js",
     "test": "cross-env NODE_ENV=test NODE_OPTIONS=--max-old-space-size=8192 jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "db:clean": "babel-node src/db/clean.js",
+    "db:clean": "ts-node src/db/clean.ts",
     "db:reset": "yarn run db:clean",
-    "db:seed": "babel-node src/db/seed.js",
-    "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js",
-    "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js --date-format 'yyyymmddHHmmss' create"
+    "db:seed": "ts-node src/db/seed.ts",
+    "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.ts",
+    "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.ts --date-format 'yyyymmddHHmmss' create"
   },
   "dependencies": {
     "@babel/cli": "~7.8.4",
@@ -76,7 +76,7 @@
     "metascraper-url": "^5.34.2",
     "metascraper-video": "^5.33.5",
     "metascraper-youtube": "^5.33.5",
-    "migrate": "^1.7.0",
+    "migrate": "^2.0.0",
     "mime-types": "^2.1.26",
     "minimatch": "^3.0.4",
     "mustache": "^4.2.0",
@@ -97,6 +97,8 @@
   },
   "devDependencies": {
     "@faker-js/faker": "7.6.0",
+    "@types/jest": "^29.5.2",
+    "@types/node": "^20.2.5",
     "apollo-server-testing": "~2.11.0",
     "chai": "~4.2.0",
     "cucumber": "~6.0.5",
@@ -113,6 +115,7 @@
     "nodemon": "~2.0.2",
     "prettier": "~2.3.2",
     "rosie": "^2.0.1",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },

backend/src/activitypub/ActivityPub.ts

@@ -11,11 +11,15 @@ import { v4 as uuid } from 'uuid'
 import CONFIG from '../config'
 const debug = require('debug')('ea')
 
-let activityPub = null
+let activityPub: any = null
 
 export { activityPub }
 
 export default class ActivityPub {
+  endpoint: any
+  dataSource: any
+  collections: any
+  host: any
   constructor(activityPubEndpointUri, internalGraphQlUri) {
     this.endpoint = activityPubEndpointUri
     this.dataSource = new NitroDataSource(internalGraphQlUri)
@@ -211,16 +215,16 @@ export default class ActivityPub {
       // serve the rest
       activity.to.map(async (recipient) => {
         debug('serve rest')
-        const actorObject = await this.getActorObject(recipient)
+        const actorObject: any = await this.getActorObject(recipient)
         return this.trySend(activity, fromName, new URL(recipient).host, actorObject.inbox)
       })
     } else if (typeof activity.to === 'string') {
       debug('is string')
-      const actorObject = await this.getActorObject(activity.to)
+      const actorObject: any = await this.getActorObject(activity.to)
       return this.trySend(activity, fromName, new URL(activity.to).host, actorObject.inbox)
     } else if (Array.isArray(activity.to)) {
       activity.to.map(async (recipient) => {
-        const actorObject = await this.getActorObject(recipient)
+        const actorObject: any = await this.getActorObject(recipient)
         return this.trySend(activity, fromName, new URL(recipient).host, actorObject.inbox)
       })
     }
@@ -231,7 +235,7 @@ export default class ActivityPub {
       return await signAndSend(activity, fromName, host, url)
     } catch (e) {
       if (tries > 0) {
-        setTimeout(function () {
+        setTimeout(() => {
           return this.trySend(activity, fromName, host, url, --tries)
         }, 20000)
       }

backend/src/activitypub/Collections.ts

@@ -1,4 +1,5 @@
 export default class Collections {
+  dataSource: any
   constructor(dataSource) {
     this.dataSource = dataSource
   }

backend/src/activitypub/NitroDataSource.ts

@@ -17,15 +17,17 @@ import trunc from 'trunc-html'
 const debug = require('debug')('ea:datasource')
 
 export default class NitroDataSource {
+  uri: any
+  client: any
   constructor(uri) {
     this.uri = uri
-    const defaultOptions = {
+    const defaultOptions: any = {
       query: {
         fetchPolicy: 'network-only',
         errorPolicy: 'all',
       },
     }
-    const link = createHttpLink({ uri: this.uri, fetch: fetch }) // eslint-disable-line
+    const link = createHttpLink({ uri: this.uri, fetch: fetch } as any) // eslint-disable-line
     const cache = new InMemoryCache()
     const authLink = setContext((_, { headers }) => {
       // generate the authentication token (maybe from env? Which user?)
@@ -95,7 +97,7 @@ export default class NitroDataSource {
       const followers = actor.followedBy
       const followersCount = actor.followedByCount
 
-      const followersCollection = createOrderedCollectionPage(slug, 'followers')
+      const followersCollection: any = createOrderedCollectionPage(slug, 'followers')
       followersCollection.totalItems = followersCount
       debug(`followers = ${JSON.stringify(followers, null, 2)}`)
       await Promise.all(
@@ -157,7 +159,7 @@ export default class NitroDataSource {
       const following = actor.following
       const followingCount = actor.followingCount
 
-      const followingCollection = createOrderedCollectionPage(slug, 'following')
+      const followingCollection: any = createOrderedCollectionPage(slug, 'following')
       followingCollection.totalItems = followingCount
 
       await Promise.all(
@@ -235,7 +237,7 @@ export default class NitroDataSource {
       const actor = result.data.User[0]
       const posts = actor.contributions
 
-      const outboxCollection = createOrderedCollectionPage(slug, 'outbox')
+      const outboxCollection: any = createOrderedCollectionPage(slug, 'outbox')
       outboxCollection.totalItems = posts.length
       await Promise.all(
         posts.map(async (post) => {

backend/src/activitypub/routes/index.ts

@@ -11,8 +11,8 @@ export default function () {
     cors(),
     express.json({
       type: ['application/activity+json', 'application/ld+json', 'application/json'],
-    }),
-    express.urlencoded({ extended: true }),
+    }) as any,
+    express.urlencoded({ extended: true }) as any,
     user,
   )
   router.use(
@@ -20,8 +20,8 @@ export default function () {
     cors(),
     express.json({
       type: ['application/activity+json', 'application/ld+json', 'application/json'],
-    }),
-    express.urlencoded({ extended: true }),
+    }) as any,
+    express.urlencoded({ extended: true }) as any,
     verify,
     inbox,
   )

backend/src/activitypub/routes/webfinger.ts

@@ -54,6 +54,6 @@ export async function handler(req, res) {
 
 export default function () {
   const router = express.Router()
-  router.use('/webfinger', cors(), express.urlencoded({ extended: true }), handler)
+  router.use('/webfinger', cors(), express.urlencoded({ extended: true }) as any, handler)
   return router
 }

backend/src/activitypub/security/index.ts

@@ -8,7 +8,7 @@ const debug = require('debug')('ea:security')
 // TODO Does this reference a local config? Why?
 // dotenv.config({ path: resolve('src', 'activitypub', '.env') })
 
-export function generateRsaKeyPair(options = {}) {
+export function generateRsaKeyPair(options: any = {}) {
   const { passphrase = CONFIG.PRIVATE_KEY_PASSPHRASE } = options
   return crypto.generateKeyPairSync('rsa', {
     modulusLength: 4096,

backend/src/activitypub/utils/activity.ts

@@ -100,18 +100,19 @@ export async function getActorId(name) {
 // }
 
 export function isPublicAddressed(postObject) {
+  const result: { to: any[]} = { to: []}
   if (typeof postObject.to === 'string') {
-    postObject.to = [postObject.to]
+    result.to = [postObject.to]
   }
   if (typeof postObject === 'string') {
-    postObject.to = [postObject]
+    result.to = [postObject]
   }
   if (Array.isArray(postObject)) {
-    postObject.to = postObject
+    result.to = postObject
   }
   return (
-    postObject.to.includes('Public') ||
-    postObject.to.includes('as:Public') ||
-    postObject.to.includes('https://www.w3.org/ns/activitystreams#Public')
+    result.to.includes('Public') ||
+    result.to.includes('as:Public') ||
+    result.to.includes('https://www.w3.org/ns/activitystreams#Public')
   )
 }

backend/src/activitypub/utils/index.ts

@@ -101,7 +101,7 @@ export function signAndSend(activity, fromName, targetDomain, url) {
               } else {
                 debug('Response Headers:', JSON.stringify(response.headers, null, 2))
                 debug('Response Body:', JSON.stringify(response.body, null, 2))
-                resolve()
+                resolve(response)
               }
             },
           )

backend/src/config/index.ts

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv'
-import emails from './emails.js'
-import metadata from './metadata.js'
+import emails from './emails'
+import metadata from './metadata'
 
 // Load env file
 if (require.resolve) {
@@ -15,10 +15,11 @@ if (require.resolve) {
 }
 
 // Use Cypress env or process.env
+declare var Cypress: any | undefined
 const env = typeof Cypress !== 'undefined' ? Cypress.env() : process.env // eslint-disable-line no-undef
 
 const environment = {
-  NODE_ENV: env.NODE_ENV || process.NODE_ENV,
+  NODE_ENV: env.NODE_ENV || process.env.NODE_ENV,
   DEBUG: env.NODE_ENV !== 'production' && env.DEBUG,
   TEST: env.NODE_ENV === 'test',
   PRODUCTION: env.NODE_ENV === 'production',
@@ -90,14 +91,11 @@ const options = {
 }
 
 // Check if all required configs are present
-if (require.resolve) {
-  // are we in a nodejs environment?
-  Object.entries(required).map((entry) => {
-    if (!entry[1]) {
-      throw new Error(`ERROR: "${entry[0]}" env variable is missing.`)
-    }
-  })
-}
+Object.entries(required).map((entry) => {
+  if (!entry[1]) {
+    throw new Error(`ERROR: "${entry[0]}" env variable is missing.`)
+  }
+})
 
 export default {
   ...environment,

backend/src/config/logos.ts

@@ -1,4 +1,4 @@
-// this file is duplicated in `backend/src/config/logos.js` and `webapp/constants/logos.js` and replaced on rebranding
+// this file is duplicated in `backend/src/config/logos` and `webapp/constants/logos.js` and replaced on rebranding
 // this are the paths in the webapp
 export default {
   LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',

backend/src/config/metadata.ts

@@ -1,4 +1,4 @@
-// this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js` and replaced on rebranding
+// this file is duplicated in `backend/src/config/metadata` and `webapp/constants/metadata.js` and replaced on rebranding
 export default {
   APPLICATION_NAME: 'ocelot.social',
   APPLICATION_SHORT_NAME: 'ocelot',

backend/src/constants/categories.ts

@@ -1,4 +1,4 @@
-// this file is duplicated in `backend/src/constants/metadata.js` and `webapp/constants/metadata.js`
+// this file is duplicated in `backend/src/constants/metadata` and `webapp/constants/metadata.js`
 export const CATEGORIES_MIN = 1
 export const CATEGORIES_MAX = 3
 

backend/src/constants/groups.ts

@@ -1,3 +1,3 @@
-// this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js`
+// this file is duplicated in `backend/src/constants/group` and `webapp/constants/group.js`
 export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 50 // with removed HTML tags
 export const DESCRIPTION_EXCERPT_HTML_LENGTH = 250 // with removed HTML tags

backend/src/constants/registration.js

@@ -1,5 +0,0 @@
-// this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js`
-export default {
-  NONCE_LENGTH: 5,
-  INVITE_CODE_LENGTH: 6,
-}

backend/src/constants/registration.ts

@@ -0,0 +1,5 @@
+// this file is duplicated in `backend/src/config/metadata` and `webapp/constants/metadata.js`
+export default {
+  NONCE_LENGTH: 5,
+  INVITE_CODE_LENGTH: 6,
+}

backend/src/db/compiler.ts

@@ -0,0 +1,2 @@
+const tsNode = require('ts-node');
+module.exports = tsNode.register;

backend/src/db/factories.ts

@@ -4,8 +4,8 @@ import { hashSync } from 'bcryptjs'
 import { Factory } from 'rosie'
 import { faker } from '@faker-js/faker'
 import { getDriver, getNeode } from './neo4j'
-import CONFIG from '../config/index.js'
-import generateInviteCode from '../schema/resolvers/helpers/generateInviteCode.js'
+import CONFIG from '../config/index'
+import generateInviteCode from '../schema/resolvers/helpers/generateInviteCode'
 
 const neode = getNeode()
 
@@ -15,7 +15,7 @@ const uniqueImageUrl = (imageUrl) => {
   return newUrl.toString()
 }
 
-export const cleanDatabase = async (options = {}) => {
+export const cleanDatabase = async (options: any = {}) => {
   const { driver = getDriver() } = options
   const session = driver.session()
   try {

backend/src/db/migrations-examples/20200123150105-merge_duplicate_user_accounts.ts

@@ -18,13 +18,13 @@ export function up(next) {
   rxSession
     .beginTransaction()
     .pipe(
-      flatMap((txc) =>
+      flatMap((txc: any) =>
         concat(
           txc
             .run('MATCH (email:EmailAddress) RETURN email {.email}')
             .records()
             .pipe(
-              map((record) => {
+              map((record: any) => {
                 const { email } = record.get('email')
                 const normalizedEmail = normalizeEmail(email)
                 return { email, normalizedEmail }
@@ -45,7 +45,7 @@ export function up(next) {
                   )
                   .records()
                   .pipe(
-                    map((r) => ({
+                    map((r: any) => ({
                       oldEmail: email,
                       email: r.get('email'),
                       user: r.get('user'),

backend/src/db/migrations-examples/20200123150110-merge_duplicate_location_nodes.ts

@@ -12,7 +12,7 @@ export function up(next) {
   rxSession
     .beginTransaction()
     .pipe(
-      flatMap((transaction) =>
+      flatMap((transaction: any) =>
         concat(
           transaction
             .run(
@@ -23,7 +23,7 @@ export function up(next) {
             )
             .records()
             .pipe(
-              map((record) => {
+              map((record: any) => {
                 const { id: locationId } = record.get('location')
                 return { locationId }
               }),
@@ -40,7 +40,7 @@ export function up(next) {
                   )
                   .records()
                   .pipe(
-                    map((record) => ({
+                    map((record: any) => ({
                       location: record.get('location'),
                       updatedLocation: record.get('updatedLocation'),
                     })),

backend/src/db/migrations-examples/20200312140328-bulk_upload_to_s3.ts

@@ -3,7 +3,7 @@ import { existsSync, createReadStream } from 'fs'
 import path from 'path'
 import { S3 } from 'aws-sdk'
 import mime from 'mime-types'
-import { s3Configs } from '../../config'
+import s3Configs from '../../config'
 import https from 'https'
 
 export const description = `

backend/src/db/migrations/20220803060819-create_fulltext_indices_and_unique_keys_for_groups.ts

@@ -11,13 +11,13 @@ export async function up(next) {
   const transaction = session.beginTransaction()
 
   try {
-    // Implement your migration here.
-    await transaction.run(`
-      CREATE CONSTRAINT ON ( group:Group ) ASSERT group.id IS UNIQUE
-    `)
-    await transaction.run(`
-      CREATE CONSTRAINT ON ( group:Group ) ASSERT group.slug IS UNIQUE
-    `)
+    // Those two indexes already exist
+    // await transaction.run(`
+    //   CREATE CONSTRAINT ON ( group:Group ) ASSERT group.id IS UNIQUE
+    // `)
+    // await transaction.run(`
+    //   CREATE CONSTRAINT ON ( group:Group ) ASSERT group.slug IS UNIQUE
+    // `)
     await transaction.run(`
       CALL db.index.fulltext.createNodeIndex("group_fulltext_search",["Group"],["name", "slug", "about", "description"])
     `)

backend/src/db/migrations/20230320130345-fulltext-search-indexes.ts

@@ -10,7 +10,7 @@ export async function up(next) {
   try {
     // Drop indexes if they exist because due to legacy code they might be set already
     const indexesResponse = await transaction.run(`CALL db.indexes()`)
-    const indexes = indexesResponse.records.map((record) => record.get('indexName'))
+    const indexes = indexesResponse.records.map((record) => record.get('name'))
     if (indexes.indexOf('user_fulltext_search') > -1) {
       await transaction.run(`CALL db.index.fulltext.drop("user_fulltext_search")`)
     }

backend/src/graphql/messages.ts

@@ -0,0 +1,32 @@
+import gql from 'graphql-tag'
+
+export const createMessageMutation = () => {
+  return gql`
+    mutation (
+      $roomId: ID!
+      $content: String!
+    ) {
+      CreateMessage(
+        roomId: $roomId
+        content: $content
+      ) {
+        id
+        content
+      }
+    }
+  `
+}
+
+export const messageQuery = () => {
+  return gql`
+    query($roomId: ID!) {
+      Message(roomId: $roomId) {
+        id
+        content
+        author {
+          id
+        }
+      }
+    }
+  `
+}

backend/src/graphql/rooms.ts

@@ -0,0 +1,28 @@
+import gql from 'graphql-tag'
+
+export const createRoomMutation = () => {
+  return gql`
+    mutation (
+      $userId: ID!
+    ) {
+      CreateRoom(
+        userId: $userId
+      ) {
+        id
+      }
+    }
+  `
+}
+
+export const roomQuery = () => {
+  return gql`
+    query {
+      Room {
+        id
+        users {
+          id
+        }
+      }
+    }
+  `
+}

backend/src/helpers/walkRecursive.ts

@@ -5,7 +5,7 @@
  * @property fieldName String
  * @property callback Function
  */
-function walkRecursive(data, fields, fieldName, callback, _key) {
+function walkRecursive(data, fields, fieldName, callback, _key?) {
   if (!Array.isArray(fields)) {
     throw new Error('please provide an fields array for the walkRecursive helper')
   }

backend/src/middleware/hashtags/extractHashtags.ts

@@ -8,7 +8,7 @@ import { exec, build } from 'xregexp/xregexp-all.js'
 //    2. If it starts with a digit '0-9' than a unicode letter has to follow.
 const regX = build('^((\\pL+[\\pL0-9]*)|([0-9]+\\pL+[\\pL0-9]*))$')
 
-export default function (content) {
+export default function (content?) {
   if (!content) return []
   const $ = cheerio.load(content)
   // We can not search for class '.hashtag', because the classes are removed at the 'xss' middleware.
@@ -18,7 +18,7 @@ export default function (content) {
       return $(el).attr('data-hashtag-id')
     })
     .get()
-  const hashtags = []
+  const hashtags: any = []
   ids.forEach((id) => {
     const match = exec(id, regX)
     if (match != null) {

backend/src/middleware/helpers/email/sendMail.ts

@@ -1,12 +1,12 @@
 import CONFIG from '../../../config'
-import { cleanHtml } from '../../../middleware/helpers/cleanHtml.js'
+import { cleanHtml } from '../../../middleware/helpers/cleanHtml'
 import nodemailer from 'nodemailer'
 import { htmlToText } from 'nodemailer-html-to-text'
 
 const hasEmailConfig = CONFIG.SMTP_HOST && CONFIG.SMTP_PORT
 const hasAuthData = CONFIG.SMTP_USERNAME && CONFIG.SMTP_PASSWORD
 
-let sendMailCallback = async () => {}
+let sendMailCallback: any = async () => {}
 if (!hasEmailConfig) {
   if (!CONFIG.TEST) {
     // eslint-disable-next-line no-console
@@ -29,7 +29,7 @@ if (!hasEmailConfig) {
         cleanHtml(templateArgs.html, 'dummyKey', {
           allowedTags: ['a'],
           allowedAttributes: { a: ['href'] },
-        }).replace(/&/g, '&'),
+        } as any).replace(/&/g, '&'),
       )
     }
   }

backend/src/middleware/helpers/email/templateBuilder.spec.ts

@@ -1,5 +1,5 @@
 import CONFIG from '../../../config'
-import logosWebapp from '../../../config/logos.js'
+import logosWebapp from '../../../config/logos'
 import {
   signupTemplate,
   emailVerificationTemplate,

backend/src/middleware/helpers/email/templateBuilder.ts

@@ -1,7 +1,7 @@
 import mustache from 'mustache'
 import CONFIG from '../../../config'
-import metadata from '../../../config/metadata.js'
-import logosWebapp from '../../../config/logos.js'
+import metadata from '../../../config/metadata'
+import logosWebapp from '../../../config/logos'
 
 import * as templates from './templates'
 import * as templatesEN from './templates/en'

backend/src/middleware/languages/languages.ts

@@ -1,5 +1,5 @@
 import LanguageDetect from 'languagedetect'
-import { removeHtmlTags } from '../helpers/cleanHtml.js'
+import { removeHtmlTags } from '../helpers/cleanHtml'
 
 const setPostLanguage = (text) => {
   const lngDetector = new LanguageDetect()

backend/src/middleware/notifications/notificationsMiddleware.spec.ts

@@ -576,7 +576,7 @@ describe('notifications', () => {
                   read: false,
                 },
               }),
-            ).resolves.toMatchObject(expected, { errors: undefined })
+            ).resolves.toMatchObject({ ...expected, errors: undefined })
           })
         })
 

backend/src/middleware/notifications/notificationsMiddleware.ts

@@ -15,7 +15,7 @@ const queryNotificationEmails = async (context, notificationUserIds) => {
     RETURN emailAddress {.email}
   `
   const session = context.driver.session()
-  const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+  const writeTxResultPromise = session.readTransaction(async (transaction) => {
     const emailAddressTransactionResponse = await transaction.run(userEmailCypher, {
       notificationUserIds,
     })
@@ -238,7 +238,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
     [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
     [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
     WITH resource, user, notification, authors, posts,
-    resource {.*, __typename: filter(l IN labels(resource) WHERE l IN ['Post', 'Comment', 'Group'])[0], author: authors[0], post: posts[0]} AS finalResource
+    resource {.*, __typename: [l IN labels(resource) WHERE l IN ['Post', 'Comment', 'Group']][0], author: authors[0], post: posts[0]} AS finalResource
     SET notification.read = FALSE
     SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
     SET notification.updatedAt = toString(datetime())

backend/src/middleware/permissionsMiddleware.ts

@@ -406,6 +406,8 @@ export default shield(
       queryLocations: isAuthenticated,
       availableRoles: isAdmin,
       getInviteCode: isAuthenticated, // and inviteRegistration
+      Room: isAuthenticated,
+      Message: isAuthenticated,
     },
     Mutation: {
       '*': deny,
@@ -459,6 +461,8 @@ export default shield(
       switchUserRole: isAdmin,
       markTeaserAsViewed: allow,
       saveCategorySettings: isAuthenticated,
+      CreateRoom: isAuthenticated,
+      CreateMessage: isAuthenticated,
     },
     User: {
       email: or(isMyOwn, isAdmin),

backend/src/middleware/sentryMiddleware.ts

@@ -1,7 +1,7 @@
 import { sentry } from 'graphql-middleware-sentry'
 import CONFIG from '../config'
 
-let sentryMiddleware = (resolve, root, args, context, resolveInfo) =>
+let sentryMiddleware: any = (resolve, root, args, context, resolveInfo) =>
   resolve(root, args, context, resolveInfo)
 
 if (CONFIG.SENTRY_DSN_BACKEND) {
@@ -12,7 +12,7 @@ if (CONFIG.SENTRY_DSN_BACKEND) {
       release: CONFIG.COMMIT,
       environment: CONFIG.NODE_ENV,
     },
-    withScope: (scope, error, context) => {
+    withScope: (scope, error, context: any) => {
       scope.setUser({
         id: context.user && context.user.id,
       })