hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #877 from atmire/remove-api-from-rest-config

Browse Source 
remove remaining uses of /api in the rest namespace
This commit is contained in:
Tim Donohue
2020-09-30 11:33:16 -05:00
committed by GitHub
parent 098eb291b6 4f16f21a7d
commit 03bba0f578
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -24,7 +24,7 @@ env:
# Direct that step to utilize a DSpace REST service that has been started in docker. # Direct that step to utilize a DSpace REST service that has been started in docker.
DSPACE_REST_HOST: localhost DSPACE_REST_HOST: localhost
DSPACE_REST_PORT: 8080 DSPACE_REST_PORT: 8080
DSPACE_REST_NAMESPACE: '/server/api' DSPACE_REST_NAMESPACE: '/server'
DSPACE_REST_SSL: false DSPACE_REST_SSL: false
before_install: before_install:

2
docker/environment.dev.ts
View File

@@ -13,6 +13,6 @@ export const environment = {
host: 'localhost', host: 'localhost',
port: 8080, port: 8080,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace: '/server/api' nameSpace: '/server'
} }
}; };

4
docs/Configuration.md
View File

@@ -42,7 +42,7 @@ export const environment = {
host: 'dspace7.4science.cloud', host: 'dspace7.4science.cloud',
port: 443, port: 443,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript // 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_SSL=true
DSPACE_REST_HOST=dspace7.4science.cloud DSPACE_REST_HOST=dspace7.4science.cloud
DSPACE_REST_PORT=443 DSPACE_REST_PORT=443
DSPACE_REST_NAMESPACE=/server/api DSPACE_REST_NAMESPACE=/server
``` ```
## Supporting analytics services other than Google Analytics ## Supporting analytics services other than Google Analytics

3
src/environments/environment.common.ts
View File

@@ -16,13 +16,12 @@ export const environment: GlobalConfig = {
}, },
// The REST API server settings. // The REST API server settings.
// NOTE: these must be "synced" with the 'dspace.server.url' setting in your backend's local.cfg. // 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: { rest: {
ssl: true, ssl: true,
host: 'dspace7.4science.cloud', host: 'dspace7.4science.cloud',
port: 443, port: 443,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace: '/server/api', nameSpace: '/server',
}, },
// Caching settings // Caching settings
cache: { cache: {

2
src/environments/environment.template.ts
View File

@@ -4,7 +4,7 @@ export const environment = {
* e.g. * e.g.
* rest: { * rest: {
* host: 'rest.api', * host: 'rest.api',
* nameSpace: '/rest/api', * nameSpace: '/rest',
* } * }
*/ */
}; };