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

fix: incorrect assignment of displayName for Apple OAuth #425

Merged
merged 8 commits into from
Nov 6, 2023
Merged

fix: incorrect assignment of displayName for Apple OAuth #425

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7956e8
fix: incorrect assignment of `displayName`
Oct 26, 2023
7b4564a
fix: incorrect param being used to get user info
Oct 27, 2023
7cc7422
fix: profile no longer becomes stringified if user is already existing
Oct 27, 2023
8c0038f
refactor(oauth): parse the user displayName properly
onehassan Nov 3, 2023
960d21d
chore: refactor handler for apple oauth
onehassan Nov 3, 2023
21953d9
chore: add changeset
onehassan Nov 3, 2023
5b17b5a
chore: add error message when parsing user data from Apple's response
onehassan Nov 6, 2023
7a63363
chore: adjust warning message
onehassan Nov 6, 2023
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
23 changes: 17 additions & 6 deletions src/routes/oauth/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { GrantProvider, GrantResponse } from 'grant';
import jwt from 'jsonwebtoken';
import { NormalisedProfile } from './utils';
export const OAUTH_ROUTE = '/signin/provider';
import { logger } from '@/logger';

const azureBaseUrl = 'https://login.microsoftonline.com';
const workosBaseUrl = 'https://api.workos.com/sso';
Expand Down Expand Up @@ -54,12 +55,22 @@ export const PROVIDERS_CONFIG: Record<
profile: ({ jwt, profile }) => {
const payload = jwt?.id_token?.payload;

const isProfileError = typeof profile === 'object' && profile.error;
const userProfile = !isProfileError ? JSON.parse(profile) : null;
const displayName =
isProfileError && !userProfile
? payload.email
: `${userProfile.name.firstName} ${userProfile.name.lastName}`;
let displayName;

if (profile) {
try {
const userProfile = JSON.parse(profile);

displayName = userProfile.name
? `${userProfile.name.firstName} ${userProfile.name.lastName}`
: displayName;
} catch (error) {
logger.warn(error);
totzk9 marked this conversation as resolved.
Show resolved Hide resolved

// use the user's email as fallback
displayName = payload.email;
}
}

return {
id: payload.sub,
Expand Down