Merge branch 'master' of forgemia.inra.fr:in-sylva-development/in-syl…

…va.infrastructure

build.sh

@@ -27,7 +27,7 @@ Usage(){
   exit 
 }
 
-while [[ $# != 0 ]];do
+while [ $# != 0 ];do
   opt="$1"
   case $opt in
     -k)

data.sql

@@ -324,15 +324,18 @@ CREATE table IF NOT EXISTS roles_users (
 );
 
 CREATE table  IF NOT EXISTS user_search_his(
-    id serial not null,
-    user_id int not null references users(id),
-
-    PRIMARY KEY (id, user_id),
+    id serial primary key,
+    kc_id varchar(100) NOT NULL,
 
     query text,
     name varchar(50),
     ui_structure text,
     description text,
+
+    CONSTRAINT roles_users_kc_id_fkey FOREIGN KEY  (kc_id)
+        REFERENCES  users(kc_id) MATCH SIMPLE
+        ON UPDATE NO ACTION  ON DELETE  NO ACTION,
+
     createdAt timestamp NOT NULL DEFAULT NOW(),
     updatedAt timestamp
 );

search/.env_generic

@@ -2,8 +2,9 @@ REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper
 REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager
 REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak
 REACT_APP_IN_SYLVA_SEARCH_HOST=/search-api
-REACT_APP_IN_SYLVA_LOGIN_HOST=/login
+REACT_APP_IN_SYLVA_LOGIN_HOST=http://localhost:8081
 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
 REACT_APP_IN_SYLVA_GRANT_TYPE=password
 REACT_APP_IN_SYLVA_REALM=in-sylva
-REACT_APP_PORT=3001
+REACT_APP_PORT=3001
+REACT_KEYCLOAK_TOKEN_VALIDITY=60

search/nginx/nginx.conf

@@ -53,7 +53,7 @@ server {
 
   }
 
-    location /keycloak/auth/ {
+  location /keycloak/auth/ {
       proxy_pass http://backend_keycloak/keycloak/auth/;
   }
 

search/nginx/nginx_generic.conf

@@ -53,7 +53,7 @@ server {
 
   }
 
-    location /keycloak/auth/ {
+  location /keycloak/auth/ {
       proxy_pass http://backend_keycloak/keycloak/auth/;
   }