Skip to content

Commit 5de9263

Browse files
committed
fix: in browser we get message welcome back, a*** on login
1 parent 86a496b commit 5de9263

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/nls/root/strings.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,6 +1615,7 @@ define({
16151615
"CHECKING_STATUS": "Checking login status\u2026",
16161616
"NOT_SIGNED_IN_YET": "Not signed in yet. Please complete sign-in in the other tab.",
16171617
"WELCOME_BACK": "Welcome back, {0}!",
1618+
"WELCOME_BACK_USER": "Welcome back, {0}!",
16181619
"POPUP_BLOCKED": "Pop-up blocked. Please allow pop-ups and try again, or manually navigate to {0}",
16191620

16201621
// Collapse Folders

src/services/login-browser.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,12 @@ define(function (require, exports, module) {
268268
function _onLoginSuccess() {
269269
if (loginWaitingDialog) {
270270
const $template = loginWaitingDialog.getElement();
271+
const welcomeBackMessage = Phoenix.isNativeApp ?
272+
StringUtils.format(Strings.WELCOME_BACK_USER, userProfile.firstName): Strings.WELCOME_BACK;
273+
// in desktop app, the apis return full username so we can show `Welcome back, alice`, but in
274+
// browser app, we only get name like `a***` due to security posture, so we show `Welcome back` in browser.
271275
$template.find('#login-status')
272-
.text(StringUtils.format(Strings.WELCOME_BACK, userProfile.firstName))
276+
.text(welcomeBackMessage)
273277
.css('color', '#10b981');
274278
setTimeout(() => {
275279
_cancelLoginWaiting();

0 commit comments

Comments
 (0)