diff --git a/bff/app.env b/bff/app.env index ca08b97..dee7e18 100644 --- a/bff/app.env +++ b/bff/app.env @@ -8,6 +8,7 @@ ACCESS_TOKEN_DURATION=15m MIGRATION_URL=file://db/migration MIGRATION_RETRIES=5 SWAGGER=true +URL=https://df.itsscb.de REFRESH_TOKEN_DURATION=24h TOKEN_PRIVATEKEY_HEX=099c0b96725b99e95719c92aec580809ac58fc14be2105ed2656f1f6c464593d8cacd6c7bed924b9cf207ab3cff1c59be4e5865260c4dafa29699244bd4ea2de SMTP_ADDRESS=smtp.gmail.com:587 diff --git a/bff/gapi/rpc_create_account.go b/bff/gapi/rpc_create_account.go index a2fc6c1..4b03d97 100644 --- a/bff/gapi/rpc_create_account.go +++ b/bff/gapi/rpc_create_account.go @@ -32,7 +32,7 @@ func (server *Server) CreateAccount(ctx context.Context, req *pb.CreateAccountRe Email: req.GetEmail(), }, AfterCreate: func(a db.Account) error { - return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


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,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


Your Team of DF", req.GetEmail(), server.config.Url, a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil) }, } diff --git a/bff/gapi/rpc_resend_verification.go b/bff/gapi/rpc_resend_verification.go index 0426f1a..47a0f9c 100644 --- a/bff/gapi/rpc_resend_verification.go +++ b/bff/gapi/rpc_resend_verification.go @@ -50,7 +50,7 @@ func (server *Server) ResendVerification(ctx context.Context, req *pb.ResendVeri ID: req.GetAccountId(), }, AfterCreate: func(a db.Account) error { - return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


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,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


Your Team of DF", account.Email, server.config.Url, a.ID, a.SecretKey.String), []string{account.Email}, nil, nil, nil) }, } diff --git a/bff/gapi/rpc_update_account.go b/bff/gapi/rpc_update_account.go index 3365f80..2e90321 100644 --- a/bff/gapi/rpc_update_account.go +++ b/bff/gapi/rpc_update_account.go @@ -69,7 +69,7 @@ func (server *Server) UpdateAccount(ctx context.Context, req *pb.UpdateAccountRe } } else { arg.AfterUpdate = func(a db.Account) error { - return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


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,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


Your Team of DF", req.GetEmail(), server.config.Url, a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil) } } } diff --git a/bff/util/config.go b/bff/util/config.go index 094e9ca..0ae11dd 100644 --- a/bff/util/config.go +++ b/bff/util/config.go @@ -16,6 +16,7 @@ type Config struct { TokenPrivateKeyHex string `mapstructure:"TOKEN_PRIVATEKEY_HEX"` MigrationURL string `mapstructure:"MIGRATION_URL"` Swagger bool `mapstructure:"SWAGGER"` + Url string `mapstructure:"URL"` SMTPAddress string `mapstructure:"SMTP_ADDRESS"` SMTPPassword string `mapstructure:"SMTP_PASSWORD"` SMTPMail string `mapstructure:"SMTP_MAIL"`