|
|
|
@ -98,14 +98,16 @@ func (s *AuthDBServer) Registration(ctx context.Context, req *api.RegistrationRe |
|
|
|
|
user, ok := s.repo.Customers[req.GetLogin()] |
|
|
|
|
if !ok { |
|
|
|
|
hash := s.getMD5Hash(req.GetPassword()) |
|
|
|
|
tmpUser, eru := s.repo.NewCustomer(req.GetLogin(), hash, req.GetEmail(), strconv.Itoa(time.Now().Nanosecond())) |
|
|
|
|
if eru != nil { |
|
|
|
|
s.logger.Error(eru) |
|
|
|
|
user = s.repo.NewCustomer(req.GetLogin(), hash, req.GetEmail(), strconv.Itoa(time.Now().Nanosecond())) |
|
|
|
|
|
|
|
|
|
return nil, eru |
|
|
|
|
//
|
|
|
|
|
erk := user.Add() |
|
|
|
|
if erk != nil { |
|
|
|
|
return nil, erk |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
user = tmpUser |
|
|
|
|
// Добавим в локальную копию
|
|
|
|
|
s.repo.Customers[req.GetLogin()] = user |
|
|
|
|
} else if user.Confirmed || time.Now().Before(user.Time) { |
|
|
|
|
return nil, errors.New("login already registered") |
|
|
|
|
} else { // Обновим время регистрации
|
|
|
|
@ -113,7 +115,7 @@ func (s *AuthDBServer) Registration(ctx context.Context, req *api.RegistrationRe |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// TODO
|
|
|
|
|
_, era := json.Marshal(user.MessageRegistration) |
|
|
|
|
value, era := json.Marshal(user.MessageRegistration) |
|
|
|
|
if era != nil { |
|
|
|
|
return nil, era |
|
|
|
|
} |
|
|
|
@ -121,15 +123,13 @@ func (s *AuthDBServer) Registration(ctx context.Context, req *api.RegistrationRe |
|
|
|
|
//
|
|
|
|
|
s.logger.Printf("publication code %s to %s ...", user.MessageRegistration.Code, user.MessageRegistration.Email) |
|
|
|
|
|
|
|
|
|
// //
|
|
|
|
|
// err := s.kafkaWriter.WriteMessage([]byte(user.Login), value)
|
|
|
|
|
// if err != nil {
|
|
|
|
|
// s.logger.Error(err)
|
|
|
|
|
// Отправим уведомление о необходимости подтверждения
|
|
|
|
|
err := s.kafkaWriter.WriteMessage([]byte(user.Login), value) |
|
|
|
|
if err != nil { |
|
|
|
|
s.logger.Error(err) |
|
|
|
|
|
|
|
|
|
// return nil, err
|
|
|
|
|
// } else {
|
|
|
|
|
s.repo.Customers[req.Login] = user |
|
|
|
|
// }
|
|
|
|
|
return nil, err |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
s.logger.Printf("publication code %s to %s completed", user.MessageRegistration.Code, user.MessageRegistration.Email) |
|
|
|
|