Merge branch 'OpenDreamSupport' into next

tgstation · Dec 24, 2023 · 16c243f · 16c243f
2 parents 7a5c822 + c90be9f
commit 16c243f
Show file tree

Hide file tree

Showing 28 changed files with 532 additions and 302 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tgstation-server-control-panel",
     "version": "5.2.2",
-    "tgs_api_version": "9.14.0",
+    "tgs_api_version": "10.0.0",
     "private": true,
     "homepage": "https://tgstation.github.io/tgstation-server-control-panel",
     "repository": "github:tgstation/tgstation-server-control-panel",
@@ -47,6 +47,7 @@
         "fs-extra": "^9.1.0",
         "https-browserify": "^1.0.0",
         "jquery": "^3.5.1",
+        "jwt-decode": "^4.0.0",
         "path-to-regexp": "^6.2.0",
         "popper.js": "^1.16.1",
         "prettier": "2.2.1",

diff --git a/src/ApiClient/AdminClient.ts b/src/ApiClient/AdminClient.ts
@@ -72,7 +72,7 @@ export default new (class AdminClient extends ApiClient<IEvents> {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.administration.administrationControllerRead();
+            response = await ServerClient.apiClient!.api.administrationControllerRead();
         } catch (stat) {
             const res = new InternalStatus<AdministrationResponse, AdminInfoErrors>({
                 code: StatusCode.ERROR,
@@ -153,7 +153,7 @@ export default new (class AdminClient extends ApiClient<IEvents> {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.administration.administrationControllerDelete();
+            response = await ServerClient.apiClient!.api.administrationControllerDelete();
         } catch (stat) {
             return new InternalStatus({
                 code: StatusCode.ERROR,
@@ -199,7 +199,7 @@ export default new (class AdminClient extends ApiClient<IEvents> {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.administration.administrationControllerUpdate({
+            response = await ServerClient.apiClient!.api.administrationControllerUpdate({
                 newVersion
             });
         } catch (stat) {
@@ -281,7 +281,7 @@ export default new (class AdminClient extends ApiClient<IEvents> {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.administration.administrationControllerUpdate({
+            response = await ServerClient.apiClient!.api.administrationControllerUpdate({
                 newVersion,
                 uploadZip: true
             });
@@ -373,12 +373,10 @@ export default new (class AdminClient extends ApiClient<IEvents> {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.administration.administrationControllerListLogs(
-                {
-                    pageSize: pageSize,
-                    page: page
-                }
-            );
+            response = await ServerClient.apiClient!.api.administrationControllerListLogs({
+                pageSize: pageSize,
+                page: page
+            });
         } catch (stat) {
             return new InternalStatus({
                 code: StatusCode.ERROR,
@@ -425,9 +423,7 @@ export default new (class AdminClient extends ApiClient<IEvents> {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.administration.administrationControllerGetLog(
-                logName
-            );
+            response = await ServerClient.apiClient!.api.administrationControllerGetLog(logName);
         } catch (stat) {
             return new InternalStatus({
                 code: StatusCode.ERROR,

diff --git a/src/ApiClient/ChatBotClient.ts b/src/ApiClient/ChatBotClient.ts
@@ -26,7 +26,7 @@ export default new (class ChatBotClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.chat.chatControllerList(
+            response = await ServerClient.apiClient!.api.chatControllerList(
                 { page, pageSize },
                 {
                     headers: {
@@ -69,7 +69,7 @@ export default new (class ChatBotClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.chat.chatControllerCreate(chatBot, {
+            response = await ServerClient.apiClient!.api.chatControllerCreate(chatBot, {
                 headers: {
                     Instance: instance.toString()
                 }
@@ -109,7 +109,7 @@ export default new (class ChatBotClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.chat.chatControllerUpdate(chatBot, {
+            response = await ServerClient.apiClient!.api.chatControllerUpdate(chatBot, {
                 headers: {
                     Instance: instance.toString()
                 }
@@ -167,7 +167,7 @@ export default new (class ChatBotClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.chat.chatControllerGetId(chatBotId, {
+            response = await ServerClient.apiClient!.api.chatControllerGetId(chatBotId, {
                 headers: {
                     Instance: instance.toString()
                 }
@@ -219,7 +219,7 @@ export default new (class ChatBotClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.chat.chatControllerDelete(chatBotId, {
+            response = await ServerClient.apiClient!.api.chatControllerDelete(chatBotId, {
                 headers: {
                     Instance: instance.toString()
                 }

diff --git a/src/ApiClient/ConfigurationFileClient.ts b/src/ApiClient/ConfigurationFileClient.ts
@@ -28,7 +28,7 @@ export default new (class ConfigurationFileClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.config.configurationControllerCreateDirectory(
+            response = await ServerClient.apiClient!.api.configurationControllerCreateDirectory(
                 path,
                 {
                     headers: {
@@ -73,7 +73,7 @@ export default new (class ConfigurationFileClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.config.configurationControllerUpdate(
+            response = await ServerClient.apiClient!.api.configurationControllerUpdate(
                 fileRequest,
                 {
                     headers: { Instance: instance.toString() }
@@ -120,7 +120,7 @@ export default new (class ConfigurationFileClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.config.configurationControllerFile(filePath, {
+            response = await ServerClient.apiClient!.api.configurationControllerFile(filePath, {
                 headers: { Instance: instance.toString() }
             });
         } catch (stat) {
@@ -190,7 +190,7 @@ export default new (class ConfigurationFileClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.config.configurationControllerDirectory(
+            response = await ServerClient.apiClient!.api.configurationControllerDirectory(
                 {
                     directoryPath,
                     pageSize: pageSize,
@@ -245,7 +245,7 @@ export default new (class ConfigurationFileClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.config.configurationControllerList(
+            response = await ServerClient.apiClient!.api.configurationControllerList(
                 {
                     pageSize: pageSize,
                     page: page
@@ -287,7 +287,7 @@ export default new (class ConfigurationFileClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.config.configurationControllerDeleteDirectory(
+            response = await ServerClient.apiClient!.api.configurationControllerDeleteDirectory(
                 directory,
                 { headers: { Instance: instance.toString() } }
             );

diff --git a/src/ApiClient/DreamDaemonClient.ts b/src/ApiClient/DreamDaemonClient.ts
@@ -19,7 +19,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamDaemon.dreamDaemonControllerRead({
+            response = await ServerClient.apiClient!.api.dreamDaemonControllerRead({
                 headers: {
                     Instance: instance.toString()
                 }
@@ -71,14 +71,11 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamDaemon.dreamDaemonControllerUpdate(
-                newSettings,
-                {
-                    headers: {
-                        Instance: instance.toString()
-                    }
+            response = await ServerClient.apiClient!.api.dreamDaemonControllerUpdate(newSettings, {
+                headers: {
+                    Instance: instance.toString()
                 }
-            );
+            });
         } catch (stat) {
             return new InternalStatus({
                 code: StatusCode.ERROR,
@@ -125,7 +122,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamDaemon.dreamDaemonControllerCreate({
+            response = await ServerClient.apiClient!.api.dreamDaemonControllerCreate({
                 headers: {
                     Instance: instance.toString()
                 }
@@ -162,7 +159,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamDaemon.dreamDaemonControllerDelete({
+            response = await ServerClient.apiClient!.api.dreamDaemonControllerDelete({
                 headers: {
                     Instance: instance.toString()
                 }
@@ -201,7 +198,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamDaemon.dreamDaemonControllerRestart({
+            response = await ServerClient.apiClient!.api.dreamDaemonControllerRestart({
                 headers: {
                     Instance: instance.toString()
                 }
@@ -240,7 +237,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamDaemon.dreamDaemonControllerCreateDump({
+            response = await ServerClient.apiClient!.api.dreamDaemonControllerCreateDump({
                 headers: {
                     Instance: instance.toString()
                 }

diff --git a/src/ApiClient/DreamMakerClient.ts b/src/ApiClient/DreamMakerClient.ts
@@ -26,7 +26,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamMaker.dreamMakerControllerRead({
+            response = await ServerClient.apiClient!.api.dreamMakerControllerRead({
                 headers: {
                     Instance: instance.toString()
                 }
@@ -65,7 +65,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamMaker.dreamMakerControllerCreate({
+            response = await ServerClient.apiClient!.api.dreamMakerControllerCreate({
                 headers: {
                     Instance: instance.toString()
                 }
@@ -105,14 +105,11 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamMaker.dreamMakerControllerUpdate(
-                settings,
-                {
-                    headers: {
-                        Instance: instance.toString()
-                    }
+            response = await ServerClient.apiClient!.api.dreamMakerControllerUpdate(settings, {
+                headers: {
+                    Instance: instance.toString()
                 }
-            );
+            });
         } catch (stat) {
             return new InternalStatus({
                 code: StatusCode.ERROR,
@@ -166,7 +163,7 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamMaker.dreamMakerControllerList(
+            response = await ServerClient.apiClient!.api.dreamMakerControllerList(
                 { page, pageSize },
                 {
                     headers: {
@@ -209,14 +206,11 @@ export default new (class DreamDaemonClient extends ApiClient {
 
         let response;
         try {
-            response = await ServerClient.apiClient!.dreamMaker.dreamMakerControllerGetId(
-                compileJob,
-                {
-                    headers: {
-                        Instance: instance.toString()
-                    }
+            response = await ServerClient.apiClient!.api.dreamMakerControllerGetId(compileJob, {
+                headers: {
+                    Instance: instance.toString()
                 }
-            );
+            });
         } catch (stat) {
             return new InternalStatus({
                 code: StatusCode.ERROR,