Fix apple signin authAdapter (#5891)
* Fix apple signin authAdapter to use the user id instead of the user token * Update spec
This commit is contained in:
@@ -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();
|
||||
@@ -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);
|
||||
@@ -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();
|
||||
@@ -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();
|
||||
|
||||
@@ -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,
|
||||
@@ -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,
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user