Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow admin users to create or modify users without a shared secret #6495

Merged
merged 1 commit into from
Jan 9, 2020
Merged

Allow admin users to create or modify users without a shared secret #6495

merged 1 commit into from
Jan 9, 2020

Conversation

awesome-manuel
Copy link
Contributor

This implements #5741, again, since I can't reopen #5742.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off
  • Code style is correct (run the linters)

@richvdh richvdh requested review from a team December 20, 2019 12:52
@turt2live turt2live removed the request for review from a team December 24, 2019 02:28
richvdh
richvdh suggested changes Jan 2, 2020
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

this looks generally great! A few nitpicks.

docs/admin_api/user_admin_api.rst Show resolved Hide resolved
tests/rest/admin/test_admin.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/__init__.py Outdated Show resolved Hide resolved
synapse/rest/admin/users.py Show resolved Hide resolved
synapse/rest/admin/users.py Outdated Show resolved Hide resolved
@awesome-manuel awesome-manuel requested a review from richvdh January 3, 2020 08:26
@richvdh richvdh removed their request for review January 3, 2020 11:59
@awesome-manuel awesome-manuel requested a review from richvdh January 3, 2020 16:06
@awesome-manuel
Copy link
Contributor Author

@richvdh if you agree to this version, I would squash it and rebase onto the develop branch.

richvdh
richvdh reviewed Jan 6, 2020
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

It looks generally plausible, but please could you merge develop in to fix the conflict (which I hope will also fix the CI)?

@richvdh richvdh self-requested a review January 8, 2020 09:52
richvdh
richvdh suggested changes Jan 8, 2020
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

now the tests are failing :/

richvdh
richvdh approved these changes Jan 9, 2020
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

looks good! Thank you!

@richvdh richvdh merged commit d2906fe into matrix-org:develop Jan 9, 2020
@richvdh richvdh mentioned this pull request Jan 9, 2020
Closed
@awesome-manuel awesome-manuel deleted the admin_registration branch February 10, 2020 11:48
@richvdh richvdh mentioned this pull request Jun 5, 2020
Merged
babolivier pushed a commit that referenced this pull request Sep 1, 2021
@anoadragon453
Allow admin users to create or modify users without a shared secret (#…
35d1ec2 
…6495)

* commit 'd2906fe66':
  Allow admin users to create or modify users without a shared secret (#6495)
  Fixup changelog
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@richvdh richvdh richvdh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@awesome-manuel @richvdh