Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
479 changes: 258 additions & 221 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@semantic-release/changelog": "6.0.3",
"@semantic-release/commit-analyzer": "13.0.1",
"@semantic-release/git": "10.0.1",
"@semantic-release/github": "11.0.2",
"@semantic-release/github": "11.0.3",
"@semantic-release/npm": "12.0.1",
"@semantic-release/release-notes-generator": "14.0.3",
"all-node-versions": "13.0.1",
Expand Down
5 changes: 3 additions & 2 deletions spec/AuthenticationAdaptersV2.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@ describe('Auth Adapter features', () => {
const user = new Parse.User();

const payload = { someData: true };
const payload2 = { someData: false };

await user.save({
username: 'test',
Expand All @@ -829,10 +830,10 @@ describe('Auth Adapter features', () => {
expect(firstCall[2].user.id).toEqual(user.id);
expect(firstCall.length).toEqual(3);

await user.save({ authData: { baseAdapter2: payload } }, { useMasterKey: true });
await user.save({ authData: { baseAdapter2: payload2 } }, { useMasterKey: true });

const secondCall = baseAdapter2.validateAuthData.calls.argsFor(1);
expect(secondCall[0]).toEqual(payload);
expect(secondCall[0]).toEqual(payload2);
expect(secondCall[1]).toEqual(baseAdapter2);
expect(secondCall[2].isChallenge).toBeUndefined();
expect(secondCall[2].master).toEqual(true);
Expand Down
109 changes: 109 additions & 0 deletions spec/RestWrite.handleAuthData.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
describe('RestWrite.handleAuthData', () => {
const MOCK_USER_ID = 'mockUserId';
const MOCK_ACCESS_TOKEN = 'mockAccessToken123';

const createMockUser = () => ({
id: MOCK_USER_ID,
code: 'C1',
});

const mockGooglePlayGamesAPI = () => {
mockFetch([
{
url: 'https://oauth2.googleapis.com/token',
method: 'POST',
response: {
ok: true,
json: () => Promise.resolve({ access_token: MOCK_ACCESS_TOKEN }),
},
},
{
url: `https://www.googleapis.com/games/v1/players/${MOCK_USER_ID}`,
method: 'GET',
response: {
ok: true,
json: () => Promise.resolve({ playerId: MOCK_USER_ID }),
},
},
]);
};

const setupAuthConfig = () => {
return reconfigureServer({
auth: {
gpgames: {
clientId: 'validClientId',
clientSecret: 'validClientSecret',
},
instagram: {
clientId: 'validClientId',
clientSecret: 'validClientSecret',
redirectUri: 'https://example.com/callback',
},
},
});
};

beforeEach(async () => {
await setupAuthConfig();
});

it('should unlink provider via null', async () => {
mockGooglePlayGamesAPI();

const authData = createMockUser();
const user = await Parse.User.logInWith('gpgames', { authData });
const sessionToken = user.getSessionToken();

await user.fetch({ sessionToken });
const currentAuthData = user.get('authData');
expect(currentAuthData).toBeDefined();

// Add another provider to ensure gpgames removal doesn't delete all authData
mockFetch([
{
url: 'https://api.instagram.com/oauth/access_token',
method: 'POST',
response: {
ok: true,
json: () => Promise.resolve({ access_token: 'ig_token' }),
},
},
{
url: 'https://graph.instagram.com/me?fields=id&access_token=ig_token',
method: 'GET',
response: {
ok: true,
json: () => Promise.resolve({ id: 'I1' }),
},
},
]);

user.set('authData', {
...currentAuthData,
instagram: { id: 'I1', code: 'IC1' },
});
await user.save(null, { sessionToken });

await user.fetch({ sessionToken });
const authDataWithInstagram = user.get('authData');
expect(authDataWithInstagram).toBeDefined();
expect(authDataWithInstagram.gpgames).toBeDefined();
expect(authDataWithInstagram.instagram).toBeDefined();

// Now unlink gpgames
user.set('authData', {
...authDataWithInstagram,
gpgames: null,
});
await user.save(null, { sessionToken });

const updatedUser = await new Parse.Query(Parse.User).get(user.id, { useMasterKey: true });
const finalAuthData = updatedUser.get('authData');

expect(finalAuthData).toBeDefined();
expect(finalAuthData.gpgames).toBeUndefined();
expect(finalAuthData.instagram).toBeDefined();
expect(finalAuthData.instagram.id).toBe('I1');
});
});
Loading