Merge pull request #881 from hcengineering/server-upgrade-update

Server upgrade update (depend from #880)

dev/account/package.json

@@ -28,6 +28,6 @@
   },
   "dependencies": {
     "@anticrm/platform": "~0.6.5",
-    "jwt-simple": "^0.5.6"
+    "@anticrm/server-token": "~0.6.0"
   }
 }

dev/account/src/account.ts

@@ -17,7 +17,7 @@
 import type { Request, Response } from '@anticrm/platform'
 import platform, { Status, Severity } from '@anticrm/platform'
 
-import { encode } from 'jwt-simple'
+import { generateToken } from '@anticrm/server-token'
 
 interface LoginInfo {
   token: string
@@ -37,7 +37,7 @@ function login (endpoint: string, email: string, password: string, workspace: st
     return { error: new Status(Severity.ERROR, platform.status.Unauthorized, {}) }
   }
 
-  const token = encode({ email, workspace }, 'secret')
+  const token = generateToken(email, workspace)
   return { result: { token, endpoint } }
 }
 

dev/generator/package.json

@@ -39,7 +39,6 @@
   "dependencies": {
     "commander": "^8.1.0",
     "@anticrm/account": "~0.6.0",
-    "jwt-simple": "^0.5.6",
     "@anticrm/core": "~0.6.11",
     "@anticrm/contact": "~0.6.2",
     "@anticrm/model-all": "~0.6.0",
@@ -59,6 +58,7 @@
     "minio": "^7.0.19",
     "@types/pdfkit": "~0.12.3",
     "@anticrm/task": "~0.6.0",
-    "jpeg-js": "~0.4.3"
+    "jpeg-js": "~0.4.3",
+    "@anticrm/server-token": "~0.6.0"
   }
 }

dev/generator/src/connect.ts

@@ -3,14 +3,14 @@ import client from '@anticrm/client'
 import clientResources from '@anticrm/client-resources'
 import { Client } from '@anticrm/core'
 import { setMetadata } from '@anticrm/platform'
-import { encode } from 'jwt-simple'
+import { generateToken } from '@anticrm/server-token'
 
 // eslint-disable-next-line
 const WebSocket = require('ws')
 
 export async function connect (transactorUrl: string, workspace: string): Promise<Client> {
   console.log('connecting to transactor...')
-  const token = encode({ email: '[email protected]', workspace }, 'secret')
+  const token = generateToken('[email protected]', workspace)
 
   // We need to override default factory with 'ws' one.
   setMetadata(client.metadata.ClientSocketFactory, (url) => new WebSocket(url))

dev/tool/package.json

@@ -42,7 +42,6 @@
     "mongodb": "^4.1.1",
     "commander": "^8.1.0",
     "@anticrm/account": "~0.6.0",
-    "jwt-simple": "^0.5.6",
     "@anticrm/core": "~0.6.11",
     "@anticrm/contact": "~0.6.2",
     "minio": "^7.0.19",
@@ -58,6 +57,7 @@
     "@elastic/elasticsearch": "^7.14.0",
     "@anticrm/elastic": "~0.6.0",
     "@anticrm/server-core": "~0.6.1",
+    "@anticrm/server-token": "~0.6.0",
     "@anticrm/model-attachment": "~0.6.0",
     "@anticrm/mongo": "~0.6.0",
     "@anticrm/dev-storage": "~0.6.0",

dev/tool/src/connect.ts

@@ -3,14 +3,14 @@ import client from '@anticrm/client'
 import clientResources from '@anticrm/client-resources'
 import { Client } from '@anticrm/core'
 import { setMetadata } from '@anticrm/platform'
-import { encode } from 'jwt-simple'
+import { generateToken } from '@anticrm/server-token'
 
 // eslint-disable-next-line
 const WebSocket = require('ws')
 
 export async function connect (transactorUrl: string, workspace: string): Promise<Client> {
   console.log('connecting to transactor...')
-  const token = encode({ email: '[email protected]', workspace }, 'secret')
+  const token = generateToken('[email protected]', workspace)
 
   // We need to override default factory with 'ws' one.
   setMetadata(client.metadata.ClientSocketFactory, (url) => new WebSocket(url))

dev/tool/src/index.ts

@@ -28,7 +28,8 @@ import {
   upgradeWorkspace
 } from '@anticrm/account'
 import { setMetadata } from '@anticrm/platform'
-import toolPlugin, { generateToken, prepareTools, version } from '@anticrm/server-tool'
+import { generateToken } from '@anticrm/server-token'
+import toolPlugin, { prepareTools, version } from '@anticrm/server-tool'
 import { program } from 'commander'
 import { Db, MongoClient } from 'mongodb'
 import { rebuildElastic } from './elastic'

rush.json

@@ -496,6 +496,11 @@
       "projectFolder": "server/core",
       "shouldPublish": true
     },
+    {
+      "packageName": "@anticrm/server-token",
+      "projectFolder": "server/token",
+      "shouldPublish": true
+    },
     {
       "packageName": "@anticrm/server",
       "projectFolder": "server/server",

server/account/package.json

@@ -36,9 +36,9 @@
     "@anticrm/contact": "~0.6.2",
     "@anticrm/client-resources": "~0.6.4",
     "@anticrm/client": "~0.6.1",
-    "jwt-simple": "~0.5.6",
     "ws": "^8.2.0",
     "@anticrm/model": "~0.6.0",
-    "@anticrm/server-tool": "~0.6.0"
+    "@anticrm/server-tool": "~0.6.0",
+    "@anticrm/server-token": "~0.6.0"
   }
 }

server/account/src/index.ts

@@ -27,7 +27,8 @@ import platform, {
   Status,
   StatusCode
 } from '@anticrm/platform'
-import toolPlugin, { connect, initModel, upgradeModel, version, decodeToken, generateToken } from '@anticrm/server-tool'
+import toolPlugin, { connect, initModel, upgradeModel, version } from '@anticrm/server-tool'
+import { decodeToken, generateToken } from '@anticrm/server-token'
 import { pbkdf2Sync, randomBytes } from 'crypto'
 import { Binary, Db, ObjectId } from 'mongodb'
 
@@ -393,7 +394,7 @@ export async function assignWorkspace (db: Db, email: string, workspace: string)
 }
 
 async function createEmployeeAccount (account: Account, workspace: string): Promise<void> {
-  const connection = await connect(getTransactor(), workspace, account.email)
+  const connection = await connect(getTransactor(), workspace, false, account.email)
   try {
     const ops = new TxOperations(connection, core.account.System)
 
@@ -471,7 +472,7 @@ export async function changeName (db: Db, token: string, first: string, last: st
 }
 
 async function updateEmployeeAccount (account: Account, workspace: string): Promise<void> {
-  const connection = await connect(getTransactor(), workspace, account.email)
+  const connection = await connect(getTransactor(), workspace, false, account.email)
   try {
     const ops = new TxOperations(connection, core.account.System)
 

server/core/src/types.ts

@@ -76,13 +76,6 @@ export interface FullTextAdapter {
  */
 export type FullTextAdapterFactory = (url: string, workspace: string) => Promise<FullTextAdapter>
 
-/**
- * @public
- */
-export interface Token {
-  workspace: string
-}
-
 /**
  * @public
  */

server/front/package.json

@@ -43,8 +43,8 @@
     "uuid": "^8.3.2",
     "cors": "^2.8.5",
     "@anticrm/elastic": "~0.6.0",
-    "jwt-simple": "^0.5.6",
     "@anticrm/server-core": "~0.6.1",
+    "@anticrm/server-token": "~0.6.0",
     "@anticrm/attachment": "~0.6.0",
     "@anticrm/contrib": "~0.6.0",
     "minio": "^7.0.19"

server/front/src/__start.ts

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-import { start } from './app'
 import { Client } from 'minio'
+import { start } from './app'
 
 const SERVER_PORT = parseInt(process.env.SERVER_PORT ?? '8080')
 
@@ -77,4 +77,14 @@ if (modelVersion === undefined) {
 
 const config = { transactorEndpoint, elasticUrl, minio, accountsUrl, uploadUrl, modelVersion }
 console.log('Starting Front service with', config)
-start(config, SERVER_PORT)
+const shutdown = start(config, SERVER_PORT)
+
+const close = (): void => {
+  console.trace('Exiting from server')
+  console.log('Shutdown request accepted')
+  shutdown()
+  process.exit(0)
+}
+
+process.on('SIGINT', close)
+process.on('SIGTERM', close)