@@ -85,11 +85,11 @@ func applyRoutes(r chi.Router) chi.Router {
85
85
r .With (middleware .EnforceSetup (true )).Route ("/" , func (r chi.Router ) {
86
86
// Get yourself, requires a login but no other permissions
87
87
r .With (middleware .Enforce ("" )).
88
- Get ("/{userID:(?:me) }" , handler .GetUser ())
88
+ Get ("/{userID:me }" , handler .GetUser ())
89
89
90
90
// Update yourself, requires a login but no other permissions
91
91
r .With (middleware .Enforce ("" ), middleware .EnforceRequestSchema (schema .UpdateUser ())).
92
- Put ("/{userID:(?:me) }" , handler .UpdateUser ())
92
+ Put ("/{userID:me }" , handler .UpdateUser ())
93
93
94
94
r .With (middleware .Enforce (user .CapabilityUsersManage )).Route ("/" , func (r chi.Router ) {
95
95
// List
@@ -98,19 +98,19 @@ func applyRoutes(r chi.Router) chi.Router {
98
98
Get ("/" , handler .GetUsers ())
99
99
100
100
// Specific Item
101
- r .Get ("/{userID:(?: [0-9]+) }" , handler .GetUser ())
102
- r .Delete ("/{userID:(?: [0-9]+|me)}" , handler .DeleteUser ())
101
+ r .Get ("/{userID:[0-9]+}" , handler .GetUser ())
102
+ r .Delete ("/{userID:([0-9]+|me)}" , handler .DeleteUser ())
103
103
104
104
// Update another user
105
105
r .With (middleware .EnforceRequestSchema (schema .UpdateUser ())).
106
- Put ("/{userID:(?: [0-9]+) }" , handler .UpdateUser ())
106
+ Put ("/{userID:[0-9]+}" , handler .UpdateUser ())
107
107
})
108
108
109
109
// Auth - sets passwords
110
110
r .With (middleware .Enforce ("" ), middleware .EnforceRequestSchema (schema .SetAuth ())).
111
- Post ("/{userID:(?:me) }/auth" , handler .SetAuth ())
111
+ Post ("/{userID:me }/auth" , handler .SetAuth ())
112
112
r .With (middleware .Enforce (user .CapabilityUsersManage ), middleware .EnforceRequestSchema (schema .SetAuth ())).
113
- Post ("/{userID:(?: [0-9]+) }/auth" , handler .SetAuth ())
113
+ Post ("/{userID:[0-9]+}/auth" , handler .SetAuth ())
114
114
})
115
115
})
116
116
@@ -200,6 +200,12 @@ func applyRoutes(r chi.Router) chi.Router {
200
200
r .Route ("/{caID:[0-9]+}" , func (r chi.Router ) {
201
201
r .With (middleware .Enforce (user .CapabilityCertificateAuthoritiesView )).
202
202
Get ("/" , handler .GetCertificateAuthority ())
203
+
204
+ r .With (middleware .EnforceRequestSchema (schema .UpdateCertificateAuthority ())).
205
+ Put ("/" , handler .UpdateCertificateAuthority ())
206
+ r .With (middleware .Enforce (user .CapabilityCertificateAuthoritiesManage )).
207
+ Delete ("/" , handler .DeleteCertificateAuthority ())
208
+
203
209
r .With (middleware .Enforce (user .CapabilityCertificateAuthoritiesManage )).Route ("/" , func (r chi.Router ) {
204
210
r .Delete ("/{caID:[0-9]+}" , handler .DeleteCertificateAuthority ())
205
211
r .With (middleware .EnforceRequestSchema (schema .UpdateCertificateAuthority ())).
0 commit comments