From 1589328ae3a83b96c5245519ebdf8aabc2d97ca0 Mon Sep 17 00:00:00 2001
From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:48:46 +0100
Subject: [PATCH] #394: Fixed roles in access-config.json templates

---
 CHANGELOG.md                                                    | 2 ++
 infrastructure/itkdev/etc/confd/templates/access-config.tmpl    | 2 +-
 .../os2display/etc/confd/templates/access-config.tmpl           | 2 +-
 public/example-access-config.json                               | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 633620d8..bf413878 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#230](https://github.com/os2display/display-admin-client/pull/230)
+  - Fixed roles in access-config.json templates.
 - [#229](https://github.com/os2display/display-admin-client/pull/229)
   - Fixed post body of activation POST request.
 - [#228](https://github.com/os2display/display-admin-client/pull/228)
diff --git a/infrastructure/itkdev/etc/confd/templates/access-config.tmpl b/infrastructure/itkdev/etc/confd/templates/access-config.tmpl
index aef691a9..78aa301e 100644
--- a/infrastructure/itkdev/etc/confd/templates/access-config.tmpl
+++ b/infrastructure/itkdev/etc/confd/templates/access-config.tmpl
@@ -12,7 +12,7 @@
     "roles": ["ROLE_ADMIN"]
   },
   "users": {
-    "roles": ["ROLE_EXTERNAL_USER_ADMIN"]
+    "roles": ["ROLE_ADMIN", "ROLE_EXTERNAL_USER_ADMIN"]
   },
   "shared": {
     "roles": ["ROLE_ADMIN"]
diff --git a/infrastructure/os2display/etc/confd/templates/access-config.tmpl b/infrastructure/os2display/etc/confd/templates/access-config.tmpl
index aef691a9..78aa301e 100644
--- a/infrastructure/os2display/etc/confd/templates/access-config.tmpl
+++ b/infrastructure/os2display/etc/confd/templates/access-config.tmpl
@@ -12,7 +12,7 @@
     "roles": ["ROLE_ADMIN"]
   },
   "users": {
-    "roles": ["ROLE_EXTERNAL_USER_ADMIN"]
+    "roles": ["ROLE_ADMIN", "ROLE_EXTERNAL_USER_ADMIN"]
   },
   "shared": {
     "roles": ["ROLE_ADMIN"]
diff --git a/public/example-access-config.json b/public/example-access-config.json
index aef691a9..78aa301e 100644
--- a/public/example-access-config.json
+++ b/public/example-access-config.json
@@ -12,7 +12,7 @@
     "roles": ["ROLE_ADMIN"]
   },
   "users": {
-    "roles": ["ROLE_EXTERNAL_USER_ADMIN"]
+    "roles": ["ROLE_ADMIN", "ROLE_EXTERNAL_USER_ADMIN"]
   },
   "shared": {
     "roles": ["ROLE_ADMIN"]