Skip to content

Commit c5b9d19

Browse files
committed
fix(authorization): existing access control data couldn't be read
1 parent e3fb1da commit c5b9d19

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

authorization/src/main/kotlin/org/modelix/authorization/permissions/AccessControlData.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ fun IAccessControlPersistence.recordKnownRoles(roles: List<String>) {
110110
}
111111

112112
class FileSystemAccessControlPersistence(val file: File) : IAccessControlPersistence {
113-
113+
private val json = Json { ignoreUnknownKeys = true }
114114
private var data: AccessControlData = if (file.exists()) {
115-
Json.decodeFromString<AccessControlData>(file.readText())
115+
json.decodeFromString<AccessControlData>(file.readText())
116116
} else {
117117
AccessControlData()
118118
}.withLegacyRoles()
@@ -131,7 +131,7 @@ class FileSystemAccessControlPersistence(val file: File) : IAccessControlPersist
131131
}
132132

133133
private fun writeFile() {
134-
file.writeText(Json.encodeToString(data))
134+
file.writeText(json.encodeToString(data))
135135
}
136136
}
137137

model-server/src/main/kotlin/org/modelix/model/server/DBAccessControlPersistence.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.modelix.model.server.store.IGenericStoreClient
88
import org.modelix.model.server.store.RequiresTransaction
99

1010
class DBAccessControlPersistence<E>(val store: IGenericStoreClient<E>, val key: E) : IAccessControlPersistence {
11-
private val json = Json { ignoreUnknownKeys }
11+
private val json = Json { ignoreUnknownKeys = true }
1212
override fun read(): AccessControlData {
1313
@OptIn(RequiresTransaction::class)
1414
return store.runReadTransaction {

0 commit comments

Comments
 (0)