fix loading jsonc

sources/orthanc_auth_service/permissions.json

@@ -1,18 +1,7 @@
+// "SPDX-FileCopyrightText: 2022 - 2023 Orthanc Team SRL <[email protected]>"
+// SPDX-License-Identifier: CC0-1.0
 {
   "roles" : {
-<<<<<<< HEAD
-    "admin": {
-      "permissions": ["all"],
-      "authorized_labels": ["*"]
-    },
-    "doctor": {
-      "permissions":["view", "download", "share", "send"],
-      "authorized_labels": ["*"]
-    },
-    "students": {
-      "permissions":["view", "download"],
-      "authorized_labels": ["students"]
-=======
     "admin-role": {
       "permissions": ["all"],
       "authorized_labels": ["*"]
@@ -24,7 +13,6 @@
     "external-role": {
       "permissions":["view", "download"],
       "authorized_labels": ["external"]
->>>>>>> labels-perm
     }
   }
 }

sources/orthanc_auth_service/shares/keycloak.py

@@ -6,7 +6,7 @@
 import logging
 import requests
 import jwt
-import json
+import jsonc
 from typing import Dict, Any, List, Tuple
 from .models import *
 from .utils.utils import get_secret_or_die, is_secret_defined
@@ -148,7 +148,7 @@ def _get_keycloak_public_key(keycloak_uri: str) -> str:
 
 def _get_config_from_file(file_path: str):
     with open(file_path) as f:
-        data = json.load(f)
+        data = jsonc.load(f)
 
     roles = data.get('roles')
 

sources/requirements.txt

@@ -9,6 +9,7 @@ pytz==2022.1
 python-dateutil==2.8.2
 uvicorn[standard]==0.18.2
 pytest
+json-with-comments==1.2.1
 httpx
 # TODO: standardize usage of https or requests
 requests