@@ -39,17 +39,18 @@ func NewRouter() *gin.Engine {
3939 })
4040 })
4141 }
42+ parentGroup := basicGroup .Group ("/:client" )
43+ parentGroup .Use (middleware .ValidateClient ())
4244
43- v1UnAuthed := r .Group (serviceURIPrefix + "/:client " )
45+ v1UnAuthed := parentGroup .Group (" " )
4446 {
45- v1UnAuthed .Use (validateClient ())
4647 v1UnAuthed .POST ("/login" , api .UserLogin )
4748 v1UnAuthed .POST ("/users" , api .Register )
4849 v1UnAuthed .PUT ("/users/activate" , api .Validate )
4950 }
50- v1Authed := r .Group (serviceURIPrefix + "/:client " )
51+ v1Authed := parentGroup .Group (" " )
5152 {
52- v1Authed .Use (validateClient (), middleware .AuthMiddleware ())
53+ v1Authed .Use (middleware .AuthMiddleware ())
5354 v1Authed .POST ("/logout" , api .UserLogout )
5455 }
5556 return r
@@ -67,15 +68,3 @@ var passwordStrengthValidator validator.Func = func(fl validator.FieldLevel) boo
6768
6869 return hasLetter && hasDigit && isValidLength
6970}
70-
71- func validateClient () gin.HandlerFunc {
72- return func (c * gin.Context ) {
73- client := c .Param ("client" )
74- if client != "merchant" && client != "customer" {
75- c .JSON (400 , gin.H {"error" : "Invalid client type" })
76- c .Abort ()
77- return
78- }
79- c .Next ()
80- }
81- }
0 commit comments