diff --git a/traffic_ops/app/conf/cdn.conf b/traffic_ops/app/conf/cdn.conf
index 11a7068cc0..6389693878 100644
--- a/traffic_ops/app/conf/cdn.conf
+++ b/traffic_ops/app/conf/cdn.conf
@@ -20,8 +20,10 @@
no_account_found_msg => 'A Traffic Ops user account is required for access. Please contact your Traffic Ops user administrator.' # message to display if no TO account is found in tm_user
},
portal => {
- base_url => 'http://localhost:8080', # this is where the traffic portal resides (a javascript client that consumes the TO API)
- email_from => 'no-reply@traffic-portal-domain.com' # traffic portal email address
+ base_url => 'http://localhost:8080/!#/', # this is where the traffic portal resides (a javascript client that consumes the TO API). Trailing slash is important!
+ email_from => 'no-reply@traffic-portal-domain.com', # traffic portal email address
+ pass_reset_path => 'user', # path where user is sent to reset password. Leverages portal.base_url so you end up with http://localhost:8080/!#/path
+ user_register_path => 'user' # path where user is sent to complete user registration. Leverages portal.base_url so you end up with http://localhost:8080/!#/path
},
# 1st secret is used to generate new signatures. Older one kept around for existing signed cookies.
diff --git a/traffic_ops/app/lib/MojoPlugins/Email.pm b/traffic_ops/app/lib/MojoPlugins/Email.pm
index 86feed51cb..008cc5bd71 100755
--- a/traffic_ops/app/lib/MojoPlugins/Email.pm
+++ b/traffic_ops/app/lib/MojoPlugins/Email.pm
@@ -77,16 +77,16 @@ sub register {
my $email_to = shift || confess("Please supply an email address.");
my $token = shift || confess("Please supply a GUID token");
- my $portal_base_url = $self->config->{'portal'}{'base_url'};
- my $portal_email_from = $self->config->{'portal'}{'email_from'};
+ my $portal_pass_reset_url = $self->config->{'portal'}{'base_url'} . $self->config->{'portal'}{'pass_reset_path'};
+ my $portal_email_from = $self->config->{'portal'}{'email_from'};
$self->app->log->info( "MOJO_CONFIG: " . $ENV{MOJO_CONFIG} );
- $self->app->log->info( "portal_base_url: " . $portal_base_url );
+ $self->app->log->info( "portal_pass_reset_url: " . $portal_pass_reset_url );
my $tm_user = {
- email => $email_to,
- portal_base_url => $portal_base_url,
- token => $token,
+ email => $email_to,
+ portal_pass_reset_url => $portal_pass_reset_url,
+ token => $token,
};
my $instance_name =
@@ -128,16 +128,16 @@ sub register {
my $email_to = shift || confess("Please supply an email address.");
my $token = shift || confess("Please supply a GUID token");
- my $portal_base_url = $self->config->{'portal'}{'base_url'};
- my $portal_email_from = $self->config->{'portal'}{'email_from'};
+ my $portal_user_register_url = $self->config->{'portal'}{'base_url'} . $self->config->{'portal'}{'user_register_path'};
+ my $portal_email_from = $self->config->{'portal'}{'email_from'};
$self->app->log->info( "MOJO_CONFIG: " . $ENV{MOJO_CONFIG} );
- $self->app->log->info( "portal_base_url: " . $portal_base_url );
+ $self->app->log->info( "portal_user_register_url: " . $portal_user_register_url );
my $tm_user = {
- email => $email_to,
- portal_base_url => $portal_base_url,
- token => $token,
+ email => $email_to,
+ portal_user_register_url => $portal_user_register_url,
+ token => $token,
};
my $instance_name =
diff --git a/traffic_ops/app/templates/user/registration.mail.ep b/traffic_ops/app/templates/user/registration.mail.ep
index d9017e9035..a4188303b4 100644
--- a/traffic_ops/app/templates/user/registration.mail.ep
+++ b/traffic_ops/app/templates/user/registration.mail.ep
@@ -37,7 +37,7 @@
A new account has been created for you on the <%= $instance_name %> Portal. In the <%= $instance_name %> Portal, you'll find a dashboard that provides access to all of your delivery services.
- Click to Finish Your Registration
+ Click to Finish Your Registration
Thank you,
The <%= $instance_name %> Team
diff --git a/traffic_ops/app/templates/user/reset_password.mail.ep b/traffic_ops/app/templates/user/reset_password.mail.ep
index 830ffb990b..d3e526b25d 100644
--- a/traffic_ops/app/templates/user/reset_password.mail.ep
+++ b/traffic_ops/app/templates/user/reset_password.mail.ep
@@ -36,7 +36,7 @@
Someone has requested to change your password for the <%= $instance_name %>. If you requested this change, please click the link below and change your password. Otherwise, you can disregard this email.
- Click to Reset Your Password
+ Click to Reset Your Password
Thank you,
The <%= $instance_name %> Team
diff --git a/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html b/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html
index 4dc3a13081..57badfd0be 100644
--- a/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html
@@ -79,16 +79,16 @@