awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-03 21:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct frontend email to username in AppLayout

Browse Source
This commit is contained in:
Tuan Dang
2024-03-06 13:14:50 -08:00
parent 2eca9d8200
commit 7d495cfea5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/routes/v1/saml-router.ts
+4 -3
View File
@@ -99,14 +99,15 @@ export const registerSamlRouter = async (server: FastifyZodProvider) => {
async (req, profile, cb) => { async (req, profile, cb) => {
try { try {
if (!profile) throw new BadRequestError({ message: "Missing profile" }); if (!profile) throw new BadRequestError({ message: "Missing profile" });
const email = profile?.email ?? (profile?.emailAddress as string); // emailRippling is added because in Rippling the field `email` reserved
if (!profile.nameID || !profile.firstName) { if (!profile.email || !profile.firstName) {
throw new BadRequestError({ message: "Invalid request. Missing email or first name" }); throw new BadRequestError({ message: "Invalid request. Missing email or first name" });
} }
const { isUserCompleted, providerAuthToken } = await server.services.saml.samlLogin({ const { isUserCompleted, providerAuthToken } = await server.services.saml.samlLogin({
username: profile.nameID, username: profile.nameID ?? email,
email: profile.email, email,
firstName: profile.firstName as string, firstName: profile.firstName as string,
lastName: profile.lastName as string, lastName: profile.lastName as string,
relayState: (req.body as { RelayState?: string }).RelayState, relayState: (req.body as { RelayState?: string }).RelayState,
frontend/src/layouts/AdminLayout/AdminLayout.tsx
+1 -1
View File
@@ -121,7 +121,7 @@ export const AdminLayout = ({ children }: LayoutProps) => {
</div> </div>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent align="start" className="p-1"> <DropdownMenuContent align="start" className="p-1">
<div className="px-2 py-1 text-xs text-mineshaft-400">{user?.email}</div> <div className="px-2 py-1 text-xs text-mineshaft-400">{user.username}</div>
<Link href="/personal-settings"> <Link href="/personal-settings">
<DropdownMenuItem>Personal Settings</DropdownMenuItem> <DropdownMenuItem>Personal Settings</DropdownMenuItem>
</Link> </Link>
frontend/src/layouts/AppLayout/AppLayout.tsx
+2 -2
View File
@@ -291,7 +291,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
</div> </div>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent align="start" className="p-1"> <DropdownMenuContent align="start" className="p-1">
<div className="px-2 py-1 text-xs text-mineshaft-400">{user?.email}</div> <div className="px-2 py-1 text-xs text-mineshaft-400">{user?.username}</div>
{orgs?.map((org) => { {orgs?.map((org) => {
return ( return (
<DropdownMenuItem key={org.id}> <DropdownMenuItem key={org.id}>
@@ -366,7 +366,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
</div> </div>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent align="start" className="p-1"> <DropdownMenuContent align="start" className="p-1">
<div className="px-2 py-1 text-xs text-mineshaft-400">{user?.email}</div> <div className="px-2 py-1 text-xs text-mineshaft-400">{user?.username}</div>
<Link href="/personal-settings"> <Link href="/personal-settings">
<DropdownMenuItem>Personal Settings</DropdownMenuItem> <DropdownMenuItem>Personal Settings</DropdownMenuItem>
</Link> </Link>