Merge branch 'int_tox_hub' into 'develop'

Int tox hub

See merge request !19

src/app/app.module.ts

@@ -62,7 +62,7 @@ import { environment } from '../environments/environment';
         //allowedUrls: [environment.oauth2_resource_server_allowed_url],
         //allowedUrls: [environment.oauth2_resource_server_allowed_url],
         //allowedUrls: ["http://localhost:8090/","https://etransafe.bsc.es/"],
-        allowedUrls: ["https://etransafe.bsc.es/","https://dev.toxhub.etransafe.eu","https://test.toxhub.etransafe.eu","https://toxhub.etransafe.eu"],
+        allowedUrls: ["http://localhost:8090","https://etransafe.bsc.es/","https://dev.toxhub.etransafe.eu","https://test.toxhub.etransafe.eu","https://toxhub.etransafe.eu"],
         //allowedUrls: [window.location.protocol + '//' +  window.location.hostname + '/'],
         sendAccessToken: true
       }

src/app/auth.config.ts

@@ -4,6 +4,7 @@ export const authConfig: AuthConfig = {
   issuer: environment.oauth2_issuer,
   redirectUri: window.location.origin + environment.projectContextPath,
   clientId: environment.oauth2_clientId,
+  dummyClientSecret: environment.oauth2_client_secret,
   responseType: 'code',
   strictDiscoveryDocumentValidation: false,
   scope: 'openid profile email offline_access',

src/assets/env.js

@@ -6,8 +6,9 @@
     window["env"]["bratUrl"] = "http://localhost:8001";
     window["env"]["debug"] = true;
     //oauth2 security
-    window["env"]["oauth2_issuer"] = "http://localhost:8050/auth/realms/oauth2-pretox-local";
-    window["env"]["oauth2_clientId"] = "pretoxtm-app";
+    window["env"]["oauth2_issuer"] = "http://localhost:8050/auth/realms/KH";
+    window["env"]["oauth2_clientId"] = "pretoxtm-webapp";
+    window["env"]["oauth2_client_secret"] = "sg2vgyAO7VKyTGOU7KI1jEYGLG581wCu";
     window["env"]["oauth2_showDebugInformation"] = true;
     window["env"]["oauth2_resource_server_allowed_url"] = "http://localhost:8090/";
   })(this);
\ No newline at end of file

src/assets/env.template.js

@@ -8,6 +8,7 @@
     //oauth2 security variables
     window["env"]["oauth2_issuer"] = "${OAUTH2_ISSUER}";
     window["env"]["oauth2_clientId"] = "${OAUTH2_CLIENTID}";
+    window["env"]["oauth2_client_secret"] = "${OAUTH2_CLIENT_SECRET}";
     window["env"]["oauth2_showDebugInformation"] = "${OAUTH2_DEBUG}";
     window["env"]["oauth2_resource_server_allowed_url"] = "${OAUTH2_RESOURCE_SERVER_ALLOWED_URL}";
   })(this);

src/environments/environment.prod.ts

@@ -8,6 +8,7 @@ export const environment = {
   //security oauth2
   oauth2_issuer: window["env"]["oauth2_issuer"] || "default",
   oauth2_clientId: window["env"]["oauth2_clientId"] || "default",
+  oauth2_client_secret: window["env"]["oauth2_client_secret"] || "default",
   oauth2_showDebugInformation: window["env"]["oauth2_showDebugInformation"] || false,
   oauth2_resource_server_allowed_url: window["env"]["oauth2_resource_server_allowed_url"] || "default"
 };

src/environments/environment.ts

@@ -9,8 +9,9 @@ export const environment = {
   //apiUrl: 'https://etransafe.bsc.es/pretoxapi',
   bratUrl: 'http://localhost:8001',
   //
-  oauth2_issuer: 'http://localhost:8050/auth/realms/oauth2-pretox-local',
-  oauth2_clientId: 'pretoxtm-app',
+  oauth2_issuer: 'http://localhost:8050/auth/realms/KH',
+  oauth2_clientId: 'pretoxtm-webapp',
+  oauth2_client_secret: 'sg2vgyAO7VKyTGOU7KI1jEYGLG581wCu',
   oauth2_showDebugInformation: true,
   oauth2_resource_server_allowed_url: 'http://localhost:8090/'
 };