Problem

The external approver portal (login, "Create account", "Send me login link", "Forgot Password") is shared by both apps. The activation email sent from "Create account", the login link email and the password reset email always carry the Jira app's name, "Approval Path for Jira", also for external approvers of Confluence approvals. The first activation email, sent together with the first "Action required" email, already uses the right app.

Since AP-2530, an external approver whose decision link expired goes through these pages to reach the approval, so Confluence approvers get Jira-branded emails more often.

Change

• When the person reached the portal page from an approval (the page carries that approval as the target after login), the activation, login link and password reset emails use that approval's app: "Approval Path for Confluence" for a Confluence approval, "Approval Path for Jira" for a Jira approval.

• Without such a target, these emails name neither app: "Approval Path".

• The same rule applies to the "Account Registration" email that "Create account" sends for an address that already has an account.

• The approval's app is used only when the address typed in the form is an approver of that approval; otherwise the emails say "Approval Path".

Fixes included

• The approver portal now recognizes an external approver whose address was entered with different capitals (for example Ann.Lee@Corp.com): the approval shows in their Awaiting/History lists and counts, opens and can be decided after login, and the portal emails name its app.

• The portal lists and counts show an approval once even when several of its steps go to the same email address (also with different letter case); before, it appeared once per step.

• Approval ids up to 10 digits in portal login and activation links are recognised.

• An active Notification email step no longer hides the consent buttons in the portal.

Acceptance criteria

• A Confluence external approver who follows an expired decision link and uses "Create account", "Send me login link" or "Forgot Password" gets emails that name "Approval Path for Confluence" and never Jira.

• The same steps for a Jira approval give "Approval Path for Jira".

• Opening the portal login page directly and using those links gives emails that name "Approval Path".

• The first activation email sent with the first "Action required" email is unchanged.

Manual tester notes

On QA the app names end with "(QA)".

• Confluence approval with an external approver: in a private window, click "Review and respond to the request." in the Action required email. On the login page use "Create account", then "Send me login link", then "Forgot Password" with the approver's address. Each email's header and footer name "Approval Path for Confluence", never Jira.

• Repeat for a Jira approval: the emails name "Approval Path for Jira", never Confluence.

• Open the portal login page directly and use the same links: the emails name "Approval Path".

• The first activation email sent with the first Action required email still names the approval's app.

• Confluence approval with an email step entered in mixed case (Ann.Lee@...): from the Action required email, use "Send me login link" with the lower-case address. The email names the Confluence app. After logging in, the approval opens with Approve/Reject and is listed under Awaiting with the right count; after deciding, it moves to History.

• An approval with two email steps for the same address, one in mixed case: the portal shows it once in Awaiting, with a count of 1.