Merge pull request #342 from fisuda/fix/trusted_application

Fix roles and permissions check for trusted application
ging · Aug 31, 2023 · 2ca26b2 · 2ca26b2
2 parents 09afbf2 + abdf414
commit 2ca26b2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/models/model_oauth_server.js b/models/model_oauth_server.js
@@ -639,13 +639,13 @@ function search_user_info(user_info, options) {
     promise_array.push(search_trusted_apps);
 
     // Insert search search roles promise
-    const search_roles = user_roles(user_info.id, user_info.app_id);
+    const search_roles = user_roles(user_info.id, req_app ? req_app : user_info.app_id);
     promise_array.push(search_roles);
 
     // Insert search permissions promise to generate decison
     if (action && resource) {
       const search_permissions = search_roles.then(function (roles) {
-        return user_permissions(roles.all, user_info.app_id, action, resource, options);
+        return user_permissions(roles.all, req_app ? req_app : user_info.app_id, action, resource, options);
       });
       promise_array.push(search_permissions);
     } else if (config_authzforce.enabled && authzforce) {