Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
immerda
Immerda Apps
iapi
Commits
7f950bdd
Commit
7f950bdd
authored
Sep 14, 2021
by
mh
Browse files
also show over_quota in the user overview
parent
bb7ad8bf
Pipeline
#8675
passed with stage
in 2 minutes and 38 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/iapi/managers/user_manager.rb
View file @
7f950bdd
...
...
@@ -426,6 +426,7 @@ class UserManager
locked_until:
parse_locked_until
(
u
.
locked_until
),
admin_locked:
u
.
admin_locked
,
locked:
u
.
locked?
,
over_quota:
u
.
over_quota
,
trust_changed:
u
.
trust_changed
,
mail_crypt_public_key:
(
if
u
.
mail_crypt_public_key
Digest
::
SHA256
.
hexdigest
(
u
.
mail_crypt_public_key
)
...
...
tests/replay/scripts/admin-lock.log
View file @
7f950bdd
...
...
@@ -37,7 +37,7 @@
:response:
:status: 200
:body:
- '{"result":"success","user":{"aliases":["fwd2@example.com","fwd3@example.com"],"fwd_to":[],"fwd_from":["fwd6@example.com"],"deleted_at":null,"email":"user2@example.com","domain":"example.com","login_method":"bcrypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage2.example.com","created_at":"%CREATED%","auth_failures":0,"locked_until":null,"admin_locked":"%UNLOCK_TOKEN%","locked":true,"trust_changed":null,"mail_crypt_public_key":"absent","mail_crypt_recovery_token":null,"recovery_email":false,"has_2fa":false,"ratelimit":null, "invite_token":null,"acl":"%SOME_ACL%"}}'
- '{"result":"success","user":{"aliases":["fwd2@example.com","fwd3@example.com"],"fwd_to":[],"fwd_from":["fwd6@example.com"],"deleted_at":null,"email":"user2@example.com","domain":"example.com","login_method":"bcrypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage2.example.com","created_at":"%CREATED%","auth_failures":0,"locked_until":null,"admin_locked":"%UNLOCK_TOKEN%","locked":true,"
over_quota":false,"
trust_changed":null,"mail_crypt_public_key":"absent","mail_crypt_recovery_token":null,"recovery_email":false,"has_2fa":false,"ratelimit":null, "invite_token":null,"acl":"%SOME_ACL%"}}'
---
:request:
:method: :get
...
...
tests/replay/scripts/encrypted-pw-change-and-recovery-gen.log
View file @
7f950bdd
...
...
@@ -133,7 +133,7 @@
:response:
:status: 200
:body:
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"change-pw-test@private.example.com","domain":"private.example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAD%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":true,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"change-pw-test@private.example.com","domain":"private.example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAD%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"
over_quota":false,"
trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":true,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
---
:request:
:method: :post
...
...
tests/replay/scripts/recovery.log
View file @
7f950bdd
...
...
@@ -68,7 +68,7 @@
:response:
:status: 200
:body:
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"recovery_test@example.com","domain":"example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LASTLOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAT%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":false,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"recovery_test@example.com","domain":"example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LASTLOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAT%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"
over_quota":false,"
trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":false,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
---
:request:
:method: :post
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment