happyDomain/happyDomain
happyDomain
/
happyDomain
1
0
Fork 0
Code Issues 1 Pull Requests 4 Releases Activity

admin: Fix zones display without domain preliminary search
continuous-integration/drone/push Build is failing Details

This commit is contained in:
nemunaire 2021-01-17 09:17:56 +01:00
parent db15768ddd
commit 84cf2124ef
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
admin/db-zone.go
View File

@ -56,8 +56,8 @@ func init() {
router.PUT("/api/users/:userid/domains/:domain/zones/:zoneid", api.ApiHandler(userHandler(zoneHandler(updateZone))))
router.DELETE("/api/users/:userid/domains/:domain/zones/:zoneid", api.ApiHandler(deleteZone))
router.GET("/api/zones/:zoneid", api.ApiHandler(userHandler(zoneHandler(getZone))))
router.PUT("/api/zones/:zoneid", api.ApiHandler(userHandler(zoneHandler(updateZone))))
router.GET("/api/zones/:zoneid", api.ApiHandler(zoneWoUserHandler(getZone)))
router.PUT("/api/zones/:zoneid", api.ApiHandler(zoneWoUserHandler(updateZone)))
router.DELETE("/api/zones/:zoneid", api.ApiHandler(deleteZone))
router.GET("/api/users/:userid/domains/:domain/zones/:zoneid/*serviceid", api.ApiHandler(userHandler(zoneHandler(getZoneService))))
@ -89,6 +89,22 @@ func newUserDomainZone(_ *config.Options, domain *happydns.Domain, _ httprouter.
return api.NewAPIResponse(uz, storage.MainStore.CreateZone(uz))
}
func zoneWoUserHandler(f func(*config.Options, *happydns.Domain, *happydns.Zone, httprouter.Params, io.Reader) api.Response) func(*config.Options, httprouter.Params, io.Reader) api.Response {
return func(opts *config.Options, ps httprouter.Params, body io.Reader) api.Response {
zoneid, err := strconv.ParseInt(ps.ByName("zoneid"), 10, 64)
if err != nil {
return api.NewAPIErrorResponse(http.StatusNotFound, err)
}
zone, err := storage.MainStore.GetZone(zoneid)
if err != nil {
return api.NewAPIErrorResponse(http.StatusNotFound, err)
} else {
return f(opts, nil, zone, ps, body)
}
}
}
func zoneHandler(f func(*config.Options, *happydns.Domain, *happydns.Zone, httprouter.Params, io.Reader) api.Response) func(*config.Options, *happydns.User, httprouter.Params, io.Reader) api.Response {
return func(opts *config.Options, user *happydns.User, ps httprouter.Params, body io.Reader) api.Response {
return domainHandler(func(opts *config.Options, domain *happydns.Domain, ps httprouter.Params, body io.Reader) api.Response {