From 886579a0b39ead9fec922150e20a5e464ff2886d Mon Sep 17 00:00:00 2001
From: Eneko <eneko@eneko.ovh>
Date: Thu, 29 Apr 2021 13:12:05 +0200
Subject: [PATCH] Updated dependencies. OAuth server from http://localhost to
 https://okupamicoche-keycloak

---
 build.gradle.kts                                         | 4 ++--
 docker/synapse/homeserver.yaml                           | 6 ++++--
 src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt | 1 +
 src/main/kotlin/eu/fosil/okupamicoche/entities/User.kt   | 6 ++----
 src/main/resources/application.yml                       | 5 ++++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3372d47..762d9f7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("org.springframework.boot") version "2.4.4"
+	id("org.springframework.boot") version "2.4.5"
 	id("io.spring.dependency-management") version "1.0.11.RELEASE"
 	war
 	kotlin("jvm") version "1.4.31"
@@ -28,7 +28,7 @@ dependencies {
 	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	implementation("io.github.microutils:kotlin-logging-jvm:2.0.6")
 	// https://mvnrepository.com/artifact/net.folivo/matrix-spring-boot-bot
-	implementation ("net.folivo:matrix-spring-boot-bot:0.4.6")
+	implementation ("net.folivo:matrix-spring-boot-bot:0.4.8")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
 	runtimeOnly("com.h2database:h2")
 	runtimeOnly("io.r2dbc:r2dbc-h2")
diff --git a/docker/synapse/homeserver.yaml b/docker/synapse/homeserver.yaml
index 84ee675..13cc246 100644
--- a/docker/synapse/homeserver.yaml
+++ b/docker/synapse/homeserver.yaml
@@ -26,8 +26,10 @@ oidc_providers:
   - idp_id: keycloak
     idp_name: Keycloak
     issuer: "https://okupamicoche-keycloak:8443/auth/realms/okupamicoche"
-    client_id: "synapse"
-    client_secret: "2d2b51cf-09ab-44a3-97d8-b7c3c5289c87"
+    client_id: "okupamicoche-frontend-angular"
+    client_secret: "PUBLIC-CLIENT-WITH-NO-PASSWORD"
+#    client_id: "synapse"
+#    client_secret: "2d2b51cf-09ab-44a3-97d8-b7c3c5289c87"
     scopes: [ "openid", "profile" ]
     user_mapping_provider:
       config:
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt b/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt
index 4f78527..0fe2291 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt
@@ -8,6 +8,7 @@ import javax.persistence.*
 typealias TravelId = Long
 
 @Entity
+@Table
 class Travel(
         @Id @GeneratedValue var id: TravelId? = null,
         @ManyToOne
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/entities/User.kt b/src/main/kotlin/eu/fosil/okupamicoche/entities/User.kt
index 411a819..aa6f876 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/entities/User.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/entities/User.kt
@@ -2,14 +2,12 @@ package eu.fosil.okupamicoche.entities
 
 import org.hibernate.annotations.LazyCollection
 import org.hibernate.annotations.LazyCollectionOption
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.ManyToMany
-import javax.persistence.OneToMany
+import javax.persistence.*
 
 typealias UserId = String
 
 @Entity
+@Table
 class User(
     @Id var id: UserId,
     var username: String,
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a8a601f..9edfd24 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,13 +13,16 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          issuer-uri: http://localhost:8080/auth/realms/okupamicoche
+          issuer-uri: https://okupamicoche-keycloak:8443/auth/realms/okupamicoche
   jackson:
     serialization:
       write-dates-as-timestamps: false
 
 logging:
   level:
+    org:
+      springframework:
+        security: DEBUG
     eu.fosil.okupamicoche: DEBUG
 
 matrix: