From 24706f0cc43612879dc0e296607b51bba152e1b0 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 30 Sep 2020 11:15:50 +0200
Subject: [PATCH 1/2] remove remaining uses of /api in the rest namespace

---
 .travis.yml                            | 2 +-
 src/environments/environment.common.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0ef2e7b74e..6cd6d26c59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ env:
   # Direct that step to utilize a DSpace REST service that has been started in docker.
   DSPACE_REST_HOST: localhost
   DSPACE_REST_PORT: 8080
-  DSPACE_REST_NAMESPACE: '/server/api'
+  DSPACE_REST_NAMESPACE: '/server'
   DSPACE_REST_SSL: false
 
 before_install:
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 32ae2f54b0..77e2ab8aa0 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -16,13 +16,12 @@ export const environment: GlobalConfig = {
   },
   // The REST API server settings.
   // NOTE: these must be "synced" with the 'dspace.server.url' setting in your backend's local.cfg.
-  // The 'nameSpace' must always end in "/api" as that's the subpath of the REST API in the backend.
   rest: {
     ssl: true,
     host: 'dspace7.4science.cloud',
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api',
+    nameSpace: '/server',
   },
   // Caching settings
   cache: {

From 4f16f21a7d43782031db94b3c060e64af0bd1e42 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 30 Sep 2020 17:14:31 +0200
Subject: [PATCH 2/2] remove remaining uses of /api in the rest namespace

---
 docker/environment.dev.ts                | 2 +-
 docs/Configuration.md                    | 4 ++--
 src/environments/environment.template.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/environment.dev.ts b/docker/environment.dev.ts
index 573c8ebb67..0e603ef11d 100644
--- a/docker/environment.dev.ts
+++ b/docker/environment.dev.ts
@@ -13,6 +13,6 @@ export const environment = {
     host: 'localhost',
     port: 8080,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api'
+    nameSpace: '/server'
   }
 };
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 4be21d046d..60c6352ff3 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -42,7 +42,7 @@ export const environment = {
     host: 'dspace7.4science.cloud',
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api'
+    nameSpace: '/server'
   }
 };
 ```
@@ -52,7 +52,7 @@ Alternately you can set the following environment variables. If any of these are
   DSPACE_REST_SSL=true
   DSPACE_REST_HOST=dspace7.4science.cloud
   DSPACE_REST_PORT=443
-  DSPACE_REST_NAMESPACE=/server/api
+  DSPACE_REST_NAMESPACE=/server
 ```
 
 ## Supporting analytics services other than Google Analytics
diff --git a/src/environments/environment.template.ts b/src/environments/environment.template.ts
index d0282ad607..6f6510e1ab 100644
--- a/src/environments/environment.template.ts
+++ b/src/environments/environment.template.ts
@@ -4,7 +4,7 @@ export const environment = {
    * e.g.
    * rest: {
    *   host: 'rest.api',
-   *   nameSpace: '/rest/api',
+   *   nameSpace: '/rest',
    * }
    */
 };