Merge remote-tracking branch 'origin/master'

client/src/i18n/translations_en.json

@@ -12,6 +12,7 @@
   "Button_Export": "Export",
   "Button_Email": "Email",
   "Button_ExportOrgChart": "Export Organizational Chart",
+  "Button_EmailTeam": "Email Team Members",
   "Button_GoBack": "Go Back",
   "Button_HelpdeskClearOtpSecret": "Clear OTP Secret",
   "Button_More": "More",

client/src/modules/helpdesk/verifications-dialog.controller.ts

@@ -53,7 +53,7 @@ export default class VerificationsDialogController {
     inputs: { name: string, label: string }[];
     isDetailsView: boolean;
     status: string;
-    tokenData: IVerificationTokenResponse;
+    tokenData: string;
     viewDetailsEnabled: boolean;
     verificationMethod: string;
     verificationStatus: string;
@@ -163,7 +163,9 @@ export default class VerificationsDialogController {
         let data = {};
         this.objectService.assign(data, this.formData);
         if (this.tokenData) {
-            this.objectService.assign(data, this.tokenData);
+            this.objectService.assign(data, {
+                tokenData: this.tokenData
+            });
         }
         this.helpDeskService.validateVerificationData(this.personUserKey, data, this.verificationMethod)
             .then((response) => {
@@ -190,6 +192,7 @@ export default class VerificationsDialogController {
         this.helpDeskService.sendVerificationToken(this.personUserKey, this.tokenDestinationID)
             .then((response) => {
                 this.verificationTokenSent = true;
+                this.tokenData = (response as any).data.tokenData;
             })
             .catch((reason) => {
                 this.verificationTokenSent = false;

client/src/modules/peoplesearch/orgchart-export.controller.ts

@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-import {IPeopleService} from '../../services/people.service';
+import {IPwmService} from '../../services/pwm.service';
 
 require('./orgchart-export.component.scss');
 
@@ -31,7 +31,7 @@ export default class OrgchartExportController {
         '$window',
         'IasDialogService',
         'translateFilter',
-        'peopleService',
+        'PwmService',
         'maxDepth',
         'personName',
         'userKey'
@@ -39,15 +39,18 @@ export default class OrgchartExportController {
     constructor(private $window: angular.IWindowService,
                 private IasDialogService: any,
                 private translateFilter: (id: string) => string,
-                private peopleService: IPeopleService,
+                private pwmService: IPwmService,
                 private maxDepth: number,
                 private personName: string,
                 private userKey: string) {
     }
 
     exportOrgChart() {
-        // tslint:disable-next-line
-        this.$window.location.href = `/pwm/private/peoplesearch?processAction=exportOrgChart&depth=${this.depth}&userKey=${this.userKey}`;
+        this.$window.location.href = this.pwmService.getServerUrl('exportOrgChart', {
+            depth: this.depth,
+            userKey: this.userKey
+        });
+
         this.IasDialogService.close();
     }
 }

client/src/services/helpdesk.service.ts

@@ -51,7 +51,7 @@ export interface IHelpDeskService {
     sendVerificationToken(userKey: string, choice: string): IPromise<IVerificationTokenResponse>;
     setPassword(userKey: string, random: boolean, password?: string): IPromise<ISuccessResponse>;
     unlockIntruder(userKey: string): IPromise<ISuccessResponse>;
-    validateVerificationData(userKey: string, formData: any, tokenData: any): IPromise<IVerificationStatus>;
+    validateVerificationData(userKey: string, formData: any, method: any): IPromise<IVerificationStatus>;
     showStrengthMeter: boolean;
 }
 

server/src/main/resources/password/pwm/i18n/Display.properties

@@ -66,6 +66,7 @@ Button_OK=OK
 Button_SendEmail=Send Email
 Button_Export=Export
 Button_ExportOrgChart=Export Organizational Chart
+Button_EmailTeam=Email Team Members
 Button_TokenVerification=Token Verification
 Button_SendToken=Send Token
 Display_ActivateUser=To confirm your identity, please enter the following information. Your information will be used to locate and activate your user account.<p/>Be sure to complete the process, or your account will not be activated properly.
@@ -296,6 +297,7 @@ Title_AnsweredQuestions=Answered Questions
 Title_ActivateUser=Activate Account
 Title_Admin=Administration
 Title_Application=Self Service Password Reset
+Title_Application_Abbrev=SSPR
 Title_Captcha=Verification
 Title_ChangePassword=Change Password
 Title_ConfirmResponses=Confirm Security Questions

webapp/src/main/webapp/WEB-INF/jsp/fragment/header-body.jsp

@@ -41,7 +41,10 @@
     <div id="header-center">
         <div id="header-center-left">
             <div id="header-page"><pwm:display key="${param['pwm.PageName']}" displayIfMissing="true"/></div>
-            <div id="header-title"><pwm:display key="Title_Application"/></div>
+            <div id="header-title">
+                <span class="title-long"><pwm:display key="Title_Application"/></span>
+                <span class="title-short"><pwm:display key="Title_Application_Abbrev"/></span>
+            </div>
         </div>
 
         <div id="header-center-right">