Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-02-17 22:04:19 -05:00
Code Issues Activity

feat(core): enable pass redirectUri when sign-in with social (#284)

Browse source
This commit is contained in:
Darcy Ye 2022-02-25 14:52:38 +08:00 • committed by GitHub
parent 2109b7be31
commit ddd695dd33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/core/src/lib/session.ts
View file

@ -1,10 +1,6 @@
import { Context } from 'koa';
import { InteractionResults, Provider } from 'oidc-provider';
// TODO: change this after frontend is ready.
// Should combine baseUrl(domain) from database with a 'callback' endpoint.
export const connectorRedirectUrl = 'https://logto.dev/callback';
export const assignInteractionResults = async (
ctx: Context,
provider: Provider,

15
packages/core/src/routes/session.ts
View file

@ -10,7 +10,7 @@ import { object, string } from 'zod';
import { getSocialConnectorInstanceById } from '@/connectors';
import RequestError from '@/errors/RequestError';
import { createPasscode, sendPasscode, verifyPasscode } from '@/lib/passcode';
import { assignInteractionResults, connectorRedirectUrl } from '@/lib/session';
import { assignInteractionResults } from '@/lib/session';
import {
findSocialRelatedUser,
getUserInfoByAuthCode,
@ -164,18 +164,23 @@ export default function sessionRoutes<T extends AnonymousRouter>(router: T, prov
router.post(
'/session/sign-in/social',
koaGuard({
body: object({ connectorId: string(), code: string().optional(), state: string() }),
body: object({
connectorId: string(),
code: string().optional(),
state: string(),
redirectUri: string(),
}),
}),
async (ctx, next) => {
const { connectorId, code, state } = ctx.guard.body;
const { connectorId, code, state, redirectUri } = ctx.guard.body;
ctx.userLog.connectorId = connectorId;
ctx.userLog.type = UserLogType.SignInSocial;
if (!code) {
assertThat(state, 'session.insufficient_info');
assertThat(state && redirectUri, 'session.insufficient_info');
const connector = await getSocialConnectorInstanceById(connectorId);
assertThat(connector.connector.enabled, 'connector.not_enabled');
const redirectTo = await connector.getAuthorizationUri(connectorRedirectUrl, state);
const redirectTo = await connector.getAuthorizationUri(redirectUri, state);
ctx.body = { redirectTo };
return next();