From 0ea20c387a8df50f87579eca739a86b96cc80405 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 6 Feb 2025 11:46:49 +0100
Subject: [PATCH] Updated the compose file
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.docker/docker-compose.yml | 10 ++++++++--
dbrepo-gateway-service/dbrepo.conf | 2 +-
.../migration/schema_1.6.2-to-1.6.3.sql | 12 ++++++++++++
dbrepo-ui/components/ResourceStatus.vue | 11 +----------
4 files changed, 22 insertions(+), 13 deletions(-)
create mode 100644 dbrepo-metadata-db/migration/schema_1.6.2-to-1.6.3.sql
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index e33669521b..378ce1ca2a 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -78,7 +78,7 @@ services:
restart: "no"
container_name: dbrepo-auth-service
hostname: auth-service
- image: bitnami/keycloak:26.0.0-debian-12-r1
+ image: bitnami/keycloak:26.0.4-debian-12-r0
volumes:
- ./config/import-realms.sh:/docker-entrypoint-initdb.d/import-realms.sh
- ./config/master-realm.json:/opt/keycloak/data/import/master-realm.json
@@ -87,6 +87,7 @@ services:
ports:
- "8080:8080"
environment:
+ KEYCLOAK_ENABLE_HEALTH_ENDPOINTS: "true"
KEYCLOAK_ENABLE_HTTPS: "false"
KEYCLOAK_ENABLE_STATISTICS: "true"
KEYCLOAK_DATABASE_HOST: "auth-db"
@@ -305,10 +306,15 @@ services:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}"
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
+ NUXT_OIDC_PROVIDERS_KEYCLOAK_AUTHORIZATION_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/auth"
+ NUXT_OIDC_PROVIDERS_KEYCLOAK_BASE_URL: "${BASE_URL:-http://localhost}/realms/dbrepo"
NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_ID: "${AUTH_SERVICE_CLIENT:-dbrepo-client}"
NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_SECRET: "${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}"
- NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI: "${BASE_URL:-http://localhost}/auth/keycloak/callback"
NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_REDIRECT_URI: "${BASE_URL:-http://localhost}"
+ NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/logout"
+ NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI: "${BASE_URL:-http://localhost}/auth/keycloak/callback"
+ NUXT_OIDC_PROVIDERS_KEYCLOAK_TOKEN_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/token"
+ NUXT_OIDC_PROVIDERS_KEYCLOAK_USER_INFO_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/userinfo"
depends_on:
dbrepo-search-service:
condition: service_healthy
diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf
index 68778de757..516be216f0 100644
--- a/dbrepo-gateway-service/dbrepo.conf
+++ b/dbrepo-gateway-service/dbrepo.conf
@@ -41,7 +41,7 @@ upstream dashboard-service {
}
upstream auth-service {
- server auth-service:8080;
+ server auth-service:8443;
}
server {
diff --git a/dbrepo-metadata-db/migration/schema_1.6.2-to-1.6.3.sql b/dbrepo-metadata-db/migration/schema_1.6.2-to-1.6.3.sql
new file mode 100644
index 0000000000..0b841231ac
--- /dev/null
+++ b/dbrepo-metadata-db/migration/schema_1.6.2-to-1.6.3.sql
@@ -0,0 +1,12 @@
+ALTER TABLE mdb_users
+ DROP SYSTEM VERSIONING;
+BEGIN;
+ALTER TABLE mdb_users
+ ADD COLUMN keycloak_id character varying(36) NOT NULL;
+UPDATE mdb_users
+SET keycloak_id = id;
+ALTER TABLE mdb_users
+ ADD CONSTRAINT UNIQUE (keycloak_id);
+COMMIT;
+ALTER TABLE mdb_users
+ ADD SYSTEM VERSIONING;
\ No newline at end of file
diff --git a/dbrepo-ui/components/ResourceStatus.vue b/dbrepo-ui/components/ResourceStatus.vue
index 6db6d25385..017908b3af 100644
--- a/dbrepo-ui/components/ResourceStatus.vue
+++ b/dbrepo-ui/components/ResourceStatus.vue
@@ -5,7 +5,7 @@
v-if="!inline"
:size="size"
:color="color"
- :variant="chipVariant">
+ variant="outlined">
{{ status }}
</v-chip>
<span
@@ -39,9 +39,6 @@ export default {
if (!this.resource) {
return null
}
- if (this.hasIdentifier) {
- return 'pid'
- }
if (!this.resource.is_public && !this.resource.is_schema_public) {
return 'draft'
} else if(!this.resource.is_public && this.resource.is_schema_public) {
@@ -60,12 +57,6 @@ export default {
hasIdentifier () {
return this.resource.identifiers?.length > 0
},
- chipVariant () {
- if (this.hasIdentifier) {
- return 'tonal'
- }
- return 'outlined'
- },
color () {
if (this.hasIdentifier) {
return 'info'
--
GitLab