Add folder update support and ClientData field.

[src/xds/xds-server.git] / lib / apiv1 / apiv1.go

diff --git a/lib/apiv1/apiv1.go b/lib/apiv1/apiv1.go
index c94849d..fffed2d 100644 (file)
--- a/lib/apiv1/apiv1.go
+++ b/lib/apiv1/apiv1.go
@@ -4,6 +4,7 @@ import (
        "github.com/Sirupsen/logrus"
        "github.com/gin-gonic/gin"
 
+       "github.com/iotbzh/xds-server/lib/crosssdk"
        "github.com/iotbzh/xds-server/lib/model"
        "github.com/iotbzh/xds-server/lib/session"
        "github.com/iotbzh/xds-server/lib/xdsconfig"
@@ -15,18 +16,20 @@ type APIService struct {
        apiRouter *gin.RouterGroup
        sessions  *session.Sessions
        cfg       *xdsconfig.Config
-       mfolder   *model.Folder
+       mfolders  *model.Folders
+       sdks      *crosssdk.SDKs
        log       *logrus.Logger
 }
 
 // New creates a new instance of API service
-func New(sess *session.Sessions, cfg *xdsconfig.Config, mfolder *model.Folder, r *gin.Engine) *APIService {
+func New(r *gin.Engine, sess *session.Sessions, cfg *xdsconfig.Config, mfolders *model.Folders, sdks *crosssdk.SDKs) *APIService {
        s := &APIService{
                router:    r,
                sessions:  sess,
                apiRouter: r.Group("/api/v1"),
                cfg:       cfg,
-               mfolder:   mfolder,
+               mfolders:  mfolders,
+               sdks:      sdks,
                log:       cfg.Log,
        }
 
@@ -36,17 +39,25 @@ func New(sess *session.Sessions, cfg *xdsconfig.Config, mfolder *model.Folder, r
        s.apiRouter.POST("/config", s.setConfig)
 
        s.apiRouter.GET("/folders", s.getFolders)
-       s.apiRouter.GET("/folder/:id", s.getFolder)
-       s.apiRouter.POST("/folder", s.addFolder)
-       s.apiRouter.DELETE("/folder/:id", s.delFolder)
+       s.apiRouter.GET("/folders/:id", s.getFolder)
+       s.apiRouter.PUT("/folders/:id", s.updateFolder)
+       s.apiRouter.POST("/folders", s.addFolder)
+       s.apiRouter.POST("/folders/sync/:id", s.syncFolder)
+       s.apiRouter.DELETE("/folders/:id", s.delFolder)
+
+       s.apiRouter.GET("/sdks", s.getSdks)
+       s.apiRouter.GET("/sdks/:id", s.getSdk)
 
        s.apiRouter.POST("/make", s.buildMake)
        s.apiRouter.POST("/make/:id", s.buildMake)
 
-       /* TODO: to be tested and then enabled
        s.apiRouter.POST("/exec", s.execCmd)
        s.apiRouter.POST("/exec/:id", s.execCmd)
-       */
+       s.apiRouter.POST("/signal", s.execSignalCmd)
+
+       s.apiRouter.GET("/events", s.eventsList)
+       s.apiRouter.POST("/events/register", s.eventsRegister)
+       s.apiRouter.POST("/events/unregister", s.eventsUnRegister)
 
        return s
 }