@things-factory/shell 6.2.44 → 6.2.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.2.44",
+  "version": "6.2.48",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -63,7 +63,7 @@
     "@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",
+    "@things-factory/utils": "^6.2.48",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "args": "^5.0.0",
     "broadcastchannel-polyfill": "^1.0.1",
@@ -133,5 +133,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "a2a1ebf823f6b1315e751b12a01372e9a867d7af"
+  "gitHead": "70ed4f01ef662cde4d99911dc9374abd564cbe0e"
 }

package/server/server-dev.ts

@@ -22,6 +22,7 @@ import { historyApiFallback } from 'koa2-connect-history-api-fallback'
 import { WebSocketServer } from 'ws'
 import co from 'co'
 import http from 'http'
+import requestIp from 'request-ip'
 
 import koaWebpack from '@hatiolab/koa-webpack'
 import cors from '@koa/cors'
@@ -117,6 +118,7 @@ const bootstrap = async () => {
 
   const whitelist = config.get('whitelist')
   const blacklist = config.get('blacklist')
+  const protectedlist = config.get('protectedlist')
 
   if (whitelist || blacklist) {
     app.use(
@@ -130,6 +132,18 @@ const bootstrap = async () => {
     )
   }
 
+  if (protectedlist) {
+    app.use((context, next) => {
+      const ip = context.ip || requestIp.getClientIp(context.req)
+
+      context.state.protected = protectedlist.some(item => {
+        return new RegExp(item).test(ip)
+      })
+
+      return next()
+    })
+  }
+
   var subscriptionMiddleware = []
   process.emit('bootstrap-module-subscription' as any, app, subscriptionMiddleware)
 

package/server/server.ts

@@ -22,6 +22,7 @@ import { historyApiFallback } from 'koa2-connect-history-api-fallback'
 import { WebSocketServer } from 'ws'
 import co from 'co'
 import http from 'http'
+import requestIp from 'request-ip'
 
 import cors from '@koa/cors'
 import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
@@ -92,6 +93,7 @@ const bootstrap = async () => {
 
   const whitelist = config.get('whitelist')
   const blacklist = config.get('blacklist')
+  const protectedlist = config.get('protectedlist')
 
   if (whitelist || blacklist) {
     app.use(
@@ -105,6 +107,18 @@ const bootstrap = async () => {
     )
   }
 
+  if (protectedlist) {
+    app.use((context, next) => {
+      const ip = context.ip || requestIp.getClientIp(context.req)
+
+      context.state.protected = protectedlist.some(item => {
+        return new RegExp(item).test(ip)
+      })
+
+      return next()
+    })
+  }
+
   var subscriptionMiddleware = []
   process.emit('bootstrap-module-subscription' as any, app, subscriptionMiddleware)
 

package/server/service/domain/domain.ts

@@ -1,4 +1,14 @@
-import { Column, CreateDateColumn, ManyToOne, OneToMany, RelationId, Entity, Index, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  ManyToOne,
+  OneToMany,
+  RelationId,
+  Entity,
+  Index,
+  UpdateDateColumn,
+  DeleteDateColumn
+} from 'typeorm'
 import { ObjectType, Directive, Field, ID } from 'type-graphql'
 import { config } from '@things-factory/env'
 import { ScalarObject } from '../common-types'
@@ -10,7 +20,10 @@ const domainPrimaryType = domainPrimaryOption?.type
 const domainPrimaryStrategy = domainPrimaryOption?.strategy
 
 @Entity()
-@Index('ix_domain_0', (domain: Domain) => [domain.subdomain], { unique: true })
+@Index('ix_domain_0', (domain: Domain) => [domain.subdomain, domain.deletedAt], {
+  unique: true,
+  where: '"deleted_at" IS NULL'
+})
 @ObjectType()
 export class Domain {
   @Field(type => ID)
@@ -113,4 +126,8 @@ export class Domain {
   @Field({ nullable: true })
   @UpdateDateColumn()
   updatedAt: Date
+
+  @DeleteDateColumn()
+  @Field({ nullable: true })
+  deletedAt?: Date
 }