Merge branch 'release/1.18.0'

Author: karolsojko

.env.sample

@@ -41,9 +41,6 @@ SNS_AWS_REGION=
 SQS_QUEUE_URL=
 SQS_AWS_REGION=
 
-USER_SERVER_REGISTRATION_URL=
-USER_SERVER_AUTH_KEY=
-
 SYNCING_SERVER_URL=http://syncing-server-js:3000
 
 REDIS_EVENTS_CHANNEL=events
@@ -59,3 +56,8 @@ NEW_RELIC_LOG_LEVEL=info
 
 # (Optional) Extensions Server
 EXTENSION_SERVER_URL=
+
+# (Optional) User Server
+USER_SERVER_REGISTRATION_URL=
+USER_SERVER_CHANGE_EMAIL_URL=
+USER_SERVER_AUTH_KEY=

bin/server.ts

@@ -7,6 +7,8 @@ import '../src/Controller/SessionController'
 import '../src/Controller/SessionsController'
 import '../src/Controller/AuthController'
 import '../src/Controller/UsersController'
+import '../src/Controller/SettingsController'
+import '../src/Controller/FeaturesController'
 import '../src/Controller/WebSocketsController'
 import '../src/Controller/AdminController'
 

migrations/1630661830850-fix_encryption_version_on_mfa_settings.ts

@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class fixEncryptionVersionOnMfaSettings1630661830850 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('UPDATE `settings` SET `server_encryption_version` = 1 WHERE `server_encryption_version` = 2')
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}

package.json

@@ -25,7 +25,8 @@
     "@newrelic/native-metrics": "^6.0.0",
     "@standardnotes/auth": "3.7.0",
     "@standardnotes/common": "1.0.0",
-    "@standardnotes/domain-events": "1.9.0",
+    "@standardnotes/domain-events": "2.1.0",
+    "@standardnotes/domain-events-infra": "1.0.1",
     "@standardnotes/features": "1.3.0",
     "@standardnotes/settings": "1.1.0",
     "@standardnotes/sncrypto-common": "1.3.0",

src/Bootstrap/Container.ts

@@ -6,13 +6,6 @@ import {
   DomainEventHandlerInterface,
   DomainEventMessageHandlerInterface,
   DomainEventSubscriberFactoryInterface,
-  RedisDomainEventPublisher,
-  RedisDomainEventSubscriberFactory,
-  RedisEventMessageHandler,
-  SNSDomainEventPublisher,
-  SQSDomainEventSubscriberFactory,
-  SQSEventMessageHandler,
-  SQSNewRelicEventMessageHandler,
 } from '@standardnotes/domain-events'
 import { TimerInterface, Timer } from '@standardnotes/time'
 import { UAParser } from 'ua-parser-js'
@@ -102,6 +95,7 @@ import { FeatureServiceInterface } from '../Domain/Feature/FeatureServiceInterfa
 import { FeatureService } from '../Domain/Feature/FeatureService'
 import { SettingServiceInterface } from '../Domain/Setting/SettingServiceInterface'
 import { ExtensionKeyGrantedEventHandler } from '../Domain/Handler/ExtensionKeyGrantedEventHandler'
+import { RedisDomainEventPublisher, RedisDomainEventSubscriberFactory, RedisEventMessageHandler, SNSDomainEventPublisher, SQSDomainEventSubscriberFactory, SQSEventMessageHandler, SQSNewRelicEventMessageHandler } from '@standardnotes/domain-events-infra'
 
 export class ContainerConfigLoader {
   async load(): Promise<Container> {
@@ -231,6 +225,7 @@ export class ContainerConfigLoader {
     container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL', true))
     container.bind(TYPES.USER_SERVER_REGISTRATION_URL).toConstantValue(env.get('USER_SERVER_REGISTRATION_URL', true))
     container.bind(TYPES.USER_SERVER_AUTH_KEY).toConstantValue(env.get('USER_SERVER_AUTH_KEY', true))
+    container.bind(TYPES.USER_SERVER_CHANGE_EMAIL_URL).toConstantValue(env.get('USER_SERVER_CHANGE_EMAIL_URL', true))
     container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
     container.bind(TYPES.NEW_RELIC_ENABLED).toConstantValue(env.get('NEW_RELIC_ENABLED', true))
     container.bind(TYPES.SYNCING_SERVER_URL).toConstantValue(env.get('SYNCING_SERVER_URL'))

src/Bootstrap/Types.ts

@@ -47,6 +47,7 @@ const TYPES = {
   SQS_AWS_REGION: Symbol.for('SQS_AWS_REGION'),
   USER_SERVER_REGISTRATION_URL: Symbol.for('USER_SERVER_REGISTRATION_URL'),
   USER_SERVER_AUTH_KEY: Symbol.for('USER_SERVER_AUTH_KEY'),
+  USER_SERVER_CHANGE_EMAIL_URL: Symbol.for('USER_SERVER_CHANGE_EMAIL_URL'),
   REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   NEW_RELIC_ENABLED: Symbol.for('NEW_RELIC_ENABLED'),
   SYNCING_SERVER_URL: Symbol.for('SYNCING_SERVER_URL'),

src/Controller/FeaturesController.spec.ts

@@ -0,0 +1,89 @@
+import 'reflect-metadata'
+
+import * as express from 'express'
+
+import { FeaturesController } from './FeaturesController'
+import { results } from 'inversify-express-utils'
+import { User } from '../Domain/User/User'
+import { GetUserFeatures } from '../Domain/UseCase/GetUserFeatures/GetUserFeatures'
+
+describe('FeaturesController', () => {
+  let getUserFeatures: GetUserFeatures
+
+  let request: express.Request
+  let response: express.Response
+  let user: User
+
+  const createController = () => new FeaturesController(
+    getUserFeatures,
+  )
+
+  beforeEach(() => {
+    user = {} as jest.Mocked<User>
+    user.uuid = '123'
+
+    getUserFeatures = {} as jest.Mocked<GetUserFeatures>
+    getUserFeatures.execute = jest.fn()
+
+    request = {
+      headers: {},
+      body: {},
+      params: {},
+    } as jest.Mocked<express.Request>
+
+    response = {
+      locals: {},
+    } as jest.Mocked<express.Response>
+  })
+
+  it('should get authenticated user features', async () => {
+    request.params.userUuid = '1-2-3'
+    response.locals.user =  {
+      uuid: '1-2-3',
+    }
+
+    getUserFeatures.execute = jest.fn().mockReturnValue({ success: true })
+
+    const httpResponse = <results.JsonResult> await createController().getFeatures(request, response)
+    const result = await httpResponse.executeAsync()
+
+    expect(getUserFeatures.execute).toHaveBeenCalledWith({
+      userUuid: '1-2-3',
+    })
+
+    expect(result.statusCode).toEqual(200)
+  })
+
+  it('should not get user features if the user with provided uuid does not exist', async () => {
+    request.params.userUuid = '1-2-3'
+    response.locals.user = {
+      uuid: '1-2-3',
+    }
+
+    getUserFeatures.execute = jest.fn().mockReturnValue({ success: false })
+
+    const httpResponse = <results.JsonResult> await createController().getFeatures(request, response)
+    const result = await httpResponse.executeAsync()
+
+    expect(getUserFeatures.execute).toHaveBeenCalledWith({ userUuid: '1-2-3' })
+
+    expect(result.statusCode).toEqual(400)
+
+  })
+
+  it('should not get user features if not allowed', async () => {
+    request.params.userUuid = '1-2-3'
+    response.locals.user = {
+      uuid: '2-3-4',
+    }
+
+    getUserFeatures.execute = jest.fn()
+
+    const httpResponse = <results.JsonResult> await createController().getFeatures(request, response)
+    const result = await httpResponse.executeAsync()
+
+    expect(getUserFeatures.execute).not.toHaveBeenCalled()
+
+    expect(result.statusCode).toEqual(401)
+  })
+})

src/Controller/FeaturesController.ts

@@ -0,0 +1,41 @@
+import { Request, Response } from 'express'
+import { inject } from 'inversify'
+import {
+  BaseHttpController,
+  controller,
+  httpGet,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  results,
+} from 'inversify-express-utils'
+import TYPES from '../Bootstrap/Types'
+import { GetUserFeatures } from '../Domain/UseCase/GetUserFeatures/GetUserFeatures'
+
+@controller('/users/:userUuid/features')
+export class FeaturesController extends BaseHttpController {
+  constructor(
+    @inject(TYPES.GetUserFeatures) private doGetUserFeatures: GetUserFeatures,
+  ) {
+    super()
+  }
+
+  @httpGet('/', TYPES.AuthMiddleware)
+  async getFeatures(request: Request, response: Response): Promise<results.JsonResult> {
+    if (request.params.userUuid !== response.locals.user.uuid) {
+      return this.json({
+        error: {
+          message: 'Operation not allowed.',
+        },
+      }, 401)
+    }
+
+    const result = await this.doGetUserFeatures.execute({
+      userUuid: request.params.userUuid,
+    })
+
+    if (result.success) {
+      return this.json(result)
+    }
+
+    return this.json(result, 400)
+  }
+}