changed account to userID in config and validate request

Author: YourTechBud

config/config.go

@@ -45,9 +45,9 @@ type Admin struct {
 
 // OperationConfig holds the operation mode config
 type OperationConfig struct {
-	Mode  int    `json:"mode" yaml:"mode"`
-	Email string `json:"email" yaml:"email"`
-	Key   string `json:"key" yaml:"key"`
+	Mode   int    `json:"mode" yaml:"mode"`
+	UserID string `json:"userId" yaml:"userId"`
+	Key    string `json:"key" yaml:"key"`
 }
 
 // AdminUser holds the user credentials and scope

model/validate.go

@@ -2,10 +2,10 @@ package model
 
 // RegisterRequest is the struct which carries the space cloud register payload
 type RegisterRequest struct {
-	ID      string `json:"id"` // This is the space cloud id
-	Key     string `json:"key"`
-	Account string `json:"account"`
-	Mode    int    `json:"mode"`
+	ID     string `json:"id"` // This is the space cloud id
+	Key    string `json:"key"`
+	UserID string `json:"userId"`
+	Mode   int    `json:"mode"`
 }
 
 // RegisterResponse is the response to the register request

utils/admin/admin.go

@@ -43,13 +43,13 @@ func (m *Manager) SetOperationMode(op *config.OperationConfig) error {
 	m.lock.Lock()
 	defer m.lock.Unlock()
 
-	if op.Mode > 0 && (op.Email == "" || op.Key == "") {
+	if op.Mode > 0 && (op.UserID == "" || op.Key == "") {
 		return errors.New("Invalid operation setting provided")
 	}
 
 	if op.Mode > 0 {
 		// Start the validation process for higher op modes
-		if err := m.validator.startValidation(m.nodeID, op.Email, op.Key, op.Mode); err != nil {
+		if err := m.validator.startValidation(m.nodeID, op.UserID, op.Key, op.Mode); err != nil {
 			return err
 		}
 	} else {

utils/admin/validate.go

@@ -24,11 +24,11 @@ func newValidator(cb func()) *validator {
 }
 
 // Start starts the validation process
-func (v *validator) startValidation(id, account, key string, mode int) error {
+func (v *validator) startValidation(id, userID, key string, mode int) error {
 	// Set validation status to active
 	v.setActive(true)
 
-	if err := v.registerSpaceCloud(id, account, key, mode); err != nil {
+	if err := v.registerSpaceCloud(id, userID, key, mode); err != nil {
 		return err
 	}
 
@@ -54,7 +54,7 @@ func (v *validator) startValidation(id, account, key string, mode int) error {
 				return
 			}
 
-			if err := v.registerSpaceCloud(id, account, key, mode); err != nil {
+			if err := v.registerSpaceCloud(id, userID, key, mode); err != nil {
 				log.Println("Validate: Error -", err)
 			} else {
 				timer = time.Now()

utils/admin/websocket.go

@@ -34,8 +34,8 @@ func (v *validator) connect(url string) error {
 	return nil
 }
 
-func (v *validator) write(id, account, key string, mode int) error {
-	req := &model.RegisterRequest{ID: id, Account: account, Key: key, Mode: mode}
+func (v *validator) write(id, userID, key string, mode int) error {
+	req := &model.RegisterRequest{ID: id, UserID: userID, Key: key, Mode: mode}
 	msg := &model.Message{Type: utils.TypeRegisterRequest, Data: req}
 	return v.socket.WriteJSON(msg)
 }
@@ -69,13 +69,13 @@ func (v *validator) routineRead() error {
 	}
 }
 
-func (v *validator) registerSpaceCloud(id, account, secret string, mode int) error {
+func (v *validator) registerSpaceCloud(id, userID, secret string, mode int) error {
 	err := v.connect(url)
 	if err != nil {
 		return err
 	}
 
-	err = v.write(id, account, secret, mode)
+	err = v.write(id, userID, secret, mode)
 	if err != nil {
 		return err
 	}