Add raw command and clear device queue endpoints (#864)

server/server.go

@@ -74,6 +74,8 @@ type Server struct {
 	SCEPService     scep.Service
 	ConfigService   config.Service
 
+	CommandQueue mdm.Queue
+
 	WebhooksHTTPClient *http.Client
 }
 
@@ -102,10 +104,6 @@ func (c *Server) Setup(logger log.Logger) error {
 		return err
 	}
 
-	if err := c.setupCommandService(); err != nil {
-		return err
-	}
-
 	if err := c.setupWebhooks(logger); err != nil {
 		return err
 	}
@@ -114,6 +112,10 @@ func (c *Server) Setup(logger log.Logger) error {
 		return err
 	}
 
+	if err := c.setupCommandService(); err != nil {
+		return err
+	}
+
 	if err := c.setupDepClient(); err != nil {
 		return err
 	}
@@ -162,7 +164,7 @@ func (c *Server) setupRemoveService() error {
 }
 
 func (c *Server) setupCommandService() error {
-	commandService, err := command.New(c.PubClient)
+	commandService, err := command.New(c.PubClient, c.CommandQueue)
 	if err != nil {
 		return err
 	}
@@ -191,6 +193,8 @@ func (c *Server) setupCommandQueue(logger log.Logger) error {
 		return fmt.Errorf("invalid command queue type: %s", c.Queue)
 	}
 
+	c.CommandQueue = q
+
 	devDB, err := devicebuiltin.NewDB(c.DB)
 	if err != nil {
 		return errors.Wrap(err, "new device db")