mirror of
https://github.com/tgdrive/teldrive.git
synced 2024-09-20 16:25:54 +08:00
fixed nonauth client
This commit is contained in:
divyam234
parent
20bca7952e
commit
ca06088900
|
|
@ -246,103 +246,102 @@ func (as *AuthService) HandleMultipleLogin(c *gin.Context) {
|
|||
dispatcher := tg.NewUpdateDispatcher()
|
||||
loggedIn := qrlogin.OnLoginToken(dispatcher)
|
||||
sessionStorage := &session.StorageMemory{}
|
||||
tgClient := utils.GetNonAuthClient(dispatcher, sessionStorage)
|
||||
tgClient, stop, _ := utils.StartNonAuthClient(dispatcher, sessionStorage)
|
||||
|
||||
tgClient.Run(c, func(ctx context.Context) error {
|
||||
defer stop()
|
||||
|
||||
for {
|
||||
message := &SocketMessage{}
|
||||
err := conn.ReadJSON(message)
|
||||
for {
|
||||
message := &SocketMessage{}
|
||||
err := conn.ReadJSON(message)
|
||||
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return err
|
||||
}
|
||||
if message.AuthType == "qr" {
|
||||
go func() {
|
||||
authorization, err := tgClient.QR().Auth(c, loggedIn, func(ctx context.Context, token qrlogin.Token) error {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": map[string]string{"token": token.URL()}})
|
||||
return nil
|
||||
})
|
||||
|
||||
if tgerr.Is(err, "SESSION_PASSWORD_NEEDED") {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "message": "2FA required"})
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
user, ok := authorization.User.AsNotEmpty()
|
||||
if !ok {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": errors.New("auth failed")})
|
||||
return
|
||||
}
|
||||
res, _ := sessionStorage.LoadSession(c)
|
||||
sessionData := &SessionData{}
|
||||
json.Unmarshal(res, sessionData)
|
||||
session := prepareSession(user, &sessionData.Data)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": session, "message": "success"})
|
||||
}()
|
||||
}
|
||||
if message.AuthType == "phone" && message.Message == "sendcode" {
|
||||
go func() {
|
||||
res, err := tgClient.Auth().SendCode(c, message.PhoneNo, tgauth.SendCodeOptions{})
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
code := res.(*tg.AuthSentCode)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": map[string]string{"phoneCodeHash": code.PhoneCodeHash}})
|
||||
}()
|
||||
}
|
||||
if message.AuthType == "phone" && message.Message == "signin" {
|
||||
go func() {
|
||||
auth, err := tgClient.Auth().SignIn(c, message.PhoneNo, message.PhoneCode, message.PhoneCodeHash)
|
||||
|
||||
if errors.Is(err, tgauth.ErrPasswordAuthNeeded) {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "message": "2FA required"})
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
user, ok := auth.User.AsNotEmpty()
|
||||
if !ok {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": errors.New("auth failed")})
|
||||
return
|
||||
}
|
||||
res, _ := sessionStorage.LoadSession(c)
|
||||
sessionData := &SessionData{}
|
||||
json.Unmarshal(res, sessionData)
|
||||
session := prepareSession(user, &sessionData.Data)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": session, "message": "success"})
|
||||
}()
|
||||
}
|
||||
|
||||
if message.AuthType == "2fa" && message.Password != "" {
|
||||
go func() {
|
||||
auth, err := tgClient.Auth().Password(c, message.Password)
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
user, ok := auth.User.AsNotEmpty()
|
||||
if !ok {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": errors.New("auth failed")})
|
||||
return
|
||||
}
|
||||
res, _ := sessionStorage.LoadSession(c)
|
||||
sessionData := &SessionData{}
|
||||
json.Unmarshal(res, sessionData)
|
||||
session := prepareSession(user, &sessionData.Data)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": session, "message": "success"})
|
||||
}()
|
||||
}
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return
|
||||
}
|
||||
})
|
||||
if message.AuthType == "qr" {
|
||||
go func() {
|
||||
authorization, err := tgClient.QR().Auth(c, loggedIn, func(ctx context.Context, token qrlogin.Token) error {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": map[string]string{"token": token.URL()}})
|
||||
return nil
|
||||
})
|
||||
|
||||
if tgerr.Is(err, "SESSION_PASSWORD_NEEDED") {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "message": "2FA required"})
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
user, ok := authorization.User.AsNotEmpty()
|
||||
if !ok {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": errors.New("auth failed")})
|
||||
return
|
||||
}
|
||||
res, _ := sessionStorage.LoadSession(c)
|
||||
sessionData := &SessionData{}
|
||||
json.Unmarshal(res, sessionData)
|
||||
session := prepareSession(user, &sessionData.Data)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": session, "message": "success"})
|
||||
}()
|
||||
}
|
||||
if message.AuthType == "phone" && message.Message == "sendcode" {
|
||||
go func() {
|
||||
res, err := tgClient.Auth().SendCode(c, message.PhoneNo, tgauth.SendCodeOptions{})
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
code := res.(*tg.AuthSentCode)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": map[string]string{"phoneCodeHash": code.PhoneCodeHash}})
|
||||
}()
|
||||
}
|
||||
if message.AuthType == "phone" && message.Message == "signin" {
|
||||
go func() {
|
||||
auth, err := tgClient.Auth().SignIn(c, message.PhoneNo, message.PhoneCode, message.PhoneCodeHash)
|
||||
|
||||
if errors.Is(err, tgauth.ErrPasswordAuthNeeded) {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "message": "2FA required"})
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
user, ok := auth.User.AsNotEmpty()
|
||||
if !ok {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": errors.New("auth failed")})
|
||||
return
|
||||
}
|
||||
res, _ := sessionStorage.LoadSession(c)
|
||||
sessionData := &SessionData{}
|
||||
json.Unmarshal(res, sessionData)
|
||||
session := prepareSession(user, &sessionData.Data)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": session, "message": "success"})
|
||||
}()
|
||||
}
|
||||
|
||||
if message.AuthType == "2fa" && message.Password != "" {
|
||||
go func() {
|
||||
auth, err := tgClient.Auth().Password(c, message.Password)
|
||||
if err != nil {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": err.Error()})
|
||||
return
|
||||
}
|
||||
user, ok := auth.User.AsNotEmpty()
|
||||
if !ok {
|
||||
conn.WriteJSON(map[string]interface{}{"type": "error", "message": errors.New("auth failed")})
|
||||
return
|
||||
}
|
||||
res, _ := sessionStorage.LoadSession(c)
|
||||
sessionData := &SessionData{}
|
||||
json.Unmarshal(res, sessionData)
|
||||
session := prepareSession(user, &sessionData.Data)
|
||||
conn.WriteJSON(map[string]interface{}{"type": "auth", "payload": session, "message": "success"})
|
||||
}()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,17 +115,25 @@ func GetAuthClient(ctx context.Context, sessionStr string, userId int64) (*teleg
|
|||
return client, nil
|
||||
}
|
||||
|
||||
func GetNonAuthClient(handler telegram.UpdateHandler, storage telegram.SessionStorage) *telegram.Client {
|
||||
func StartNonAuthClient(handler telegram.UpdateHandler, storage telegram.SessionStorage) (*telegram.Client, bg.StopFunc, error) {
|
||||
middlewares := []telegram.Middleware{}
|
||||
if config.RateLimit {
|
||||
middlewares = append(middlewares, ratelimit.New(rate.Every(time.Millisecond*100), 5))
|
||||
}
|
||||
client := telegram.NewClient(config.AppId, config.AppHash, telegram.Options{
|
||||
SessionStorage: storage,
|
||||
Device: getDeviceConfig(),
|
||||
UpdateHandler: handler,
|
||||
ReconnectionBackoff: reconnectionBackoff,
|
||||
RetryInterval: 5 * time.Second,
|
||||
MaxRetries: 5,
|
||||
SessionStorage: storage,
|
||||
Middlewares: middlewares,
|
||||
Device: getDeviceConfig(),
|
||||
UpdateHandler: handler,
|
||||
})
|
||||
|
||||
return client
|
||||
stop, err := bg.Connect(client)
|
||||
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
return client, stop, nil
|
||||
}
|
||||
|
||||
func startBotClient(ctx context.Context, client *telegram.Client, token string) (bg.StopFunc, error) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue