Implemented Version Command

mohammed786 · ravitejag · commit 63c0c6cfc17e · 2021-05-21T09:47:11.000+05:30
Added User Agent for all the API Calls
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -9,6 +9,9 @@ builds:
   - <<: &build_defaults
       binary: lr
       main: ./app/lr
+      ldflags:
+        - -s -w -X github.com/loginradius/lr-cli/internal/build.Version={{.Version}} -X github.com/loginradius/lr-cli/internal/build.Date={{time "2006-01-02"}}
+        - -X main.updaterEnabled=cli/cli
     id: macos
     goos: [darwin]
     goarch: [amd64]
diff --git a/cmd/get/email/email.go b/cmd/get/email/email.go
@@ -53,7 +53,8 @@ func get() error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("{EmailLinkExpire, EmailNotificationCount, EmailNotificationFrequency}\n")
-	fmt.Println(resultResp)
+	fmt.Println("EmailLinkExpire: ", resultResp.EmailLinkExpire)
+	fmt.Println("EmailNotificationCount: ", resultResp.EmailNotificationCount)
+	fmt.Println("EmailNotificationFrequency: ", resultResp.EmailNotificationFrequency)
 	return nil
 }
diff --git a/cmd/login/login.go b/cmd/login/login.go
@@ -37,12 +37,10 @@ func NewLoginCmd() *cobra.Command {
 		$ lr login
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			isValid, err := validateLogin()
+			isValid := validateLogin()
 
-			if err != nil {
-				return err
-			} else if isValid {
-				fmt.Printf("%s", "You are already been logged in")
+			if isValid {
+				fmt.Println("You are already logged in")
 				return nil
 			}
 			cmdutil.Openbrowser(conf.HubPageDomain + "/auth.aspx?return_url=http://localhost:8089/postLogin")
@@ -88,14 +86,17 @@ func doLogin(accessToken string) error {
 	return nil
 }
 
-func validateLogin() (bool, error) {
+func validateLogin() bool {
 	_, err := cmdutil.ReadFile("token.json")
 	if err != nil {
-		return false, nil
+		return false
 	}
 	resObj, err := api.AuthValidateToken()
+	if err != nil {
+		return false
+	}
 	if resObj.AccessToken != "" {
-		return true, nil
+		return true
 	}
-	return false, nil
+	return false
 }
diff --git a/cmd/root/root.go b/cmd/root/root.go
@@ -6,13 +6,16 @@ import (
 	"github.com/loginradius/lr-cli/cmd/generateSott"
 	"github.com/loginradius/lr-cli/cmd/resetSecret"
 	"github.com/loginradius/lr-cli/cmd/set"
+	"github.com/loginradius/lr-cli/cmd/version"
 
 	"github.com/loginradius/lr-cli/cmd/delete"
 	"github.com/loginradius/lr-cli/cmd/get"
 	"github.com/loginradius/lr-cli/cmd/login"
 	"github.com/loginradius/lr-cli/cmd/logout"
 	"github.com/loginradius/lr-cli/cmd/register"
 	"github.com/loginradius/lr-cli/cmd/verify"
+
+	"github.com/loginradius/lr-cli/internal/build"
 	"github.com/spf13/cobra"
 )
 
@@ -30,10 +33,18 @@ func NewRootCmd() *cobra.Command {
 	helpHelper := func(command *cobra.Command, args []string) {
 		rootHelpFunc(command, args)
 	}
-
+	rootCmd.PersistentFlags().Bool("help", false, "Show help for command")
 	rootCmd.SetHelpFunc(helpHelper)
 
-	// Authentication Commands
+	formattedVersion := version.Format(build.Version, build.Date)
+	rootCmd.SetVersionTemplate(formattedVersion)
+	rootCmd.Version = formattedVersion
+	rootCmd.Flags().Bool("version", false, "Show lr version")
+
+	// Child Commands
+	versionCmd := version.NewCmdVersion(build.Version, build.Date)
+	rootCmd.AddCommand(versionCmd)
+
 	loginCmd := login.NewLoginCmd()
 	rootCmd.AddCommand((loginCmd))
 
diff --git a/cmd/set/email/email.go b/cmd/set/email/email.go
@@ -50,9 +50,9 @@ func NewemailCmd() *cobra.Command {
 	}
 	fl := cmd.Flags()
 
-	fl.IntVarP(&opts.EmailLinkExpire, "link_expire", "a", 0, "email link expire")
-	fl.IntVarP(&opts.EmailNotificationCount, "notif_count", "b", 0, "number of email notifications")
-	fl.IntVarP(&opts.EmailNotificationFrequency, "notif_frequency", "c", 0, "frequency of email notification")
+	fl.IntVarP(&opts.EmailLinkExpire, "link_expire", "l", 0, "Email Token Validity (Minutes)")
+	fl.IntVarP(&opts.EmailNotificationCount, "notif_count", "c", 0, "Request Limit")
+	fl.IntVarP(&opts.EmailNotificationFrequency, "notif_frequency", "f", 0, "Request Disabled Period (Minutes)")
 
 	return cmd
 }
diff --git a/cmd/version/version.go b/cmd/version/version.go
@@ -0,0 +1,43 @@
+package version
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+func NewCmdVersion(version, buildDate string) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:    "version",
+		Hidden: true,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Println(Format(version, buildDate))
+		},
+	}
+
+	return cmd
+}
+
+func Format(version, buildDate string) string {
+	version = strings.TrimPrefix(version, "v")
+
+	var dateStr string
+	if buildDate != "" {
+		dateStr = fmt.Sprintf(" (%s)", buildDate)
+	}
+
+	return fmt.Sprintf("lr version %s%s\n%s\n", version, dateStr, changelogURL(version))
+}
+
+func changelogURL(version string) string {
+	path := "https://github.com/loginradius/lr-cli"
+	r := regexp.MustCompile(`^v?\d+\.\d+\.\d+(-[\w.]+)?$`)
+	if !r.MatchString(version) {
+		return fmt.Sprintf("%s/releases/latest", path)
+	}
+
+	url := fmt.Sprintf("%s/releases/tag/v%s", path, strings.TrimPrefix(version, "v"))
+	return url
+}
diff --git a/cmdutil/lrUtils.go b/cmdutil/lrUtils.go
@@ -11,6 +11,10 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
+
+	"github.com/shirou/gopsutil/host"
+
+	"github.com/loginradius/lr-cli/internal/build"
 )
 
 func ReadFile(filename string) ([]byte, error) {
@@ -98,3 +102,9 @@ func DeleteFile(filename string) error {
 	}
 	return nil
 }
+func UAString() string {
+	if info, err := host.Info(); err == nil {
+		return `LRCLI/` + build.Version + " (" + info.Platform + "; " + info.KernelArch + ") " + info.OS + "/" + info.PlatformVersion + " (" + info.Hostname + ")"
+	}
+	return ""
+}
diff --git a/go.mod b/go.mod
@@ -4,12 +4,16 @@ go 1.16
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0
+	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
 	github.com/cli/safeexec v1.0.0
+	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/schema v1.2.0
 	github.com/kr/text v0.2.0
 	github.com/rs/cors v1.7.0
+	github.com/shirou/gopsutil v3.21.4+incompatible
 	github.com/spf13/cobra v1.1.3
+	github.com/tklauser/go-sysconf v0.3.5 // indirect
 )
 
 replace github.com/loginradius/lr-cli => ../lr-cli
diff --git a/go.sum b/go.sum
@@ -16,6 +16,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY=
+github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@@ -37,6 +39,7 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
@@ -47,6 +50,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
+github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -134,6 +139,7 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -152,6 +158,8 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shirou/gopsutil v3.21.4+incompatible h1:fuHcTm5mX+wzo542cmYcV9RTGQLbnHLI5SyQ5ryTVck=
+github.com/shirou/gopsutil v3.21.4+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -170,8 +178,13 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4=
+github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
+github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA=
+github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -238,6 +251,9 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa h1:ZYxPR6aca/uhfRJyaOAtflSHjJYiktO7QnJC5ut7iY4=
+golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/internal/build/build.go b/internal/build/build.go
@@ -0,0 +1,19 @@
+package build
+
+import (
+	"runtime/debug"
+)
+
+// Version is dynamically set by the toolchain or overridden by the Makefile.
+var Version = "DEV"
+
+// Date is dynamically set at build time in the Makefile.
+var Date = "" // YYYY-MM-DD
+
+func init() {
+	if Version == "DEV" {
+		if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "(devel)" {
+			Version = info.Main.Version
+		}
+	}
+}
diff --git a/request/request.go b/request/request.go
@@ -6,10 +6,6 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
-	"os"
-	"os/user"
-	"path"
-	"path/filepath"
 	"strings"
 
 	"github.com/loginradius/lr-cli/cmdutil"
@@ -53,6 +49,7 @@ func Rest(method string, url string, headers map[string]string, payload string)
 		return nil, errors.New("Please Login to execute this command")
 	}
 	req.Header.Set("Origin", conf.DashboardDomain)
+	req.Header.Set("User-Agent", cmdutil.UAString())
 	req.Header.Set("x-is-loginradius-ajax", "true")
 
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
@@ -81,12 +78,7 @@ func checkAPIError(respData []byte) ([]byte, error) {
 	var errResp APIErr
 	_ = json.Unmarshal(respData, &errResp)
 	if errResp.Xsign != nil && *errResp.Xsign == "" {
-		user, _ := user.Current()
-		dirName := filepath.Join(user.HomeDir, ".lrcli")
-		dir, _ := ioutil.ReadDir(dirName)
-		for _, d := range dir {
-			os.RemoveAll(path.Join([]string{dirName, d.Name()}...))
-		}
+		cmdutil.DeleteFiles()
 		return nil, errors.New("Your access token is expried, Kindly relogin to continue")
 	} else if errResp.Errorcode != nil {
 		if errResp.Errormessage != nil {
diff --git a/script/build.go b/script/build.go
@@ -40,7 +40,11 @@ var tasks = map[string]func(string) error{
 			return nil
 		}
 
-		return run("go", "build", "-o", exe, "./app/lr")
+		ldflags := os.Getenv("GO_LDFLAGS")
+		ldflags = fmt.Sprintf("-X github.com/loginradius/lr-cli/internal/build.Version=%s %s", version(), ldflags)
+		ldflags = fmt.Sprintf("-X github.com/loginradius/lr-cli/internal/build.Date=%s %s", date(), ldflags)
+
+		return run("go", "build", "-trimpath", "-ldflags", ldflags, "-o", exe, "./app/lr")
 	},
 	"clean": func(_ string) error {
 		return rmrf("bin", "share")
@@ -89,6 +93,17 @@ func version() string {
 	return rev
 }
 
+func cmdOutput(args ...string) (string, error) {
+	exe, err := safeexec.LookPath(args[0])
+	if err != nil {
+		return "", err
+	}
+	cmd := exec.Command(exe, args[1:]...)
+	cmd.Stderr = ioutil.Discard
+	out, err := cmd.Output()
+	return strings.TrimSuffix(string(out), "\n"), err
+}
+
 func date() string {
 	t := time.Now()
 	if sourceDate := os.Getenv("SOURCE_DATE_EPOCH"); sourceDate != "" {
@@ -155,17 +170,6 @@ func run(args ...string) error {
 	return cmd.Run()
 }
 
-func cmdOutput(args ...string) (string, error) {
-	exe, err := safeexec.LookPath(args[0])
-	if err != nil {
-		return "", err
-	}
-	cmd := exec.Command(exe, args[1:]...)
-	cmd.Stderr = ioutil.Discard
-	out, err := cmd.Output()
-	return strings.TrimSuffix(string(out), "\n"), err
-}
-
 func shellInspect(args []string) string {
 	fmtArgs := make([]string, len(args))
 	for i, arg := range args {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ func get() error {`
`53`	`53`	`if err != nil {`
`54`	`54`	`return err`
`55`	`55`	`}`
`56`		`- fmt.Printf("{EmailLinkExpire, EmailNotificationCount, EmailNotificationFrequency}\n")`
`57`		`- fmt.Println(resultResp)`
	`56`	`+ fmt.Println("EmailLinkExpire: ", resultResp.EmailLinkExpire)`
	`57`	`+ fmt.Println("EmailNotificationCount: ", resultResp.EmailNotificationCount)`
	`58`	`+ fmt.Println("EmailNotificationFrequency: ", resultResp.EmailNotificationFrequency)`
`58`	`59`	`return nil`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ func NewemailCmd() *cobra.Command {`
`50`	`50`	`}`
`51`	`51`	`fl := cmd.Flags()`
`52`	`52`
`53`		`- fl.IntVarP(&opts.EmailLinkExpire, "link_expire", "a", 0, "email link expire")`
`54`		`- fl.IntVarP(&opts.EmailNotificationCount, "notif_count", "b", 0, "number of email notifications")`
`55`		`- fl.IntVarP(&opts.EmailNotificationFrequency, "notif_frequency", "c", 0, "frequency of email notification")`
	`53`	`+ fl.IntVarP(&opts.EmailLinkExpire, "link_expire", "l", 0, "Email Token Validity (Minutes)")`
	`54`	`+ fl.IntVarP(&opts.EmailNotificationCount, "notif_count", "c", 0, "Request Limit")`
	`55`	`+ fl.IntVarP(&opts.EmailNotificationFrequency, "notif_frequency", "f", 0, "Request Disabled Period (Minutes)")`
`56`	`56`
`57`	`57`	`return cmd`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@ import (`
`11`	`11`	`"path"`
`12`	`12`	`"path/filepath"`
`13`	`13`	`"runtime"`
	`14`	`+`
	`15`	`+ "github.com/shirou/gopsutil/host"`
	`16`	`+`
	`17`	`+ "github.com/loginradius/lr-cli/internal/build"`
`14`	`18`	`)`
`15`	`19`
`16`	`20`	`func ReadFile(filename string) ([]byte, error) {`
`@@ -98,3 +102,9 @@ func DeleteFile(filename string) error {`
`98`	`102`	`}`
`99`	`103`	`return nil`
`100`	`104`	`}`
	`105`	`+func UAString() string {`
	`106`	`+ if info, err := host.Info(); err == nil {`
	`107`	+ return `LRCLI/` + build.Version + " (" + info.Platform + "; " + info.KernelArch + ") " + info.OS + "/" + info.PlatformVersion + " (" + info.Hostname + ")"
	`108`	`+ }`
	`109`	`+ return ""`
	`110`	`+}`