added flags to wave commands

VirgilSecurity · Aug 30, 2019 · 63d165e · 63d165e
1 parent d15ec9c
commit 63d165e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/cmd/wave/dcm/dcm_create.go b/cmd/wave/dcm/dcm_create.go
@@ -19,7 +19,9 @@ func DsmCreate(vcli *client.VirgilHttpClient) *cli.Command {
 		Aliases:   []string{"c"},
 		ArgsUsage: "app_name",
 		Usage:     "Create new dcm certificate",
-		Flags: []cli.Flag{&cli.StringFlag{Name: "name", Usage: "dsm certificate name"},
+		Flags: []cli.Flag{
+			&cli.StringFlag{Name: "name", Usage: "dsm certificate name"},
+			&cli.StringFlag{Name: "app_id", Usage: "application id"},
 			&cli.StringFlag{Name: "encrypt-pub-key", Usage: "encrypt public key"},
 			&cli.StringFlag{Name: "app-token", Usage: "application token"},
 			&cli.StringFlag{Name: "verify-pub-key", Usage: "verify public key"}},
@@ -42,8 +44,8 @@ func DsmCreate(vcli *client.VirgilHttpClient) *cli.Command {
 				return errors.New("Please, specify app_id (flag --app_id)")
 			}
 			appToken := utils.ReadFlagOrDefault(context, "app-token", defaultAppToken)
-			if appID == "" {
-				return errors.New("Please, specify app_id (flag --app_id)")
+			if appToken == "" {
+				return errors.New("Please, specify app-token (flag --app-token)")
 			}
 			dcm, err := DsmCreateFunc(appID, name, encryptPubKey, verifyPubKey, appToken, vcli)
 			if err != nil {

diff --git a/cmd/wave/dcm/dcm_list.go b/cmd/wave/dcm/dcm_list.go
@@ -16,7 +16,9 @@ func DcmList(vcli *client.VirgilHttpClient) *cli.Command {
 		Name:    "list",
 		Aliases: []string{"l"},
 		Usage:   "List your dcm certificates",
-		Flags: []cli.Flag{&cli.StringFlag{Name: "app-token", Usage: "application token"}},
+		Flags: []cli.Flag{
+			&cli.StringFlag{Name: "app_id", Usage: "application id"},
+			&cli.StringFlag{Name: "app-token", Usage: "application token"}},
 
 		Action: func(context *cli.Context) (err error) {
 
@@ -32,8 +34,8 @@ func DcmList(vcli *client.VirgilHttpClient) *cli.Command {
 				return errors.New("Please, specify app_id (flag --app_id)")
 			}
 			appToken := utils.ReadFlagOrDefault(context, "app-token", defaultAppToken)
-			if appID == "" {
-				return errors.New("Please, specify app_id (flag --app_id)")
+			if appToken == "" {
+				return errors.New("Please, specify app-token (flag --app_token)")
 			}
 
 			certs, err := dcmListFunc(appID, appToken, vcli)

diff --git a/cmd/wave/device/device_list.go b/cmd/wave/device/device_list.go
@@ -15,7 +15,9 @@ func DeviceList(vcli *client.VirgilHttpClient) *cli.Command {
 		Name:    "list",
 		Aliases: []string{"l"},
 		Usage:   "List your devices",
-		Flags:   []cli.Flag{&cli.StringFlag{Name: "app-token", Usage: "application token"}},
+		Flags:   []cli.Flag{
+			&cli.StringFlag{Name: "app_id", Usage: "application id"},
+			&cli.StringFlag{Name: "app-token", Usage: "application token"}},
 		Action: func(context *cli.Context) (err error) {
 
 			defaultApp, err := utils.LoadDefaultApp()
@@ -30,8 +32,8 @@ func DeviceList(vcli *client.VirgilHttpClient) *cli.Command {
 				return errors.New("Please, specify app_id (flag --app_id)")
 			}
 			appToken := utils.ReadFlagOrDefault(context, "app-token", defaultAppToken)
-			if appID == "" {
-				return errors.New("Please, specify app_id (flag --app_id)")
+			if appToken == "" {
+				return errors.New("Please, specify app-token (flag --app-token)")
 			}
 
 			devices, err := deviceListFunc(appID, appToken, vcli)

diff --git a/cmd/wave/init.go b/cmd/wave/init.go
@@ -14,7 +14,7 @@ func Init(vcli *client.VirgilHttpClient) *cli.Command {
 	return &cli.Command{
 		Name:  "init",
 		Usage: "Init wave module in application",
-		Flags: []cli.Flag{&cli.StringFlag{Name: "type", Usage: "application type (e2ee or pure)"}},
+		Flags: []cli.Flag{&cli.StringFlag{Name: "app_id", Usage: "application id"}},
 
 		Action: func(context *cli.Context) (err error) {