From bff4e663291c8e9eb4699fd93b42b5ca9c8726a0 Mon Sep 17 00:00:00 2001
From: Cian Butler <butlerx@notthe.cloud>
Date: Sat, 10 Jun 2023 18:18:48 +0100
Subject: [PATCH] Fix types in server

---
 .github/workflows/docker.workflow.yml | 2 --
 src/server.ts                         | 4 ++--
 src/server/socketServer.ts            | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.workflow.yml b/.github/workflows/docker.workflow.yml
index 0e0811ca..e78d98f0 100644
--- a/.github/workflows/docker.workflow.yml
+++ b/.github/workflows/docker.workflow.yml
@@ -14,8 +14,6 @@ on:
         required: true
       DOCKERHUB_TOKEN:
         required: true
-      GITHUB_TOKEN:
-        required: true
 jobs:
   docker:
     runs-on: ubuntu-latest
diff --git a/src/server.ts b/src/server.ts
index a017fe41..fa612e3a 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -19,7 +19,7 @@ import {
 } from './shared/defaults.js';
 import { logger as getLogger } from './shared/logger.js';
 import type { SSH, SSL, Server } from './shared/interfaces.js';
-import type { Application } from 'express';
+import type { Express } from 'express';
 import type SocketIO from 'socket.io';
 
 export * from './shared/interfaces.js';
@@ -45,7 +45,7 @@ export const start = (
   decorateServerWithSsh(express(), ssh, serverConf, command, forcessh, ssl);
 
 export async function decorateServerWithSsh(
-  app: Application,
+  app: Express,
   ssh: SSH = sshDefault,
   serverConf: Server = serverDefault,
   command: string = defaultCommand,
diff --git a/src/server/socketServer.ts b/src/server/socketServer.ts
index 14da4c27..e2fe5b48 100644
--- a/src/server/socketServer.ts
+++ b/src/server/socketServer.ts
@@ -9,11 +9,11 @@ import { policies } from './socketServer/security.js';
 import { listen } from './socketServer/socket.js';
 import { loadSSL } from './socketServer/ssl.js';
 import type { SSL, SSLBuffer, Server } from '../shared/interfaces.js';
-import type { Application } from 'express';
+import type { Express } from 'express';
 import type SocketIO from 'socket.io';
 
 export async function server(
-  app: Application,
+  app: Express,
   { base, port, host, title, allowIframe }: Server,
   ssl?: SSL,
 ): Promise<SocketIO.Server> {