From 82fe7c7ae3a8537aa8568b9461588d2b27ee9925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Mon, 27 Oct 2025 12:24:07 +0100
Subject: [PATCH] Bump JSON RPC Api to 8.4

---
 nymea.pro           |  2 +-
 tests/auto/api.json | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/nymea.pro b/nymea.pro
index 066cdcab..37e28aa1 100644
--- a/nymea.pro
+++ b/nymea.pro
@@ -11,7 +11,7 @@ isEmpty(NYMEA_VERSION) {
 
 # define protocol versions
 JSON_PROTOCOL_VERSION_MAJOR=8
-JSON_PROTOCOL_VERSION_MINOR=3
+JSON_PROTOCOL_VERSION_MINOR=4
 JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}"
 LIBNYMEA_API_VERSION_MAJOR=9
 LIBNYMEA_API_VERSION_MINOR=0
diff --git a/tests/auto/api.json b/tests/auto/api.json
index ad82c2fb..acebcdae 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -1,4 +1,4 @@
-8.3
+8.4
 {
     "enums": {
         "BasicType": [
@@ -157,6 +157,7 @@
             "PermissionScopeNone",
             "PermissionScopeControlThings",
             "PermissionScopeConfigureThings",
+            "PermissionScopeAccessAllThings",
             "PermissionScopeExecuteRules",
             "PermissionScopeConfigureRules",
             "PermissionScopeAdmin"
@@ -365,7 +366,8 @@
             "UserErrorDuplicateUserId",
             "UserErrorBadPassword",
             "UserErrorTokenNotFound",
-            "UserErrorPermissionDenied"
+            "UserErrorPermissionDenied",
+            "UserErrorInconsistantScopes"
         ],
         "ValueOperator": [
             "ValueOperatorEquals",
@@ -897,10 +899,10 @@
             },
             "permissionScope": "PermissionScopeNone",
             "returns": {
-                "items": [
+                "o:displayMessage": "String",
+                "o:items": [
                     "$ref:BrowserItem"
                 ],
-                "o:displayMessage": "String",
                 "thingError": "$ref:ThingError"
             }
         },
@@ -1970,8 +1972,11 @@
             }
         },
         "Users.CreateUser": {
-            "description": "Create a new user in the API with the given username and password. Use scopes to define the permissions for the new user. If no scopes are given, this user will be an admin user. Call Authenticate after this to obtain a device token for this user.",
+            "description": "Create a new user in the API with the given username and password. Use scopes to define the permissions for the new user. If the user has not the permission \"PermissionScopeAccessAllThings\", the list of things this user has access to can be defined in the \"allowedThingIds\" property. If no scopes are given, this user will be an admin user. Call Authenticate after this to obtain a device token for this user.",
             "params": {
+                "o:allowedThingIds": [
+                    "Uuid"
+                ],
                 "o:displayName": "String",
                 "o:email": "String",
                 "o:scopes": "$ref:PermissionScopes",
@@ -2045,8 +2050,11 @@
             }
         },
         "Users.SetUserScopes": {
-            "description": "Set the permissions (scopes) for a given user.",
+            "description": "Set the permissions (scopes) for a given user. If the user has not the permission \"PermissionScopeAccessAllThings\" the list of thing IDs this user has access to can be defined in the \"allowedThingIds\" property.",
             "params": {
+                "o:allowedThingIds": [
+                    "Uuid"
+                ],
                 "scopes": "$ref:PermissionScopes",
                 "username": "String"
             },