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

extend environment and use injected app config

Browse Source
This commit is contained in:
William Welling
2021-12-06 16:54:55 -06:00
parent 71f5b46639
commit 33488ccf40
25 changed files with 742 additions and 1203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/serve.ts
View File

@@ -1,16 +1,14 @@
import * as child from 'child_process';
import { environment } from '../src/environments/environment';
import { AppConfig } from '../src/config/app-config.interface';
import { buildAppConfig } from '../src/config/config.server';
// import { AppConfig } from '../src/config/app-config.interface';
// import { buildAppConfig } from '../src/config/config.server';
// const appConfig: AppConfig = buildAppConfig();
const appConfig: AppConfig = buildAppConfig();
/**
* Calls `ng serve` with the following arguments configured for the UI in the environment: host, port, nameSpace, ssl
* Calls `ng serve` with the following arguments configured for the UI in the app config: host, port, nameSpace, ssl
*/
child.spawn(
`ng serve --host ${environment.ui.host} --port ${environment.ui.port} --serve-path ${environment.ui.nameSpace} --ssl ${environment.ui.ssl}`,
{ stdio:'inherit', shell: true }
`ng serve --host ${appConfig.ui.host} --port ${appConfig.ui.port} --serve-path ${appConfig.ui.nameSpace} --ssl ${appConfig.ui.ssl}`,
{ stdio: 'inherit', shell: true }
);

16
scripts/test-rest.ts
View File

@@ -1,15 +1,13 @@
import * as http from 'http';
import * as https from 'https';
import { environment } from '../src/environments/environment';
// import { AppConfig } from '../src/config/app-config.interface';
// import { buildAppConfig } from '../src/config/config.server';
import { AppConfig } from '../src/config/app-config.interface';
import { buildAppConfig } from '../src/config/config.server';
// const appConfig: AppConfig = buildAppConfig();
const appConfig: AppConfig = buildAppConfig();
/**
* Script to test the connection with the configured REST API (in the 'rest' settings of your environment.*.ts)
* Script to test the connection with the configured REST API (in the 'rest' settings of your appConfig.*.json)
*
* This script is useful to test for any Node.js connection issues with your REST API.
*
@@ -17,11 +15,11 @@ import { environment } from '../src/environments/environment';
*/
// Get root URL of configured REST API
const restUrl = environment.rest.baseUrl + '/api';
const restUrl = appConfig.rest.baseUrl + '/api';
console.log(`...Testing connection to REST API at ${restUrl}...\n`);
// If SSL enabled, test via HTTPS, else via HTTP
if (environment.rest.ssl) {
if (appConfig.rest.ssl) {
const req = https.request(restUrl, (res) => {
console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
res.on('data', (data) => {
@@ -61,7 +59,7 @@ function checkJSONResponse(responseData: any): any {
console.log(`\t"dspaceVersion" = ${parsedData.dspaceVersion}`);
console.log(`\t"dspaceUI" = ${parsedData.dspaceUI}`);
console.log(`\t"dspaceServer" = ${parsedData.dspaceServer}`);
console.log(`\t"dspaceServer" property matches UI's "rest" config? ${(parsedData.dspaceServer === environment.rest.baseUrl)}`);
console.log(`\t"dspaceServer" property matches UI's "rest" config? ${(parsedData.dspaceServer === appConfig.rest.baseUrl)}`);
// Check for "authn" and "sites" in "_links" section as they should always exist (even if no data)!
const linksFound: string[] = Object.keys(parsedData._links);
console.log(`\tDoes "/api" endpoint have HAL links ("_links" section)? ${linksFound.includes('authn') && linksFound.includes('sites')}`);