mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-10 15:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

lint and refactor

Browse source
This commit is contained in:
santhoshivan23 2023-06-22 21:40:11 +05:30
parent 5346ce735a
commit 04ca62aba1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/admin_test.go
View file

@ -281,7 +281,7 @@ func TestAdminListRegistrationTokens(t *testing.T) {
if tc.isValidSpecified { if tc.isValidSpecified {
path = fmt.Sprintf("/_dendrite/admin/registrationTokens?valid=%v", tc.valid) path = fmt.Sprintf("/_dendrite/admin/registrationTokens?valid=%v", tc.valid)
} else { } else {
path = fmt.Sprintf("/_dendrite/admin/registrationTokens") path = "/_dendrite/admin/registrationTokens"
} }
req := test.NewRequest(t, http.MethodGet, path) req := test.NewRequest(t, http.MethodGet, path)
if tc.withHeader { if tc.withHeader {

4
clientapi/routing/admin.go
View file

@ -230,7 +230,7 @@ func AdminUpdateRegistrationToken(req *http.Request, cfg *config.ClientAPI, user
usesAllowed, ok := request["uses_allowed"] usesAllowed, ok := request["uses_allowed"]
if ok { if ok {
// Only add usesAllowed to newAtrributes if it is present and valid // Only add usesAllowed to newAtrributes if it is present and valid
if !(usesAllowed == nil || *usesAllowed >= 0) { if usesAllowed != nil && *usesAllowed < 0 {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.BadJSON("uses_allowed must be a non-negative integer or null"), JSON: spec.BadJSON("uses_allowed must be a non-negative integer or null"),
@ -241,7 +241,7 @@ func AdminUpdateRegistrationToken(req *http.Request, cfg *config.ClientAPI, user
expiryTime, ok := request["expiry_time"] expiryTime, ok := request["expiry_time"]
if ok { if ok {
// Only add expiryTime to newAtrributes if it is present and valid // Only add expiryTime to newAtrributes if it is present and valid
if !(expiryTime == nil || *expiryTime > time.Now().UnixNano()/int64(time.Millisecond)) { if expiryTime != nil && spec.Timestamp(*expiryTime).Time().Before(time.Now()) {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.BadJSON("expiry_time must not be in the past"), JSON: spec.BadJSON("expiry_time must not be in the past"),