lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-26 08:45:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bbgo: rename auth function for general case

Browse Source
This commit is contained in:
c9s 2022-01-14 13:41:43 +08:00
parent 5bef7d8a1e
commit fdf7ad9648
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
pkg/bbgo/environment.go
View File

@ -563,6 +563,20 @@ func (environ *Environment) ConfigureNotificationSystem(userConfig *Config) erro
}
persistence := environ.PersistenceServiceFacade.Get()
authToken := viper.GetString("telegram-bot-auth-token")
if len(authToken) > 0 {
interact.AddCustomInteraction(&interact.AuthInteract{
Strict: false,
Mode: interact.AuthModeToken,
Token: authToken,
})
log.Debugf("telegram bot auth token is set, using fixed token for authorization...")
printAuthTokenGuide(authToken)
}
// check if telegram bot token is defined
telegramBotToken := viper.GetString("telegram-bot-token")
if len(telegramBotToken) > 0 {
tt := strings.Split(telegramBotToken, ":")
@ -584,28 +598,10 @@ func (environ *Environment) ConfigureNotificationSystem(userConfig *Config) erro
var sessionStore = persistence.NewStore("bbgo", "telegram", telegramID)
interact.SetMessenger(&interact.Telegram{
Private: true,
Bot: bot,
Private: true,
})
// TODO: replace this background context later
if err := interact.Start(context.Background()); err != nil {
return err
}
authToken := viper.GetString("telegram-bot-auth-token")
if len(authToken) > 0 {
interact.AddCustomInteraction(&interact.AuthInteract{
Strict: true,
Mode: interact.AuthModeToken,
Token: authToken,
})
log.Debugf("telegram bot auth token is set, using fixed token for authorization...")
printTelegramAuthTokenGuide(authToken)
}
var session telegramnotifier.Session
var qrcodeImagePath = fmt.Sprintf("otp-%s.png", telegramID)
if err := sessionStore.Load(&session); err != nil || session.Owner == nil {
@ -616,7 +612,7 @@ func (environ *Environment) ConfigureNotificationSystem(userConfig *Config) erro
return errors.Wrapf(err, "failed to setup totp (time-based one time password) key")
}
printTelegramOtpAuthGuide(qrcodeImagePath)
printOtpAuthGuide(qrcodeImagePath)
session = telegramnotifier.NewSession(key)
if err := sessionStore.Save(&session); err != nil {
@ -625,10 +621,9 @@ func (environ *Environment) ConfigureNotificationSystem(userConfig *Config) erro
} else if session.OneTimePasswordKey != nil {
log.Infof("telegram session loaded: %+v", session)
printTelegramOtpAuthGuide(qrcodeImagePath)
printOtpAuthGuide(qrcodeImagePath)
}
go interaction.Start(session)
var opts []telegramnotifier.Option
@ -656,6 +651,11 @@ func (environ *Environment) ConfigureNotificationSystem(userConfig *Config) erro
}
}
// TODO: replace this background context later
if err := interact.Start(context.Background()); err != nil {
return err
}
return nil
}
@ -707,24 +707,28 @@ func printOtpKey(key *otp.Key) {
fmt.Println("")
}
func printTelegramOtpAuthGuide(qrcodeImagePath string) {
func printOtpAuthGuide(qrcodeImagePath string) {
fmt.Printf(`
To scan your OTP QR code, please run the following command:
open %s
send the auth command with the generated one-time password to the bbo bot you created to enable the notification:
For telegram, send the auth command with the generated one-time password to the bbo bot you created to enable the notification:
/auth {code}
/auth
`, qrcodeImagePath)
}
func printTelegramAuthTokenGuide(token string) {
func printAuthTokenGuide(token string) {
fmt.Printf(`
send the following command to the bbgo bot you created to enable the notification:
For telegram, send the following command to the bbgo bot you created to enable the notification:
/auth %s
/auth
And then enter your token
%s
`, token)
}