wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-29 11:31:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UBERF-6310: Fix context passing (#5167)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-04-03 21:52:38 +07:00 committed by GitHub
parent dc7512a844
commit 1664419b7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pods/authProviders/src/github.ts
View File

@ -6,7 +6,7 @@ import { Strategy as GitHubStrategy } from 'passport-github2'
import { Passport } from '.'
export function registerGithub (
ctx: MeasureContext,
measureCtx: MeasureContext,
passport: Passport,
router: Router<any, any>,
accountsUrl: string,
@ -45,23 +45,27 @@ export function registerGithub (
const email = ctx.state.user.emails?.[0]?.value ?? `github:${ctx.state.user.username}`
const [first, last] = ctx.state.user.displayName.split(' ')
if (email !== undefined) {
if (ctx.query?.state != null) {
const loginInfo = await joinWithProvider(ctx, db, productId, email, first, last, ctx.query.state, {
githubId: ctx.state.user.id
})
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
}
} else {
const loginInfo = await loginWithProvider(ctx, db, productId, email, first, last, {
githubId: ctx.state.user.id
})
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
try {
if (ctx.query?.state != null) {
const loginInfo = await joinWithProvider(measureCtx, db, productId, email, first, last, ctx.query.state, {
githubId: ctx.state.user.id
})
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
}
} else {
const loginInfo = await loginWithProvider(measureCtx, db, productId, email, first, last, {
githubId: ctx.state.user.id
})
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
}
}
// Successful authentication, redirect to your application
ctx.redirect(concatLink(frontUrl, '/login/auth'))
} catch (err: any) {
await measureCtx.error('failed to auth', err)
}
// Successful authentication, redirect to your application
ctx.redirect(concatLink(frontUrl, '/login/auth'))
}
await next()
}

29
pods/authProviders/src/google.ts
View File

@ -6,7 +6,7 @@ import { Strategy as GoogleStrategy } from 'passport-google-oauth20'
import { Passport } from '.'
export function registerGoogle (
ctx: MeasureContext,
measureCtx: MeasureContext,
passport: Passport,
router: Router<any, any>,
accountsUrl: string,
@ -46,19 +46,24 @@ export function registerGoogle (
const first = ctx.state.user.name.givenName
const last = ctx.state.user.name.familyName
if (email !== undefined) {
if (ctx.query?.state != null) {
const loginInfo = await joinWithProvider(ctx, db, productId, email, first, last, ctx.query.state)
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
}
} else {
const loginInfo = await loginWithProvider(ctx, db, productId, email, first, last)
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
try {
if (ctx.query?.state != null) {
const loginInfo = await joinWithProvider(measureCtx, db, productId, email, first, last, ctx.query.state)
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
}
} else {
const loginInfo = await loginWithProvider(measureCtx, db, productId, email, first, last)
if (ctx.session != null) {
ctx.session.loginInfo = loginInfo
}
}
// Successful authentication, redirect to your application
ctx.redirect(concatLink(frontUrl, '/login/auth'))
} catch (err: any) {
await measureCtx.error('failed to auth', err)
}
// Successful authentication, redirect to your application
ctx.redirect(concatLink(frontUrl, '/login/auth'))
}
await next()
}