feat(login): support local passcode. close iyear#58

karalife · Nov 23, 2022 · a909abc · a909abc
1 parent bf8063f
commit a909abc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/app/login/desktop.go b/app/login/desktop.go
@@ -19,7 +19,7 @@ import (
 
 const tdata = "tdata"
 
-func Desktop(ctx context.Context, desktop string) error {
+func Desktop(ctx context.Context, desktop, passcode string) error {
 	ns := viper.GetString(consts.FlagNamespace)
 
 	kvd, err := kv.New(kv.Options{
@@ -41,7 +41,7 @@ func Desktop(ctx context.Context, desktop string) error {
 	if filepath.Base(desktop) != tdata {
 		desktop = filepath.Join(desktop, tdata)
 	}
-	accounts, err := tdesktop.Read(desktop, nil)
+	accounts, err := tdesktop.Read(desktop, []byte(passcode))
 	if err != nil {
 		return err
 	}

diff --git a/cmd/login/login.go b/cmd/login/login.go
@@ -8,7 +8,7 @@ import (
 )
 
 var (
-	desktop string
+	desktop, passcode string
 )
 
 var Cmd = &cobra.Command{
@@ -18,12 +18,13 @@ var Cmd = &cobra.Command{
 		color.Yellow("WARN: If data exists in the namespace, data will be overwritten")
 
 		if desktop != "" {
-			return login.Desktop(cmd.Context(), desktop)
+			return login.Desktop(cmd.Context(), desktop, passcode)
 		}
 		return login.Code(cmd.Context())
 	},
 }
 
 func init() {
-	Cmd.Flags().StringVarP(&desktop, consts.FlagLoginDesktop, "d", "", "Official desktop client path, import session from it")
+	Cmd.Flags().StringVarP(&desktop, consts.FlagLoginDesktop, "d", "", "official desktop client path, import session from it")
+	Cmd.Flags().StringVarP(&passcode, consts.FlagLoginPasscode, "p", "", "passcode for desktop client, keep empty if no passcode")
 }
diff --git a/pkg/consts/flag.go b/pkg/consts/flag.go
@@ -1,17 +1,18 @@
 package consts
 
 const (
-	FlagProxy        = "proxy"
-	FlagNamespace    = "ns"
-	FlagDebug        = "debug"
-	FlagPartSize     = "size"
-	FlagThreads      = "threads"
-	FlagLimit        = "limit"
-	FlagNTP          = "ntp"
-	FlagUpPath       = "path"
-	FlagUpExcludes   = "excludes"
-	FlagLoginDesktop = "desktop"
-	FlagDlUrl        = "url"
-	FlagDlFile       = "file"
-	FlagDlTemplate   = "template"
+	FlagProxy         = "proxy"
+	FlagNamespace     = "ns"
+	FlagDebug         = "debug"
+	FlagPartSize      = "size"
+	FlagThreads       = "threads"
+	FlagLimit         = "limit"
+	FlagNTP           = "ntp"
+	FlagUpPath        = "path"
+	FlagUpExcludes    = "excludes"
+	FlagLoginDesktop  = "desktop"
+	FlagLoginPasscode = "passcode"
+	FlagDlUrl         = "url"
+	FlagDlFile        = "file"
+	FlagDlTemplate    = "template"
 )