Client config is now provided by server

client/src/app/app-init.ts

@@ -7,12 +7,15 @@ import { Store } from '@ngrx/store';
 import { AppConfigService } from './app-config.service';
 import { initializeKeycloak } from 'src/app/auth/init.keycloak';
 
+import { environment } from 'src/environments/environment';
+
 function appInit(http: HttpClient, appConfigService: AppConfigService, keycloak: KeycloakService, store: Store<{ }>) {
     return () => {
-        return http.get('/assets/app.config.json')
+        return http.get(`${environment.apiUrl}/client-settings`)
             .toPromise()
             .then(data => {
                 Object.assign(appConfigService, data);
+                appConfigService.apiUrl = environment.apiUrl;
                 return appConfigService;
             })
             .then(appConfigService => {

client/src/assets/app.config.json

-{
-    "apiUrl": "http://localhost:8080",
-    "servicesUrl": "http://localhost:5000",
-    "baseHref": "/",
-    "authenticationEnabled": false,
-    "ssoAuthUrl": "http://localhost:8180/auth",
-    "ssoRealm": "anis",
-    "ssoClientId": "anis-client",
-    "adminRole": "anis_admin"
-}
\ No newline at end of file

client/src/environments/environment.prod.ts

 export const environment = {
-    production: true
+    production: true,
+    apiUrl: "/server"
 };

client/src/environments/environment.ts

@@ -3,7 +3,8 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-    production: false
+    production: false,
+    apiUrl: "http://localhost:8080"
 };
 
 /*

docker-compose.yml

@@ -29,6 +29,11 @@ services:
             LOGGER_NAME: "anis-metamodel"
             LOGGER_PATH: "php://stderr"
             LOGGER_LEVEL: "debug"
+            SERVICES_URL: "http://localhost:5000"
+            BASE_HREF: "/"
+            SSO_AUTH_URL: "http://localhost:8180/auth"
+            SSO_REALM: "anis"
+            SSO_CLIENT_ID: "anis-client"
             TOKEN_ENABLED: 0
             TOKEN_PUBLIC_KEY_FILE: /mnt/public_key
             TOKEN_ADMIN_ROLE: anis_admin

server/app/dependencies.php

@@ -56,6 +56,10 @@ $container->set('App\Action\RootAction', function () {
     return new App\Action\RootAction();
 });
 
+$container->set('App\Action\ClientSettingsAction', function (ContainerInterface $c) {
+    return new App\Action\ClientSettingsAction($c->get(SETTINGS));
+});
+
 $container->set('App\Action\SelectListAction', function (ContainerInterface $c) {
     return new App\Action\SelectListAction($c->get('em'));
 });

server/app/routes.php

@@ -13,6 +13,7 @@ declare(strict_types=1);
 use Slim\Routing\RouteCollectorProxy;
 
 $app->get('/', App\Action\RootAction::class);
+$app->get('/client-settings', App\Action\ClientSettingsAction::class);
 
 $app->group('', function (RouteCollectorProxy $group) {
     $group->map([OPTIONS, GET, POST], '/select', App\Action\SelectListAction::class);

server/app/settings.php

@@ -31,8 +31,14 @@ return [
         'path' => getenv('LOGGER_PATH'),
         'level' => getenv('LOGGER_LEVEL')
     ],
+    'services_url' => getenv('SERVICES_URL'),
+    'base_href' => getenv('BASE_HREF'),
+    'sso' => [
+        'auth_url' => getenv('SSO_AUTH_URL'),
+        'realm' => getenv('SSO_REALM'),
+        'client_id' => getenv('SSO_CLIENT_ID')
+    ],
     'token' => [
-        //'issuer' => getenv('TOKEN_ISSUER'),
         'enabled' => getenv('TOKEN_ENABLED'),
         'public_key_file' => getenv('TOKEN_PUBLIC_KEY_FILE'),
         'admin_role' => getenv('TOKEN_ADMIN_ROLE')

server/src/Action/ClientSettingsAction.php

+<?php
+
+/*
+ * This file is part of Anis Server.
+ *
+ * (c) Laboratoire d'Astrophysique de Marseille / CNRS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace App\Action;
+
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+/**
+ * Client settings action
+ *
+ * @author François Agneray <francois.agneray@lam.fr>
+ * @package App\Action
+ */
+final class ClientSettingsAction
+{
+    /**
+     * The ANIS settings array
+     *
+     * @var array
+     */
+    private $settings;
+
+    public function __construct($settings)
+    {
+        $this->settings = $settings;
+    }
+
+    /**
+     * This action indicates that the service is responding
+     *
+     * @param  ServerRequestInterface $request  PSR-7 This object represents the HTTP request
+     * @param  ResponseInterface      $response PSR-7 This object represents the HTTP response
+     * @param  string[]               $args     This table contains information transmitted in the URL (see routes.php)
+     *
+     * @return ResponseInterface
+     */
+    public function __invoke(Request $request, Response $response, array $args): Response
+    {
+        $payload = json_encode(array(
+            'servicesUrl' => $this->settings['services_url'],
+            'baseHref' => $this->settings['base_href'],
+            'authenticationEnabled' => boolval($this->settings['token']['enabled']),
+            'ssoAuthUrl' => $this->settings['sso']['auth_url'],
+            'ssoRealm' => $this->settings['sso']['realm'],
+            'ssoClientId' => $this->settings['sso']['client_id'],
+            'adminRole' => $this->settings['token']['admin_role']
+        ));
+        $response->getBody()->write($payload);
+        return $response;
+    }
+}