Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only show team names of own organization #3928

Merged
merged 4 commits into from
Mar 25, 2019
Merged

only show team names of own organization #3928

merged 4 commits into from
Mar 25, 2019

Conversation

fm3
Copy link
Member

@fm3 fm3 commented Mar 20, 2019

Steps to test:

  • create second organization, set a dataset to public
  • when logged in as someone from the non-owning organization, allowed teams should be hidden
  • also fixed: when showing “users with access” list in this case, no error is thrown. list should be empty.

Issues:


@fm3 fm3 self-assigned this Mar 20, 2019
@fm3 fm3 requested a review from youri-k March 20, 2019 21:18
requestingUserTeamManagerMemberships: Option[List[TeamMembership]] = None): Fox[JsObject] = {
implicit val ctx = GlobalAccessContext
requestingUserTeamManagerMemberships: Option[List[TeamMembership]] = None)(
implicit ctx: DBAccessContext): Fox[JsObject] =
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick comment to reviewer: Changing the AccessContext here to be more restrictive is not actually the fix (since the allowed teams db request has no AccessQuery), just something I noticed on the way.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably it is not possible, but can't we just add an access query for the allowed teams request?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that that would be nice, however, the access query mechanism is not prepared for queries with joins in them. In those cases we filter/assert access in the scala code atm. Changing that would require changing all the access queries, unfortunately

@fm3 fm3 requested a review from jstriebel March 21, 2019 08:11
Copy link
Contributor

@jstriebel jstriebel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@fm3 fm3 merged commit 3829ec1 into master Mar 25, 2019
hotzenklotz added a commit that referenced this pull request Mar 25, 2019
…ture-highlight

* 'master' of github.com:scalableminds/webknossos:
  Hide unreported datasets (#3883)
  Update puppeteer and refresh screenshots (#3914)
  only show team names of own organization (#3928)
  Enable merger mode in skeleton and hybrid tracings (#3619)
  allow uploading nml for public dataset of different orga (#3929)
  Always make wheel listeners not passive to allow preventDefault (#3939)
  Enhance tree search functionallity (#3878)
  add webknossos-connect to setup (#3913)
  Update README.md (#3923)
  Add shortcut to maximize golden layout panes (#3927)
  Perform bucket picking in web workers and other performance optimizations (#3902)
  remove alt text for abstract brain loading image (#3930)
  updated documentation front page (#3917)
@normanrz normanrz deleted the dont-leak-team-names branch August 12, 2019 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allowed teams of other orgs
2 participants