Skip to content

Commit 47d47ff

Browse files
authored
Merge branch 'parse-community:alpha' into alpha
2 parents 2bc68ce + fd22644 commit 47d47ff

File tree

8 files changed

+5185
-3409
lines changed

8 files changed

+5185
-3409
lines changed

.github/workflows/release-automated.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- run: npx semantic-release
3131
env:
3232
GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
3434
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
3535
- name: Determine tag on current commit
3636
id: tag

changelogs/CHANGELOG_alpha.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [3.4.2-alpha.1](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.1...3.4.2-alpha.1) (2022-04-09)
2+
3+
4+
### Bug Fixes
5+
6+
* security upgrade moment from 2.29.1 to 2.29.2 ([#1472](https://github.com/parse-community/Parse-SDK-JS/issues/1472)) ([893c2a5](https://github.com/parse-community/Parse-SDK-JS/commit/893c2a5b0504740d5001e5674b8eefbaab081764))
7+
18
# [3.4.0-alpha.3](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.0-alpha.2...3.4.0-alpha.3) (2021-12-05)
29

310

changelogs/CHANGELOG_release.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
## [3.4.1](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.0...3.4.1) (2022-01-01)
2+
3+
4+
### Bug Fixes
5+
6+
* upgrade idb-keyval from 5.0.6 to 6.0.3 ([#1397](https://github.com/parse-community/Parse-SDK-JS/issues/1397)) ([922a6db](https://github.com/parse-community/Parse-SDK-JS/commit/922a6dbb8e8208d18d0759543962cbb4c1ae6d96))
7+
8+
# [3.4.0](https://github.com/parse-community/Parse-SDK-JS/compare/3.3.1...3.4.0) (2021-11-01)
9+
10+
11+
### Bug Fixes
12+
13+
* update parse server dependency branch; recreate package lock ([#1424](https://github.com/parse-community/Parse-SDK-JS/issues/1424)) ([38455ef](https://github.com/parse-community/Parse-SDK-JS/commit/38455ef6770d108dbf2f34604dade6dc0d63a201))
14+
* upgrade @babel/runtime from 7.14.8 to 7.15.3 ([#1404](https://github.com/parse-community/Parse-SDK-JS/issues/1404)) ([8cb321c](https://github.com/parse-community/Parse-SDK-JS/commit/8cb321cbe81d51d4bbf94c2ac2638c14a0826bf4))
15+
16+
### Features
17+
18+
* add options to enable polling and set the polling interval; fixes excessive polling ([#1419](https://github.com/parse-community/Parse-SDK-JS/issues/1419)) ([0f804b8](https://github.com/parse-community/Parse-SDK-JS/commit/0f804b8760bba619080a79da5c6d3641f112b211))
19+
120
# [3.3.1](https://github.com/parse-community/Parse-SDK-JS/compare/3.3.0...3.3.1)
221

322
### Bug Fixes

integration/test/ParseUserTest.js

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const assert = require('assert');
44
const Parse = require('../../node');
55
const uuidv4 = require('uuid/v4');
6+
const { twitterAuthData } = require('./helper');
67

78
class CustomUser extends Parse.User {
89
constructor(attributes) {
@@ -953,21 +954,13 @@ describe('Parse User', () => {
953954

954955
it('can link with twitter', async () => {
955956
Parse.User.enableUnsafeCurrentUser();
956-
const authData = {
957-
id: 227463280,
958-
consumer_key: '5QiVwxr8FQHbo5CMw46Z0jquF',
959-
consumer_secret: 'p05FDlIRAnOtqJtjIt0xcw390jCcjj56QMdE9B52iVgOEb7LuK',
960-
auth_token: '227463280-lngpMGXdnG36JiuzGfAYbKcZUPwjmcIV2NqL9hWc',
961-
auth_token_secret: 'G1tl1R0gaYKTyxw0uYJDKRoVhM16ifyLeMwIaKlFtPkQr',
962-
};
963957
const user = new Parse.User();
964958
user.setUsername(uuidv4());
965959
user.setPassword(uuidv4());
966960
await user.signUp();
967961

968-
await user.linkWith('twitter', { authData });
969-
970-
expect(user.get('authData').twitter.id).toBe(authData.id);
962+
await user.linkWith('twitter', { authData: twitterAuthData });
963+
expect(user.get('authData').twitter.id).toBe(twitterAuthData.id);
971964
expect(user._isLinked('twitter')).toBe(true);
972965

973966
await user._unlinkFrom('twitter');
@@ -977,25 +970,18 @@ describe('Parse User', () => {
977970
it('can link with twitter and facebook', async () => {
978971
Parse.User.enableUnsafeCurrentUser();
979972
Parse.FacebookUtils.init();
980-
const authData = {
981-
id: 227463280,
982-
consumer_key: '5QiVwxr8FQHbo5CMw46Z0jquF',
983-
consumer_secret: 'p05FDlIRAnOtqJtjIt0xcw390jCcjj56QMdE9B52iVgOEb7LuK',
984-
auth_token: '227463280-lngpMGXdnG36JiuzGfAYbKcZUPwjmcIV2NqL9hWc',
985-
auth_token_secret: 'G1tl1R0gaYKTyxw0uYJDKRoVhM16ifyLeMwIaKlFtPkQr',
986-
};
987973
const user = new Parse.User();
988974
user.setUsername(uuidv4());
989975
user.setPassword(uuidv4());
990976
await user.signUp();
991977

992-
await user.linkWith('twitter', { authData });
978+
await user.linkWith('twitter', { authData: twitterAuthData });
993979
await Parse.FacebookUtils.link(user);
994980

995981
expect(Parse.FacebookUtils.isLinked(user)).toBe(true);
996982
expect(user._isLinked('twitter')).toBe(true);
997983

998-
expect(user.get('authData').twitter.id).toBe(authData.id);
984+
expect(user.get('authData').twitter.id).toBe(twitterAuthData.id);
999985
expect(user.get('authData').facebook.id).toBe('test');
1000986
});
1001987

integration/test/helper.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,22 @@ const mountPath = '/parse';
1414
const serverURL = 'http://localhost:1337/parse';
1515
let didChangeConfiguration = false;
1616

17+
/*
18+
To generate the auth data below, the Twitter app "GitHub CI Test App" has
19+
been created, managed by the @ParsePlatform Twitter account. In case this
20+
test starts to fail because the token has become invalid, generate a new
21+
token according to the OAuth process described in the Twitter docs[1].
22+
23+
[1] https://developer.twitter.com/en/docs/authentication/oauth-1-0a/obtaining-user-access-tokens
24+
*/
25+
const twitterAuthData = {
26+
id: '1506726799266430985',
27+
consumer_key: 'jeQw6luN2PEWREtoFDb0FdGYf',
28+
consumer_secret: 'VSFENh1X5UC4MLEuduHLtJDnf8Ydsh5KuSR4zZQufFCAGNtzcs',
29+
auth_token: '1506726799266430985-NKM9tqVbPXMnLhHTLYB98SNGtxxi6v',
30+
auth_token_secret: 'JpDVIINbqV5TK0th9nKiS1IVokZfjRj06FrXxCrkggF07',
31+
};
32+
1733
const defaultConfiguration = {
1834
databaseURI: 'mongodb://localhost:27017/integration',
1935
appId: 'integration',
@@ -34,8 +50,8 @@ const defaultConfiguration = {
3450
appIds: 'test',
3551
},
3652
twitter: {
37-
consumer_key: '5QiVwxr8FQHbo5CMw46Z0jquF',
38-
consumer_secret: 'p05FDlIRAnOtqJtjIt0xcw390jCcjj56QMdE9B52iVgOEb7LuK',
53+
consumer_key: twitterAuthData.consumer_key,
54+
consumer_secret: twitterAuthData.consumer_secret,
3955
},
4056
},
4157
verbose: false,
@@ -144,3 +160,5 @@ afterEach(async () => {
144160
await reconfigureServer();
145161
}
146162
});
163+
164+
module.exports = { twitterAuthData };

0 commit comments

Comments
 (0)