From 0a8aa41c6779d79ef765060a8ad671c03f42beeb Mon Sep 17 00:00:00 2001
From: myr-onl <140292626+myr-onl@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:49:11 -0400
Subject: [PATCH] Fix adding API documentation to interface

---
 .../themes/responsive/API/apiDocumentation.tpl    | 15 +++------------
 code/web/openapi/.htaccess                        |  3 +++
 code/web/openapi/aspen_openapi.json               |  6 ------
 code/web/services/API/Documentation.php           |  6 +++---
 4 files changed, 9 insertions(+), 21 deletions(-)
 create mode 100644 code/web/openapi/.htaccess
diff --git a/code/web/interface/themes/responsive/API/apiDocumentation.tpl b/code/web/interface/themes/responsive/API/apiDocumentation.tpl
index f6182dc63a..ff945e1b96 100644
--- a/code/web/interface/themes/responsive/API/apiDocumentation.tpl
+++ b/code/web/interface/themes/responsive/API/apiDocumentation.tpl
@@ -1,12 +1,3 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Aspen API</title>
-</head>
-<body>
-    <redoc spec-url="<?php echo $githubRawUrl; ?>"></redoc>
-</body>
-    <script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"></script>
-</html>
\ No newline at end of file
+<head><title>Aspen Discovery API</title></head>
+<redoc spec-url="{$apiFile}"></redoc>
+<script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"></script>
\ No newline at end of file
diff --git a/code/web/openapi/.htaccess b/code/web/openapi/.htaccess
new file mode 100644
index 0000000000..4a35bca368
--- /dev/null
+++ b/code/web/openapi/.htaccess
@@ -0,0 +1,3 @@
+<IfModule mod_rewrite.c>
+  RewriteEngine Off
+</IfModule>
\ No newline at end of file
diff --git a/code/web/openapi/aspen_openapi.json b/code/web/openapi/aspen_openapi.json
index 5475a32a7d..feb5f949e4 100644
--- a/code/web/openapi/aspen_openapi.json
+++ b/code/web/openapi/aspen_openapi.json
@@ -24,12 +24,6 @@
     }
   ],
   "tags": [
-    {
-      "name": "AbstractAPI"
-    },
-    {
-      "name": "AnodeAPI"
-    },
     {
       "name": "CommunityAPI"
     },
diff --git a/code/web/services/API/Documentation.php b/code/web/services/API/Documentation.php
index 20caed613b..dc54778eaa 100644
--- a/code/web/services/API/Documentation.php
+++ b/code/web/services/API/Documentation.php
@@ -1,14 +1,14 @@
 <?php
 
-$gitBranch = trim(shell_exec('git rev-parse --abbrev-ref HEAD'));
-$githubRawUrl = "https://raw.githubusercontent.com/Aspen-Discovery/aspen-discovery/refs/heads/$gitBranch/code/web/openapi/aspen_openapi.json";
-
 require_once ROOT_DIR . '/Action.php';
 
 class API_Documentation extends Action {
 	function launch() {
 		global $interface;
 
+		$apiFile = "/openapi/aspen_openapi.json";
+
+		$interface->assign('apiFile', $apiFile);
 		$interface->display('API/apiDocumentation.tpl');
 	}
 
