Centralize frontend API endpoints and update with versioned apis (#493)

spiffe · Sep 17, 2024 · 14c5d4b · 14c5d4b
2 parents 6a6d1a8 + 83e79dc
commit 14c5d4b
Show file tree

Hide file tree

Showing 11 changed files with 311 additions and 220 deletions.
diff --git a/frontend/.env b/frontend/.env
@@ -5,6 +5,7 @@ NODE_PATH=src/
 SKIP_PREFLIGHT_CHECK=true
 REACT_APP_DEBUG_TORNJAK=true
 REACT_APP_TORNJAK_MANAGER=false
+REACT_APP_API_VERSION=v1
 
 ##### Backend Server uri
 REACT_APP_API_SERVER_URI=http://localhost:10000/ 

diff --git a/frontend/src/components/agent-create-join-token.tsx b/frontend/src/components/agent-create-join-token.tsx
@@ -7,6 +7,7 @@ import { serverSelectedFunc } from 'redux/actions';
 import { RootState } from 'redux/reducers';
 import { ToastContainer } from "react-toastify"
 import { showResponseToast, showToast } from './error-api';
+import apiEndpoints from './apiConfig';
 
 type CreateJoinTokenProp = {
   globalServerSelected: string,
@@ -102,7 +103,7 @@ class CreateJoinToken extends Component<CreateJoinTokenProp, CreateJoinTokenStat
 
   getApiTokenEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/agent/createjointoken')
+      return GetApiServerUri(apiEndpoints.spireJoinTokenApi)
     } else if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/agent/createjointoken') + "/" + this.state.selectedServer
     } else {

diff --git a/frontend/src/components/apiConfig.ts b/frontend/src/components/apiConfig.ts
@@ -0,0 +1,18 @@
+import {env} from '../env';
+
+const API_VERSION = env.REACT_APP_API_VERSION;
+const API_BASE_URL = `/api/${API_VERSION}`;
+const apiEndpoints = {
+    spireServerInfoApi: `${API_BASE_URL}/spire/serverinfo`,
+    spireHealthCheckApi: `${API_BASE_URL}/spire/healthcheck`,
+    spireAgentsApi: `${API_BASE_URL}/spire/agents`,
+    spireAgentsBanApi: `${API_BASE_URL}/spire/agents/ban`,
+    spireJoinTokenApi: `${API_BASE_URL}/spire/agents/jointoken`,
+    spireEntriesApi: `${API_BASE_URL}/spire/entries`,
+    tornjakServerInfoApi: `${API_BASE_URL}/tornjak/serverinfo`,
+    tornjakSelectorsApi: `${API_BASE_URL}/tornjak/selectors`,
+    tornjakAgentsApi: `${API_BASE_URL}/tornjak/agents`,
+    tornjakClustersApi: `${API_BASE_URL}/tornjak/clusters`,
+};
+
+export default apiEndpoints;
diff --git a/frontend/src/components/cluster-create.tsx b/frontend/src/components/cluster-create.tsx
@@ -25,6 +25,7 @@ import {
   TornjakServerInfo
 } from './types'
 import { showResponseToast, showToast } from './error-api';
+import apiEndpoints from './apiConfig';
 
 type ClusterCreateProp = {
   // dispatches a payload for the server trust domain and nodeAttestorPlugin as a ServerInfoType and has a return type of void
@@ -205,7 +206,7 @@ class ClusterCreate extends Component<ClusterCreateProp, ClusterCreateState> {
 
   getApiEntryCreateEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/tornjak/clusters/create')
+      return GetApiServerUri(apiEndpoints.tornjakClustersApi)
     } else if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/tornjak/clusters/create') + "/" + this.state.selectedServer
     } else {

diff --git a/frontend/src/components/cluster-edit.tsx b/frontend/src/components/cluster-edit.tsx
@@ -27,6 +27,7 @@ import {
   DebugServerInfo,
 } from './types';
 import { showResponseToast, showToast } from './error-api';
+import apiEndpoints from './apiConfig';
 
 type ClusterEditProp = {
   // tornjak server debug info of the selected server
@@ -259,7 +260,7 @@ class ClusterEdit extends Component<ClusterEditProp, ClusterEditState> {
 
   getApiEntryCreateEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/tornjak/clusters/edit')
+      return GetApiServerUri(apiEndpoints.tornjakClustersApi)
     }
     if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/tornjak/clusters/edit') + "/" + this.state.selectedServer
@@ -342,7 +343,7 @@ class ClusterEdit extends Component<ClusterEditProp, ClusterEditState> {
       return
     }
 
-    axios.post(endpoint, cjtData)
+    axios.patch(endpoint, cjtData)
       .then(
         res => this.setState({
           message: "Request:" + JSON.stringify(cjtData, null, ' ') + "\n\nSuccess:" + JSON.stringify(res.data, null, ' '),

diff --git a/frontend/src/components/entry-create.tsx b/frontend/src/components/entry-create.tsx
@@ -47,6 +47,7 @@ import EntryExpiryFeatures from './entry-expiry-features';
 import CreateEntryJson from './entry-create-json';
 import { ToastContainer } from "react-toastify"
 import { showResponseToast, showToast } from './error-api';
+import apiEndpoints from './apiConfig';
 // import PropTypes from "prop-types"; // needed for testing will be removed on last pr
 
 type CreateEntryProp = {
@@ -573,7 +574,7 @@ class CreateEntry extends Component<CreateEntryProp, CreateEntryState> {
 
   getApiEntryCreateEndpoint(): string {
     if (!IsManager) {
-      return GetApiServerUri('/api/entry/create')
+      return GetApiServerUri(apiEndpoints.spireEntriesApi)
     } 
     if (IsManager && this.state.selectedServer !== "") {
       return GetApiServerUri('/manager-api/entry/create') + "/" + this.state.selectedServer