S61866056 - Default the email address when clicking the link for a message.

Updated the redirect URL to have jobAppId.
Replaced jobAppId with actual ID.

frontend/angular/src/app/app.routing.ts

@@ -7,14 +7,14 @@ import { EditWorkflowTemplateComponent } from './components/admin-portal/edit-wo
 import { ListMessageTemplateComponent } from './components/admin-portal/list-message-template/list-message-template.component';
 import { ListWorkFlowsComponent } from './components/admin-portal/list-work-flows/list-work-flows.component';
 import { ApplicantPortalLayoutComponent } from './components/applicant-portal/applicant-portal-layout/applicant-portal-layout.component';
+import { EditApplicantComponent } from './components/edit-applicant/edit-applicant.component';
 import { MessageEngineComponent } from './components/message-engine/message-engine.component';
+import { SearchApplicantsComponent } from './components/search-applicants/search-applicants.component';
 import { AccessDeniedComponent } from './oneit/components/access-denied/access-denied.component';
 import { FullLayoutComponent } from './oneit/components/full-layout/full-layout.component';
 import { HomeComponent } from './oneit/components/home/home.component';
 import { IframePageComponent } from './oneit/components/iframe-page/iframe-page.component';
 import { AuthGuard } from './oneit/guards/auth.guard';
-import { SearchApplicantsComponent } from './components/search-applicants/search-applicants.component';
-import { EditApplicantComponent } from './components/edit-applicant/edit-applicant.component';
 
 export const routes: Routes = [
     {
@@ -143,7 +143,7 @@ export const routes: Routes = [
         canActivate: [AuthGuard],
         data: {
             privs: ['TL_AccessApplicantPortal'],
-            redirectPage: 'ApplicantPortal-ApplyJob.htm?cms.rm=SignIn&JobID=:jobId'
+            redirectPage: 'ApplicantPortal-ApplyJob.htm?cms.rm=SignIn&JobID=:jobId&JobAppID=:jobAppId'
         },
         children: [
             {

frontend/angular/src/app/oneit/guards/auth.guard.ts

@@ -2,13 +2,13 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
-
 import { environment } from '../../../environments/environment';
-
 import { ApiService } from '../services/api.service';
 import { UserService } from '../services/user.service';
 import { UtilsService } from '../services/utils.service';
 
+
+
 @Injectable()
 export class AuthGuard implements CanActivate {
     constructor(
@@ -35,10 +35,19 @@ export class AuthGuard implements CanActivate {
                         let redirectPage = route.data.redirectPage || 'editor/';
                         this.userService.setDetailsFromData(data);
                         if (data.UserName === 'noprivauthtoken') {
+                            let replaced =  false;
                             const url = window.location.href;
                             const matches = url.match(/job\/(\d+)\/message-engine/);
+                            const matches2 = url.match(/applicant\/(\d+)\/job/);
                             if (matches && matches[1]) {
                                 redirectPage = redirectPage.replace(':jobId', matches[1]);
+                                replaced = true;
+                            }
+                            if (matches2 && matches2[1]) {
+                                redirectPage = redirectPage.replace(':jobAppId', matches2[1]);
+                                replaced = true;
+                            }
+                            if (replaced) {
                                 window.location.href = `${environment.baseUrl + redirectPage}&from=Messaging`;
 
                                 return false;