Fix admin edition disabling feature

2 files changed, 17 insertions, 2 deletions

diff --git a/shared/extra-utils/mock-servers/mock-instances-index.ts b/shared/extra-utils/mock-servers/mock-instances-index.ts
index 5baec00de..43c2e9f6e 100644
--- a/shared/extra-utils/mock-servers/mock-instances-index.ts
+++ b/shared/extra-utils/mock-servers/mock-instances-index.ts
@@ -1,7 +1,11 @@
 import express from 'express'
+import { Server } from 'http'
 import { randomInt } from '@shared/core-utils'
+import { terminateServer } from './utils'
 
 export class MockInstancesIndex {
+  private server: Server
+
   private readonly indexInstances: { host: string, createdAt: string }[] = []
 
   initialize () {
@@ -30,11 +34,15 @@ export class MockInstancesIndex {
       })
 
       const port = 42000 + randomInt(1, 1000)
-      app.listen(port, () => res(port))
+      this.server = app.listen(port, () => res(port))
     })
   }
 
   addInstance (host: string) {
     this.indexInstances.push({ host, createdAt: new Date().toISOString() })
   }
+
+  terminate () {
+    return terminateServer(this.server)
+  }
 }
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 4bd4b0cb4..5bbb61252 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -30,7 +30,6 @@ export interface RegisteredIdAndPassAuthConfig {
 }
 
 export interface ServerConfig {
-  allowEdits: boolean
   serverVersion: string
   serverCommit?: string
 
@@ -42,6 +41,14 @@ export interface ServerConfig {
     }
   }
 
+  webadmin: {
+    configuration: {
+      edition: {
+        allowed: boolean
+      }
+    }
+  },
+
   instance: {
     name: string
     shortDescription: string