From 99fb860bd95d7c04672553be05bc1e883fbb1d72 Mon Sep 17 00:00:00 2001 From: Aytac Ozkan Date: Tue, 28 Jul 2020 16:43:06 +0200 Subject: [PATCH 1/3] ** --- search/.env | 2 +- search/.env_generic | 2 +- search/nginx/nginx.conf | 2 +- search/nginx/nginx_generic.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/search/.env b/search/.env index 566ee6e..efb0bf8 100644 --- a/search/.env +++ b/search/.env @@ -2,7 +2,7 @@ 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 diff --git a/search/.env_generic b/search/.env_generic index 566ee6e..efb0bf8 100644 --- a/search/.env_generic +++ b/search/.env_generic @@ -2,7 +2,7 @@ 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 diff --git a/search/nginx/nginx.conf b/search/nginx/nginx.conf index c965d9a..d12d32c 100644 --- a/search/nginx/nginx.conf +++ b/search/nginx/nginx.conf @@ -53,7 +53,7 @@ server { } - location /keycloak/auth/ { + location /keycloak/auth/ { proxy_pass http://backend_keycloak/keycloak/auth/; } diff --git a/search/nginx/nginx_generic.conf b/search/nginx/nginx_generic.conf index c965d9a..d12d32c 100644 --- a/search/nginx/nginx_generic.conf +++ b/search/nginx/nginx_generic.conf @@ -53,7 +53,7 @@ server { } - location /keycloak/auth/ { + location /keycloak/auth/ { proxy_pass http://backend_keycloak/keycloak/auth/; } From aa1640392fe2f6e1e66e206d576695be70d28234 Mon Sep 17 00:00:00 2001 From: Aytac Ozkan Date: Fri, 31 Jul 2020 14:45:36 +0200 Subject: [PATCH 2/3] user_search_his table kc_id bug fixing* --- data.sql | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/data.sql b/data.sql index 9743a74..b7d431e 100644 --- a/data.sql +++ b/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 ); From fb8134e4b814568ee89ab0597d77be205e3ef1f6 Mon Sep 17 00:00:00 2001 From: "Benjamin.Jaillet" Date: Mon, 3 Aug 2020 14:27:50 +0200 Subject: [PATCH 3/3] added refresh token lifetime and fixed an issue with build.sh --- build.sh | 2 +- search/.env_generic | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index b5f17f5..2dd8407 100755 --- a/build.sh +++ b/build.sh @@ -27,7 +27,7 @@ Usage(){ exit } -while [[ $# != 0 ]];do +while [ $# != 0 ];do opt="$1" case $opt in -k) diff --git a/search/.env_generic b/search/.env_generic index efb0bf8..6679f75 100644 --- a/search/.env_generic +++ b/search/.env_generic @@ -6,4 +6,5 @@ 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 \ No newline at end of file +REACT_APP_PORT=3001 +REACT_KEYCLOAK_TOKEN_VALIDITY=60 \ No newline at end of file