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.

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

chore: Merging main branch into modular-sdk #1443

Merged
merged 119 commits into from
Sep 30, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
f3b3caa
chore(core): Automate Daily Integration Tests (#1130)
lahirumaramba Jan 12, 2021
8ae44ce
Updating Google Cloud naming (#1122)
egilmorez Jan 14, 2021
1862342
update typo in interface name (#1138)
suchcodemuchwow Jan 22, 2021
6ce98e2
Improve token verification logic with Auth Emulator. (#1148)
yuchenshi Feb 4, 2021
01d8177
feat: Exporting all types of Messages so they can be used by consumer…
BorntraegerMarc Feb 4, 2021
fc2f557
feat(auth): Implement getUserByProviderId (#769)
rsgowman Feb 8, 2021
a00ce05
Allow enabling of anonymous provider via tenant configuration (#802)
rsgowman Feb 8, 2021
bea66a9
feat(auth): Add ability to link a federated ID with the `updateUser()…
rsgowman Feb 9, 2021
5c60cc4
(chore): Export UserProvider type and add it to toc.yaml (#1165)
lahirumaramba Feb 10, 2021
9585775
[chore] Release 9.5.0 (#1167)
lahirumaramba Feb 10, 2021
93362d5
chore: Updated doc generator for typedoc 0.19.0 (#1166)
hiranya911 Feb 11, 2021
6bcffa2
Update HOME.md (#1181)
egilmorez Feb 26, 2021
994fd43
feat(rtdb): Support emulator mode for rules management operations (#1…
hiranya911 Mar 10, 2021
bf4bacb
fix: Decoupled proactive token refresh from FirebaseApp (#1194)
hiranya911 Mar 18, 2021
738eba7
fix(rtdb): Fixing the RTDB token listener callback (#1203)
hiranya911 Mar 19, 2021
97d3823
Add emulator-based integration tests. (#1155)
yuchenshi Mar 23, 2021
19660d9
Disable one flaky tests in emulator. (#1205)
yuchenshi Mar 25, 2021
2a5b7f6
[chore] Release 9.6.0 (#1209)
hiranya911 Mar 29, 2021
60b4e29
(chore): Add JWT Decoder and Signature Verifier (#1204)
lahirumaramba Mar 30, 2021
1254850
chore: Add Mailgun send email action (#1210)
lahirumaramba Mar 31, 2021
e9e8a03
chore: Fix bug in send-email action code (#1214)
lahirumaramba Apr 1, 2021
1cc82ae
Change dispatch event name in nightly workflow (#1216)
lahirumaramba Apr 1, 2021
d961c3f
chore: Clean up nightly workflow trigger tests (#1212)
lahirumaramba Apr 1, 2021
da0f44f
Add support for FIREBASE_STORAGE_EMULATOR_HOST env var (#1175)
abeisgoat Apr 8, 2021
011c530
Revert "Disable one flaky tests in emulator. (#1205)" (#1227)
yuchenshi Apr 14, 2021
58f60d6
fix(rtdb): Fixing a token refresh livelock in Cloud Functions (#1234)
hiranya911 Apr 23, 2021
be4ebc6
[chore] Release 9.7.0 (#1240)
lahirumaramba Apr 27, 2021
c6e9ef7
fix: adds missing EMAIL_NOT_FOUND error code (#1246)
bojeil-google May 3, 2021
d8b769a
build(deps-dev): bump lodash from 4.17.19 to 4.17.21 (#1255)
dependabot[bot] May 6, 2021
43bfbd9
chore: Upgraded RTDB and other @firebase dependencies (#1250)
hiranya911 May 6, 2021
e65dbcf
build(deps): bump y18n from 3.2.1 to 3.2.2 (#1208)
dependabot[bot] May 6, 2021
3ae6a69
Fix storage emulator env formatting (#1257)
abeisgoat May 10, 2021
8267b56
build(deps): bump hosted-git-info from 2.8.8 to 2.8.9 (#1260)
dependabot[bot] May 10, 2021
b88f891
feat: Add abuse reduction support (#1264)
lahirumaramba May 10, 2021
ab034f5
Fix @types/node conflict with grpc and port type (#1258)
nikhilag May 10, 2021
e5dc9f8
[chore] Release 9.8.0 (#1266)
lahirumaramba May 10, 2021
e759958
build(deps): bump handlebars from 4.7.6 to 4.7.7 (#1253)
dependabot[bot] May 10, 2021
e7155ea
build(deps): bump jose from 2.0.4 to 2.0.5 (#1265)
dependabot[bot] May 10, 2021
fd23ad0
fix: Revert regression introduced in #1257 (#1277)
hiranya911 May 18, 2021
3b48235
fix(auth): make MFA uid optional for updateUser operations (#1278)
bojeil-google May 18, 2021
3a2d2fa
chore: Enabled dependabot (#1279)
hiranya911 May 20, 2021
6bf2aee
chore: Remove gulp-replace dependency (#1285)
hiranya911 May 20, 2021
11f2fb1
build(deps-dev): bump gulp-header from 1.8.12 to 2.0.9 (#1283)
dependabot[bot] May 20, 2021
df3b398
build(deps-dev): bump run-sequence from 1.2.2 to 2.2.1 (#1282)
dependabot[bot] May 20, 2021
89387c1
build(deps-dev): bump sinon from 9.0.2 to 9.2.4 (#1289)
dependabot[bot] May 24, 2021
a549a6c
build(deps-dev): bump nyc from 14.1.1 to 15.1.0 (#1290)
dependabot[bot] May 24, 2021
d6dcf9e
build(deps-dev): bump chalk from 1.1.3 to 4.1.1 (#1288)
dependabot[bot] May 24, 2021
9d87537
build(deps-dev): bump @microsoft/api-extractor from 7.11.2 to 7.15.2 …
dependabot[bot] May 24, 2021
7afaf6c
chore: Teporarily disabling sendToDeviceGroup integration test (#1292)
hiranya911 May 24, 2021
1d2ff69
feat(auth): Added code flow support for OIDC flow. (#1220)
xil222 May 25, 2021
03c66d8
Update supported Node version to 10.13.0v (#1300)
lahirumaramba May 26, 2021
f914f92
Fixed integration test failure of skipped tests (#1299)
xil222 May 26, 2021
c529496
[chore] Release 9.9.0 (#1302)
lahirumaramba May 26, 2021
2ffc177
Update OIDC reference docs (#1305)
lahirumaramba May 27, 2021
f4a9a16
Add OAuthResponseType to ToC (#1303)
lahirumaramba May 27, 2021
29271ad
fix(auth): Better type hierarchies for Auth API (#1294)
hiranya911 May 27, 2021
5d5cea2
build(deps-dev): bump nock from 13.0.5 to 13.0.11 (#1311)
dependabot[bot] Jun 1, 2021
09e82c0
build(deps): bump ws from 7.3.1 to 7.4.6 (#1309)
dependabot[bot] Jun 1, 2021
312cdbb
build(deps-dev): bump del from 2.2.2 to 6.0.0 (#1310)
dependabot[bot] Jun 1, 2021
278bfc9
build(deps-dev): bump @types/jsonwebtoken from 8.5.0 to 8.5.1 (#1315)
dependabot[bot] Jun 1, 2021
2256f03
build(deps-dev): bump nock from 13.0.11 to 13.1.0 (#1313)
dependabot[bot] Jun 1, 2021
2e6e5d3
build(deps-dev): bump @types/sinon-chai from 3.2.4 to 3.2.5 (#1316)
dependabot[bot] Jun 1, 2021
8548bb3
build(deps-dev): bump bcrypt from 5.0.0 to 5.0.1 (#1324)
dependabot[bot] Jun 9, 2021
eb04602
build(deps): bump @google-cloud/firestore from 4.5.0 to 4.12.2 (#1325)
dependabot[bot] Jun 9, 2021
3c78a73
build(deps-dev): bump @types/mocha from 2.2.48 to 8.2.2 (#1323)
dependabot[bot] Jun 9, 2021
2a4de46
build(deps-dev): bump @firebase/app from 0.6.21 to 0.6.26 (#1329)
dependabot[bot] Jun 14, 2021
24d3b91
build(deps): bump @firebase/database from 0.10.0 to 0.10.4 (#1328)
dependabot[bot] Jun 14, 2021
f09bd64
build(deps-dev): bump request-promise from 4.2.5 to 4.2.6 (#1331)
dependabot[bot] Jun 14, 2021
9539a50
build(deps-dev): bump gulp-filter from 6.0.0 to 7.0.0 (#1334)
dependabot[bot] Jun 22, 2021
9b0d7ef
build(deps-dev): bump @types/minimist from 1.2.0 to 1.2.1 (#1336)
dependabot[bot] Jun 22, 2021
9872b9b
fix(docs): replace all global.html -> admin.html (#1341)
NothingEverHappens Jun 22, 2021
0f9a7de
feat(fis): Adding the admin.installations() API for deleting Firebase…
hiranya911 Jun 23, 2021
6f73c8c
fix: Updated TOC for new Auth type aliases (#1342)
hiranya911 Jun 23, 2021
2ca2bca
[chore] Release 9.10.0 (#1345)
hiranya911 Jun 24, 2021
2feece3
build(deps-dev): bump @types/request-promise from 4.1.46 to 4.1.47 (#…
dependabot[bot] Jun 24, 2021
dd942b0
build(deps): bump @firebase/database from 0.10.4 to 0.10.5 (#1350)
dependabot[bot] Jul 2, 2021
bf959e3
build(deps-dev): bump @types/nock from 9.3.1 to 11.1.0 (#1351)
dependabot[bot] Jul 2, 2021
e9cd6bf
build(deps-dev): bump @types/sinon from 9.0.4 to 10.0.2 (#1326)
dependabot[bot] Jul 2, 2021
068ea80
build(deps): bump @firebase/database from 0.10.5 to 0.10.6 (#1356)
dependabot[bot] Jul 5, 2021
b8e837b
build(deps): bump jwks-rsa from 2.0.2 to 2.0.3 (#1361)
dependabot[bot] Jul 9, 2021
c87f640
build(deps-dev): bump yargs from 16.1.0 to 17.0.1 (#1357)
dependabot[bot] Jul 9, 2021
0b45481
build(deps-dev): bump @types/chai from 4.2.11 to 4.2.21 (#1365)
dependabot[bot] Jul 9, 2021
bfaec79
Update index.ts (#1367)
dhritzkiv Jul 12, 2021
760cd6a
build(deps): bump @google-cloud/firestore from 4.12.2 to 4.13.1 (#1369)
dependabot[bot] Jul 12, 2021
4e816f4
feat(fac): Add custom TTL options for App Check (#1363)
lahirumaramba Jul 14, 2021
c2b126b
Reduce App Check custom token exp to 5 mins (#1372)
lahirumaramba Jul 14, 2021
ba07e12
Add AppCheckTokenOptions type to ToC (#1375)
lahirumaramba Jul 15, 2021
21869ee
Fix typo and formatting in docs (#1378)
lahirumaramba Jul 15, 2021
20dc462
[chore] Release 9.11.0 (#1376)
lahirumaramba Jul 15, 2021
db13ec1
build(deps-dev): bump nock from 13.1.0 to 13.1.1 (#1370)
dependabot[bot] Jul 15, 2021
25429b3
build(deps-dev): bump @types/bcrypt from 2.0.0 to 5.0.0 (#1384)
dependabot[bot] Jul 19, 2021
b403c15
build(deps): bump @firebase/database from 0.10.6 to 0.10.7 (#1385)
dependabot[bot] Jul 19, 2021
8bfbadf
build(deps-dev): bump @types/lodash from 4.14.157 to 4.14.171 (#1386)
dependabot[bot] Jul 20, 2021
6841d4c
build(deps-dev): bump @types/request from 2.48.5 to 2.48.6 (#1387)
dependabot[bot] Jul 20, 2021
9ad3be7
build(deps-dev): bump @types/minimist from 1.2.1 to 1.2.2 (#1388)
dependabot[bot] Jul 20, 2021
2e5e473
build(deps): bump jwks-rsa from 2.0.3 to 2.0.4 (#1393)
dependabot[bot] Jul 27, 2021
63d12e0
build(deps-dev): bump @microsoft/api-extractor from 7.15.2 to 7.18.4 …
dependabot[bot] Aug 3, 2021
8474194
build(deps): bump tar from 6.1.0 to 6.1.3 (#1399)
dependabot[bot] Aug 3, 2021
a9d8b41
build(deps-dev): bump ts-node from 9.0.0 to 10.2.0 (#1402)
dependabot[bot] Aug 9, 2021
e22f0ef
chore: Add emulator tests to nightlies (#1409)
lahirumaramba Aug 16, 2021
9f7529f
fix: Throw error on user disabled and check revoked set true (#1401)
xil222 Aug 16, 2021
7d92a34
build(deps-dev): bump yargs from 17.0.1 to 17.1.1 (#1412)
dependabot[bot] Aug 17, 2021
973e68b
build(deps): bump path-parse from 1.0.6 to 1.0.7 (#1413)
dependabot[bot] Aug 17, 2021
e7ab2f0
fix: Update comments in index files (#1414)
xil222 Aug 19, 2021
ceaad33
[chore] Release 9.11.1 (#1415)
lahirumaramba Aug 19, 2021
3f432df
fix typo (#1420)
arthurgubaidullin Aug 27, 2021
bb1fb6f
build(deps-dev): bump @microsoft/api-extractor from 7.18.4 to 7.18.7 …
dependabot[bot] Aug 27, 2021
82391d5
feat(rc): Add Remote Config Parameter Value Type Support (#1424)
lahirumaramba Sep 14, 2021
b4b220c
build(deps-dev): bump @types/lodash from 4.14.171 to 4.14.173 (#1435)
dependabot[bot] Sep 20, 2021
8610b94
build(deps): bump tar from 6.1.3 to 6.1.11 (#1430)
dependabot[bot] Sep 20, 2021
d96e61b
Pin @types/jsonwebtoken to 8.5.1 (#1438)
lahirumaramba Sep 23, 2021
894b04a
fix(rtdb): Changed admin.database to use database-compat package (#1437)
hiranya911 Sep 27, 2021
a0b71a2
fix(fac): Verify Token: Change the jwks cache duration from 1 day to …
lahirumaramba Sep 28, 2021
137905c
[chore] Release 9.12.0 (#1442)
lahirumaramba Sep 28, 2021
e4b6a5f
chore: Merged with main branch
hiranya911 Sep 30, 2021
aa534ad
fix: Merged missing commits from #1401
hiranya911 Sep 30, 2021
c87ce53
fix: Updated integration tests
hiranya911 Sep 30, 2021
5d67bcc
fix: Temporary with for RTDB type incompatibility issue
hiranya911 Sep 30, 2021
8406d4e
fix: Cleaned up faulty API doc annotations
hiranya911 Sep 30, 2021
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Updated integration tests
  • Loading branch information
hiranya911 committed Sep 30, 2021
commit c87ce533ae177a7d33cd4c039f2c365e220cb666
6 changes: 3 additions & 3 deletions test/integration/app.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('admin', () => {

describe('Dependency lazy loading', () => {
const tempCache: {[key: string]: any} = {};
const dependencies = ['@firebase/database', '@google-cloud/firestore'];
const dependencies = ['@firebase/database-compat/standalone', '@google-cloud/firestore'];
let lazyLoadingApp: App;

before(() => {
Expand All @@ -49,14 +49,14 @@ describe('admin', () => {
});

it('does not load RTDB by default', () => {
const firebaseRtdb = require.cache[require.resolve('@firebase/database')];
const firebaseRtdb = require.cache[require.resolve('@firebase/database-compat/standalone')];
expect(firebaseRtdb).to.be.undefined;
});

it('loads RTDB when calling admin.database', () => {
const rtdbNamespace = admin.database;
expect(rtdbNamespace).to.not.be.null;
const firebaseRtdb = require.cache[require.resolve('@firebase/database')];
const firebaseRtdb = require.cache[require.resolve('@firebase/database-compat/standalone')];
expect(firebaseRtdb).to.not.be.undefined;
});

Expand Down
30 changes: 15 additions & 15 deletions test/integration/auth.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import * as crypto from 'crypto';
import * as bcrypt from 'bcrypt';
import * as chai from 'chai';
import * as chaiAsPromised from 'chai-as-promised';
import firebase from '@firebase/app';
import '@firebase/auth';
import firebase from '@firebase/app-compat';
import '@firebase/auth-compat';
import { clone } from 'lodash';
import { User, FirebaseAuth } from '@firebase/auth-types';
import {
Expand Down Expand Up @@ -329,7 +329,7 @@ describe('admin.auth', () => {
// TODO(rsgowman): Once we can link a provider id with a user, just do that
// here instead of creating a new user.
const randomUid = 'import_' + generateRandomString(20).toLowerCase();
const importUser: admin.auth.UserImportRecord = {
const importUser: UserImportRecord = {
uid: randomUid,
email: 'user@example.com',
phoneNumber: '+15555550000',
Expand All @@ -349,10 +349,10 @@ describe('admin.auth', () => {
}],
};

await admin.auth().importUsers([importUser]);
await getAuth().importUsers([importUser]);

try {
await admin.auth().getUserByProviderUid('google.com', 'google_uid')
await getAuth().getUserByProviderUid('google.com', 'google_uid')
.then((userRecord) => {
expect(userRecord.uid).to.equal(importUser.uid);
});
Expand All @@ -362,14 +362,14 @@ describe('admin.auth', () => {
});

it('getUserByProviderUid() redirects to getUserByEmail if given an email', () => {
return admin.auth().getUserByProviderUid('email', mockUserData.email)
return getAuth().getUserByProviderUid('email', mockUserData.email)
.then((userRecord) => {
expect(userRecord.uid).to.equal(newUserUid);
});
});

it('getUserByProviderUid() redirects to getUserByPhoneNumber if given a phone number', () => {
return admin.auth().getUserByProviderUid('phone', mockUserData.phoneNumber)
return getAuth().getUserByProviderUid('phone', mockUserData.phoneNumber)
.then((userRecord) => {
expect(userRecord.uid).to.equal(newUserUid);
});
Expand Down Expand Up @@ -897,7 +897,7 @@ describe('admin.auth', () => {
});

it('getUserByProviderUid() fails when called with a non-existing provider id', () => {
return admin.auth().getUserByProviderUid('google.com', nonexistentUid)
return getAuth().getUserByProviderUid('google.com', nonexistentUid)
.should.eventually.be.rejected.and.have.property('code', 'auth/user-not-found');
});

Expand Down Expand Up @@ -2104,26 +2104,26 @@ describe('admin.auth', () => {

it('fails with checkRevoked set to true and corresponding user disabled', async () => {
const expiresIn = 24 * 60 * 60 * 1000;
const customToken = await admin.auth().createCustomToken(uid, { admin: true, groupId: '1234' });
const customToken = await getAuth().createCustomToken(uid, { admin: true, groupId: '1234' });
const { user } = await clientAuth().signInWithCustomToken(customToken);
expect(user).to.exist;

const idToken = await user!.getIdToken();
const decodedIdTokenClaims = await admin.auth().verifyIdToken(idToken);
const decodedIdTokenClaims = await getAuth().verifyIdToken(idToken);
expect(decodedIdTokenClaims.uid).to.be.equal(uid);

const sessionCookie = await admin.auth().createSessionCookie(idToken, { expiresIn });
let decodedIdToken = await admin.auth().verifySessionCookie(sessionCookie, true);
const sessionCookie = await getAuth().createSessionCookie(idToken, { expiresIn });
let decodedIdToken = await getAuth().verifySessionCookie(sessionCookie, true);
expect(decodedIdToken.uid).to.equal(uid);

const userRecord = await admin.auth().updateUser(uid, { disabled : true });
const userRecord = await getAuth().updateUser(uid, { disabled : true });
// Ensure disabled field has been updated.
expect(userRecord.uid).to.equal(uid);
expect(userRecord.disabled).to.equal(true);

try {
// If it is in emulator mode, a user-disabled error will be thrown.
decodedIdToken = await admin.auth().verifySessionCookie(sessionCookie, false);
decodedIdToken = await getAuth().verifySessionCookie(sessionCookie, false);
expect(decodedIdToken.uid).to.equal(uid);
} catch (error) {
if (authEmulatorHost) {
Expand All @@ -2134,7 +2134,7 @@ describe('admin.auth', () => {
}

try {
await admin.auth().verifySessionCookie(sessionCookie, true);
await getAuth().verifySessionCookie(sessionCookie, true);
} catch (error) {
expect(error).to.have.property('code', 'auth/user-disabled');
}
Expand Down
13 changes: 9 additions & 4 deletions test/integration/remote-config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
import * as chai from 'chai';
import * as chaiAsPromised from 'chai-as-promised';
import { deepCopy } from '../../src/utils/deep-copy';
import { RemoteConfigCondition, RemoteConfigTemplate, getRemoteConfig, } from '../../lib/remote-config/index';
import {
getRemoteConfig,
ParameterValueType,
RemoteConfigCondition,
RemoteConfigTemplate,
} from '../../lib/remote-config/index';

chai.should();
chai.use(chaiAsPromised);
Expand All @@ -29,12 +34,12 @@ const VALID_PARAMETERS = {
holiday_promo_enabled: {
defaultValue: { useInAppDefault: true },
description: 'promo indicator',
valueType: 'STRING' as admin.remoteConfig.ParameterValueType,
valueType: 'STRING' as ParameterValueType,
},
// eslint-disable-next-line @typescript-eslint/camelcase
welcome_message: {
defaultValue: { value: `welcome text ${Date.now()}` },
valueType: 'STRING' as admin.remoteConfig.ParameterValueType,
valueType: 'STRING' as ParameterValueType,
conditionalValues: {
ios: { value: 'welcome ios text' },
android: { value: 'welcome android text' },
Expand All @@ -54,7 +59,7 @@ const VALID_PARAMETER_GROUPS = {
'android': { value: 'A Droid must love a pumpkin spice latte.' },
},
description: 'Description of the parameter.',
valueType: 'STRING' as admin.remoteConfig.ParameterValueType,
valueType: 'STRING' as ParameterValueType,
},
},
},
Expand Down