Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Google SAML support #334

Merged
merged 1 commit into from
May 20, 2024
Merged

Improve Google SAML support #334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions packages/backend/src/api/v1/auth/saml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,35 @@ export async function getLoginUrl(orgId: string) {
return context
}

function parseAttributes(attributes: any) {
let email = ""
// This function parses the attributes from the SAML response
// and returns the email and name
function parseAttributes(attributes: any, nameID: string) {
let email = nameID
let name = ""

for (const key in attributes) {
if (key.toLowerCase().includes("emailaddress")) {
if (
key.toLowerCase().includes("emailaddress") ||
key.toLowerCase() === "email"
) {
email = sanitizeEmail(attributes[key])
} else if (key.toLowerCase().includes("displayname")) {
} else if (
key.toLowerCase().includes("displayname") ||
key.toLowerCase() === "name"
) {
name = attributes[key]
}
}

if (!name && attributes.firstname && attributes.lastname) {
name = `${attributes.firstname} ${attributes.lastname}`
}

return { email, name }
}

route.get("/success", async (ctx: Context) => {
const { orgId } = ctx.params as { orgId: string }
// const { orgId } = ctx.params as { orgId: string }

ctx.redirect(process.env.APP_URL!)
})
Expand Down Expand Up @@ -137,7 +150,7 @@ route.post("/acs", async (ctx: Context) => {

const parsedResult = await sp.parseLoginResponse(idp, "post", ctx.request)

const { attributes, conditions } = parsedResult.extract
const { attributes, conditions, nameID } = parsedResult.extract

if (!attributes) {
ctx.throw(400, "No attributes found")
Expand All @@ -153,7 +166,7 @@ route.post("/acs", async (ctx: Context) => {
}
}

const { email, name } = parseAttributes(attributes)
const { email, name } = parseAttributes(attributes, nameID)

const singleUseToken = await generateOneTimeToken()

Expand All @@ -172,8 +185,8 @@ route.post("/acs", async (ctx: Context) => {
})

route.post("/slo", async (ctx: Context) => {
const { orgId } = ctx.params as { orgId: string }
ctx.body = "SAML SLO received for orgId: " + orgId
// const { orgId } = ctx.params as { orgId: string }
ctx.body = "SAML SLO"
})

export default route
Loading