@things-factory/shell 6.2.34 → 6.2.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.2.34",
+  "version": "6.2.42",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -61,6 +61,7 @@
     "@operato/utils": "^1.0.1",
     "@things-factory/ejs-remote": "^6.2.33",
     "@things-factory/env": "^6.2.33",
+    "@things-factory/operato-license-checker": "^4.0.4",
     "@things-factory/styles": "^6.2.33",
     "@things-factory/utils": "^6.2.33",
     "@webcomponents/webcomponentsjs": "^2.6.0",
@@ -132,5 +133,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "c1bf972f4b3b088638923bbf62badb572e1e6401"
+  "gitHead": "cc76b5c3dea6a88d4381e914eeaaff9e102e672d"
 }

package/server/routers/global-router.ts

@@ -1,5 +1,6 @@
 import Router from 'koa-router'
 
+import { getLicenseInfo } from '@things-factory/operato-license-checker'
 import { domainMiddleware } from '../middlewares/domain-middleware'
 
 var crawler = require('npm-license-crawler')
@@ -24,7 +25,12 @@ globalPublicRouter.get('/dependencies', async (context, next) => {
   await context.render('dependencies-view-graphviz', { model: dependencyGraph })
 })
 
-globalPublicRouter.get('/licenses', (context, next) => {
+globalPublicRouter.get('/license-info', (context, next) => {
+  context.type = 'application/json'
+  context.body = getLicenseInfo()
+})
+
+globalPublicRouter.get('/opensource-licenses', (context, next) => {
   return new Promise(function (resolve, reject) {
     var options = {
       start: ['.'],
@@ -36,7 +42,7 @@ globalPublicRouter.get('/licenses', (context, next) => {
 
     crawler.dumpLicenses(options, function (error, res) {
       if (error) {
-        console.error('get:/licenses', error)
+        console.error('get:/opensource-licenses', error)
         reject(error)
       } else {
         context.type = 'application/json'

package/server/server-dev.ts

@@ -26,6 +26,7 @@ import http from 'http'
 import koaWebpack from '@hatiolab/koa-webpack'
 import cors from '@koa/cors'
 import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
+import { initLicense, checkValidity } from '@things-factory/operato-license-checker'
 
 import { GraphqlLocalClient } from './graphql-local-client'
 import { databaseInitializer } from './initializers/database'
@@ -93,6 +94,8 @@ interface ICustomAppContext {
   ssoMiddlewares: any[]
 }
 
+initLicense(config.get('licenseKey'))
+
 /* bootstrap */
 const bootstrap = async () => {
   await databaseInitializer()
@@ -259,6 +262,8 @@ const bootstrap = async () => {
   process.emit('bootstrap-module-domain-public-route' as any, app, domainPublicRouter)
   process.emit('bootstrap-module-domain-private-route' as any, app, domainPrivateRouter)
 
+  app.use(checkValidity) /* Check the license after most of the context has been built */
+
   app
     .use(globalPublicRouter.routes())
     .use(globalPublicRouter.allowedMethods())

package/server/server.ts

@@ -25,6 +25,7 @@ import http from 'http'
 
 import cors from '@koa/cors'
 import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
+import { initLicense, checkValidity } from '@things-factory/operato-license-checker'
 
 import { GraphqlLocalClient } from './graphql-local-client'
 import { databaseInitializer } from './initializers/database'
@@ -68,6 +69,8 @@ const fileUploadOption = {
   maxFiles: fileUpload.maxFiles || 10
 }
 
+initLicense(config.get('licenseKey'))
+
 /* bootstrap */
 const bootstrap = async () => {
   await databaseInitializer()
@@ -219,6 +222,8 @@ const bootstrap = async () => {
   process.emit('bootstrap-module-domain-public-route' as any, app, domainPublicRouter)
   process.emit('bootstrap-module-domain-private-route' as any, app, domainPrivateRouter)
 
+  app.use(checkValidity) /* Check the license after most of the context has been built */
+
   app
     .use(globalPublicRouter.routes())
     .use(globalPublicRouter.allowedMethods())