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

Fix apple signin authAdapter #5891

Merged
merged 2 commits into from
Aug 7, 2019
Merged

Fix apple signin authAdapter #5891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1290fd9
Fix apple signin authAdapter to use the user id instead of the user t…
SebC99 Aug 7, 2019
f92931d
Update spec
SebC99 Aug 7, 2019
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
11 changes: 7 additions & 4 deletions spec/AuthenticationAdapters.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ describe('apple signin auth adapter', () => {
it('should not verify invalid id_token', async () => {
try {
await apple.validateAuthData(
{ id: 'the_token' },
{ id: 'the_user_id', token: 'the_token' },
{ client_id: 'secret' }
);
fail();
Expand All @@ -1118,11 +1118,12 @@ describe('apple signin auth adapter', () => {
iss: 'https://appleid.apple.com',
aud: 'secret',
exp: Date.now(),
sub: 'the_user_id',
};
spyOn(jwt, 'verify').and.callFake(() => fakeClaim);

const result = await apple.validateAuthData(
{ id: 'the_token' },
{ id: 'the_user_id', token: 'the_token' },
{ client_id: 'secret' }
);
expect(result).toEqual(fakeClaim);
Expand All @@ -1131,12 +1132,13 @@ describe('apple signin auth adapter', () => {
it('should throw error with with invalid jwt issuer', async () => {
const fakeClaim = {
iss: 'https://not.apple.com',
sub: 'the_user_id',
};
spyOn(jwt, 'verify').and.callFake(() => fakeClaim);

try {
await apple.validateAuthData(
{ id: 'the_token' },
{ id: 'the_user_id', token: 'the_token' },
{ client_id: 'secret' }
);
fail();
Expand All @@ -1151,12 +1153,13 @@ describe('apple signin auth adapter', () => {
const fakeClaim = {
iss: 'https://appleid.apple.com',
aud: 'invalid_client_id',
sub: 'the_user_id',
};
spyOn(jwt, 'verify').and.callFake(() => fakeClaim);

try {
await apple.validateAuthData(
{ id: 'the_token' },
{ id: 'the_user_id', token: 'the_token' },
{ client_id: 'secret' }
);
fail();
Expand Down
10 changes: 8 additions & 2 deletions src/Adapters/Auth/apple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const getApplePublicKey = async () => {
return currentKey;
};

const verifyIdToken = async (token, clientID) => {
const verifyIdToken = async ({ token, id }, clientID) => {
if (!token) {
throw new Parse.Error(
Parse.Error.OBJECT_NOT_FOUND,
Expand All @@ -45,6 +45,12 @@ const verifyIdToken = async (token, clientID) => {
`id token not issued by correct OpenID provider - expected: ${TOKEN_ISSUER} | from: ${jwtClaims.iss}`
);
}
if (jwtClaims.sub !== id) {
throw new Parse.Error(
Parse.Error.OBJECT_NOT_FOUND,
`auth data is invalid for this user.`
);
}
if (clientID !== undefined && jwtClaims.aud !== clientID) {
throw new Parse.Error(
Parse.Error.OBJECT_NOT_FOUND,
Expand All @@ -56,7 +62,7 @@ const verifyIdToken = async (token, clientID) => {

// Returns a promise that fulfills if this id token is valid
function validateAuthData(authData, options = {}) {
return verifyIdToken(authData.id, options.client_id);
return verifyIdToken(authData, options.client_id);
}

// Returns a promise that fulfills if this app id is valid.
Expand Down