Merge branch 'master' of github.com:indigo-dc/oidc-agent

indigo-dc · Nov 19, 2018 · cfefc0e · cfefc0e
2 parents 4f493c7 + 05e7de0
commit cfefc0e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/utils/json.c b/src/utils/json.c
@@ -458,6 +458,15 @@ cJSON* mergeJSONObjects(const cJSON* j1, const cJSON* j2) {
                     cJSON_GetArraySize(el1) == 0)) {
           cJSON* cpy = cJSON_Duplicate(el, cJSON_True);
           cJSON_ReplaceItemViaPointer(json, el1, cpy);
+        } else if (el1->type == cJSON_String && el->type == cJSON_String &&
+                   strequal(el1->valuestring, el->valuestring)) {
+          pass;
+        } else if (strequal("scope", key)) {
+          // for scope the the value from j1 is used
+          // despite the value of j2.
+          // The acquired scopes might be different from the requested
+          // scopes, but that's fine. Also the ordering might change
+          pass;
         } else {
           oidc_errno = OIDC_EJSONMERGE;
           char* val1 = jsonToString(el1);