itsscb/df
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix/reapplies some changes that were magically lost

Browse Source
This commit is contained in:
itsscb 2023-11-22 14:55:57 +01:00
parent b51ed9a41d
commit fab35397cc
6 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bff/app.env
View File

@ -7,6 +7,7 @@ LOG_OUTPUT=text
ACCESS_TOKEN_DURATION=15m ACCESS_TOKEN_DURATION=15m
MIGRATION_URL=file://db/migration MIGRATION_URL=file://db/migration
MIGRATION_RETRIES=5 MIGRATION_RETRIES=5
SWAGGER=true
REFRESH_TOKEN_DURATION=24h REFRESH_TOKEN_DURATION=24h
TOKEN_PRIVATEKEY_HEX=099c0b96725b99e95719c92aec580809ac58fc14be2105ed2656f1f6c464593d8cacd6c7bed924b9cf207ab3cff1c59be4e5865260c4dafa29699244bd4ea2de TOKEN_PRIVATEKEY_HEX=099c0b96725b99e95719c92aec580809ac58fc14be2105ed2656f1f6c464593d8cacd6c7bed924b9cf207ab3cff1c59be4e5865260c4dafa29699244bd4ea2de
SMTP_ADDRESS=smtp.gmail.com:587 SMTP_ADDRESS=smtp.gmail.com:587

2
bff/gapi/rpc_create_account.go
View File

@ -32,7 +32,7 @@ func (server *Server) CreateAccount(ctx context.Context, req *pb.CreateAccountRe
Email: req.GetEmail(), Email: req.GetEmail(),
}, },
AfterCreate: func(a db.Account) error { AfterCreate: func(a db.Account) error {
return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"http://localhost:8080/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil) return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"https://df.itsscb.de/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil)
}, },
} }

2
bff/gapi/rpc_resend_verification.go
View File

@ -50,7 +50,7 @@ func (server *Server) ResendVerification(ctx context.Context, req *pb.ResendVeri
ID: req.GetAccountId(), ID: req.GetAccountId(),
}, },
AfterCreate: func(a db.Account) error { AfterCreate: func(a db.Account) error {
return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"http://localhost:8080/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", account.Email, a.ID, a.SecretKey.String), []string{account.Email}, nil, nil, nil) return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"https://df.itsscb.de/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", account.Email, a.ID, a.SecretKey.String), []string{account.Email}, nil, nil, nil)
}, },
} }

2
bff/gapi/rpc_update_account.go
View File

@ -69,7 +69,7 @@ func (server *Server) UpdateAccount(ctx context.Context, req *pb.UpdateAccountRe
} }
} else { } else {
arg.AfterUpdate = func(a db.Account) error { arg.AfterUpdate = func(a db.Account) error {
return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"http://localhost:8080/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil) return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"https://df.itsscb.de/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil)
} }
} }
} }

2
bff/main.go
View File

@ -46,7 +46,7 @@ func main() {
store := db.NewStore(conn) store := db.NewStore(conn)
if config.Environment == "development" { if config.Swagger {
subDir, err := fs.Sub(swaggerFiles, "doc/swagger") subDir, err := fs.Sub(swaggerFiles, "doc/swagger")
if err != nil { if err != nil {
log.Fatalf("could not import swagger files") log.Fatalf("could not import swagger files")

1
bff/util/config.go
View File

@ -19,6 +19,7 @@ type Config struct {
SMTPPassword string `mapstructure:"SMTP_PASSWORD"` SMTPPassword string `mapstructure:"SMTP_PASSWORD"`
SMTPMail string `mapstructure:"SMTP_MAIL"` SMTPMail string `mapstructure:"SMTP_MAIL"`
MigrationRetries int `mapstructure:"MIGRATION_RETRIES"` MigrationRetries int `mapstructure:"MIGRATION_RETRIES"`
Swagger bool `mapstructure:"SWAGGER"`
AccessTokenDuration time.Duration `mapstructure:"ACCESS_TOKEN_DURATION"` AccessTokenDuration time.Duration `mapstructure:"ACCESS_TOKEN_DURATION"`
RefreshTokenDuration time.Duration `mapstructure:"REFRESH_TOKEN_DURATION"` RefreshTokenDuration time.Duration `mapstructure:"REFRESH_TOKEN_DURATION"`
} }