Skip to content

Commit c7ce610

Browse files
fix(oauth, apple): return tokens in response (#373)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent 3acf21a commit c7ce610

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

playground/server/routes/auth/apple.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
export default defineOAuthAppleEventHandler({
2-
async onSuccess(event, { user, tokens }) {
2+
async onSuccess(event, { user, tokens, payload }) {
33
const userToSet = user?.name?.firstName && user?.name?.lastName
44
? `${user.name.firstName} ${user.name.lastName}`
5-
: user?.name?.firstName || user?.name?.lastName || tokens.email || tokens.sub
5+
: user?.name?.firstName || user?.name?.lastName || payload.email || payload.sub
66

77
await setUserSession(event, {
88
user: {
99
apple: userToSet,
1010
},
11+
secure: {
12+
...tokens,
13+
},
1114
loggedInAt: Date.now(),
1215
})
1316

src/runtime/server/lib/oauth/apple.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,17 @@ export function defineOAuthAppleEventHandler({
162162
},
163163
})
164164

165-
const tokens = await verifyJwt<OAuthAppleTokens>(accessTokenResult.id_token, {
165+
const payload = await verifyJwt<OAuthAppleTokens>(accessTokenResult.id_token, {
166166
publicJwkUrl: 'https://appleid.apple.com/auth/keys',
167167
audience: config.clientId,
168168
issuer: 'https://appleid.apple.com',
169169
})
170170

171-
if (!tokens) {
172-
return handleAccessTokenErrorResponse(event, 'apple', tokens, onError)
171+
if (!payload) {
172+
return handleAccessTokenErrorResponse(event, 'apple', payload, onError)
173173
}
174174

175-
return onSuccess(event, { user, tokens })
175+
return onSuccess(event, { user, payload, tokens: accessTokenResult })
176176
}
177177
catch (error) {
178178
return handleAccessTokenErrorResponse(event, 'apple', error, onError)

0 commit comments

Comments
 (0)