-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Adding "UserEnabled" and "CreatedAt" member to the json output of a User #2523
Adding "UserEnabled" and "CreatedAt" member to the json output of a User #2523
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather not add those items there, since these are also used to return the user object to the Bitwarden clients.
It is better to add them to the generated json output within admin.rs
instead.
Same goes for #2524, and in that case, i would probably suggest to merge them into one PR instead of two different ones.
I applied the changes. But I have one question, do we name those json members as in the |
Since the rest of the json is CamelCase i think it is best to keep that the same in this case. |
Here is the Camel Case ! |
Could you squash the commits into one commit? Else it will clutter the git-history a bit. git reset --soft HEAD~4
git commit -a
git push origin +add_disabled_member_to_json_user That should reset the commits to the starting point you were, and leave the changes you made. |
af525f2
to
97f0955
Compare
Squash done and thank you for the commands. |
a6dcca4
to
ab87802
Compare
ab87802
to
e699160
Compare
…ser in the admin/users and admin/users/<ID> web routes.
80a07a8
to
dbd95e0
Compare
The build fails because it's not formatted correctly. This repo already has the correct pre-commit config there, all you need to do after you installed it is run |
Adding "UserEnabled" and "CreatedAt" member to the json output of a User in the
admin/users
andadmin/users/<ID>
web routes.