Skip to content

Makes sure we don't duplicate user ACL's keys#2651

Merged
flovilmart merged 4 commits into
masterfrom
fix-#2246
Sep 9, 2016
Merged

Makes sure we don't duplicate user ACL's keys#2651
flovilmart merged 4 commits into
masterfrom
fix-#2246

Conversation

@flovilmart

@flovilmart flovilmart commented Sep 4, 2016

Copy link
Copy Markdown
Contributor

When using 'include' the userACL would see it's length grow for each subquery.

This fix prevents this behaviour by concatenating the results for the auth.getUserAndRoleACL to the current findOptions.acl.

When the userACL length is > 1 in DatabaseController we also consider it invalid, therefore rendering the query wrong.

Fixes #2246

@flovilmart flovilmart changed the title Fix #2246 Makes sure we don't duplicate user ACL's keys Sep 4, 2016
@codecov-io

codecov-io commented Sep 4, 2016

Copy link
Copy Markdown

Current coverage is 92.10% (diff: 100%)

Merging #2651 into master will decrease coverage by <.01%

@@             master      #2651   diff @@
==========================================
  Files           100        100          
  Lines         12282      12288     +6   
  Methods        1522       1522          
  Messages          0          0          
  Branches       2020       2020          
==========================================
+ Hits          11313      11318     +5   
- Misses          969        970     +1   
  Partials          0          0          

Powered by Codecov. Last update 5676a6f...adbb530

@ghost

ghost commented Sep 4, 2016

Copy link
Copy Markdown

@flovilmart updated the pull request - view changes

@flovilmart flovilmart added this to the 2.2.19 milestone Sep 4, 2016
@ghost

ghost commented Sep 4, 2016

Copy link
Copy Markdown

@flovilmart updated the pull request - view changes

@flovilmart

Copy link
Copy Markdown
Contributor Author

Fixes #2431

This issue was caused by the mutation roles array, as we don't mutate anymore the issue will be fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CLP assertion fails when class is included in a query

3 participants