Skip to content

Commit 29d11c6

Browse files
committed
Fix: Domain before User's LoginName handling fix
1 parent d325279 commit 29d11c6

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

apps/sensenet/src/components/appbar/desktop-nav-menu.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,8 @@ export const DesktopNavMenu: FunctionComponent = () => {
128128
service.setPersonalSettingsValue({ ...settings, preferDisplayName: event.target.checked })
129129
}
130130

131-
let DomainAndLoginName = ''
132-
if (user?.Domain && user?.LoginName) {
133-
DomainAndLoginName = `${user?.Domain}\\${user?.LoginName}`
134-
}
131+
const DomainAndLoginName =
132+
user?.Domain && user?.Domain !== '' ? `${user?.Domain}\\${user?.LoginName}` : user?.LoginName
135133

136134
return (
137135
<div className={clsx(globalClasses.centered, classes.navMenu)}>

packages/sn-auth-react/src/models/user.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ export interface User {
33
Path: string
44
FullName: string
55
LoginName: string
6+
Domain: string
67
Avatar: Avatar
78
DisplayName: string
89
Name: string

0 commit comments

Comments
 (0)