PR suggestions

README.md

@@ -75,6 +75,7 @@ From the project root folder, fire the following commands to execute this projec
         --base-ui-path     ./web/ui/www \
         --hydra-admin-url  http://localhost:4445 \
         --hydra-public-url http://localhost:4444 \
+        --public-url       http://localhost:7070 \
         --secret-key       uhSunsodnsuBsdjsbds \
         --log-level        debug \
         --scopes-file-path ./scopes.json \

mail/confirmation.go

@@ -1,6 +1,7 @@
 package mail
 
 import (
+	"fmt"
 	"github.com/labbsr0x/whisper/misc"
 )
 
@@ -15,10 +16,10 @@ type emailConfirmationMailContent struct {
 }
 
 // GetEmailConfirmationMail render the mail for email confirmation
-func GetEmailConfirmationMail(baseUIPath, secret, username, email, challenge string) Mail {
+func GetEmailConfirmationMail(baseUIPath, secret, publicAddress, username, email, challenge string) Mail {
 	to := []string{email}
 	token := misc.GetEmailConfirmationToken(secret, username, challenge)
-	link := "http://localhost:7070/email-confirmation?token=" + token
+	link := fmt.Sprintf("%v/email-confirmation?token=%v", publicAddress, token)
 	page := emailConfirmationMailContent{Link: link, Username: username}
 	content := render(baseUIPath, emailConfirmationMail, &page)
 

web/api/login.go

@@ -40,7 +40,7 @@ func (dapi *DefaultLoginAPI) LoginPOSTHandler() http.Handler {
 		userCredential := dapi.UserCredentialsDAO.CheckCredentials(loginRequest.Username, loginRequest.Password)
 
 		if !userCredential.EmailValidated {
-			dapi.Outbox <- mail.GetEmailConfirmationMail(dapi.BaseUIPath, dapi.SecretKey, userCredential.Username, userCredential.Email, loginRequest.Challenge)
+			dapi.Outbox <- mail.GetEmailConfirmationMail(dapi.BaseUIPath, dapi.SecretKey, dapi.PublicURL, userCredential.Username, userCredential.Email, loginRequest.Challenge)
 			gohtypes.Panic("This account email is not authenticated, an email was sent to you confirm your email", http.StatusUnauthorized)
 		}
 

web/api/usercredentials.go

@@ -42,7 +42,7 @@ func (dapi *DefaultUserCredentialsAPI) POSTHandler() http.Handler {
 		gohtypes.PanicIfError("Not possible to create user", http.StatusInternalServerError, err)
 		logrus.Infof("User created: %v", userID)
 
-		dapi.Outbox <- mail.GetEmailConfirmationMail(dapi.BaseUIPath, dapi.SecretKey, payload.Username, payload.Email, payload.Challenge)
+		dapi.Outbox <- mail.GetEmailConfirmationMail(dapi.BaseUIPath, dapi.SecretKey, dapi.PublicURL, payload.Username, payload.Email, payload.Challenge)
 
 		w.WriteHeader(http.StatusOK)
 	})

web/config/builder.go

@@ -23,6 +23,7 @@ const (
 	port           = "port"
 	hydraAdminURL  = "hydra-admin-url"
 	hydraPublicURL = "hydra-public-url"
+	publicURL      = "public-url"
 	logLevel       = "log-level"
 	scopesFilePath = "scopes-file-path"
 	databaseURL    = "database-url"
@@ -41,6 +42,7 @@ type Flags struct {
 	ScopesFilePath string
 	HydraAdminURL  string
 	HydraPublicURL string
+	PublicURL      string
 	DatabaseURL    string
 	SecretKey      string
 	MailUser       string
@@ -64,6 +66,7 @@ func AddFlags(flags *pflag.FlagSet) {
 	flags.StringP(port, "p", "7070", "[optional] Custom port for accessing Whisper's services. Defaults to 7070")
 	flags.StringP(hydraAdminURL, "a", "", "Hydra Admin URL")
 	flags.StringP(hydraPublicURL, "o", "", "Hydra Public URL")
+	flags.StringP(publicURL, "", "", "Public URL for referencing in links")
 	flags.StringP(logLevel, "l", "info", "[optional] Sets the Log Level to one of seven (trace, debug, info, warn, error, fatal, panic). Defaults to info")
 	flags.StringP(scopesFilePath, "s", "", "Sets the path to the json file where the available scopes will be found")
 	flags.StringP(databaseURL, "d", "", "Sets the database url where user credential data will be stored")
@@ -83,6 +86,7 @@ func (b *WebBuilder) Init(v *viper.Viper, outbox chan<- mail.Mail) *WebBuilder {
 	flags.ScopesFilePath = v.GetString(scopesFilePath)
 	flags.HydraAdminURL = v.GetString(hydraAdminURL)
 	flags.HydraPublicURL = v.GetString(hydraPublicURL)
+	flags.PublicURL = v.GetString(publicURL)
 	flags.DatabaseURL = v.GetString(databaseURL)
 	flags.SecretKey = v.GetString(secretKey)
 	flags.MailUser = v.GetString(mailUser)
@@ -108,6 +112,7 @@ func (flags *Flags) check() {
 	haveEmptyRequiredFlags := flags.BaseUIPath == "" ||
 		flags.HydraAdminURL == "" ||
 		flags.HydraPublicURL == "" ||
+		flags.PublicURL == "" ||
 		flags.ScopesFilePath == "" ||
 		flags.SecretKey == "" ||
 		flags.DatabaseURL == "" ||
@@ -120,6 +125,7 @@ func (flags *Flags) check() {
 		baseUIPath,
 		hydraAdminURL,
 		hydraPublicURL,
+		publicURL,
 		scopesFilePath,
 		secretKey,
 		databaseURL,