@dereekb/firebase-server 9.9.1 → 9.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +13 -0
- package/mailgun/package.json +10 -10
- package/package.json +14 -14
- package/src/lib/auth/auth.service.d.ts +23 -15
- package/src/lib/auth/auth.service.js +9 -5
- package/src/lib/auth/auth.service.js.map +1 -1
- package/src/lib/nest/app.js +3 -0
- package/src/lib/nest/app.js.map +1 -1
- package/test/package.json +11 -11
- package/test/src/lib/firebase/firebase.admin.auth.d.ts +13 -1
- package/test/src/lib/firebase/firebase.admin.auth.js +21 -3
- package/test/src/lib/firebase/firebase.admin.auth.js.map +1 -1
- package/test/src/lib/firebase/firebase.admin.nest.js +3 -0
- package/test/src/lib/firebase/firebase.admin.nest.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,19 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [9.9.3](https://github.com/dereekb/dbx-components/compare/v9.9.2-dev...v9.9.3) (2022-09-19)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [9.9.2](https://github.com/dereekb/dbx-components/compare/v9.9.1-dev...v9.9.2) (2022-09-19)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
* fixed child package exports ([76fe1fa](https://github.com/dereekb/dbx-components/commit/76fe1fac1b99853e705ae09bea6dee3e65d7338c))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
5
18
|
## [9.9.1](https://github.com/dereekb/dbx-components/compare/v9.9.0-dev...v9.9.1) (2022-09-18)
|
|
6
19
|
|
|
7
20
|
|
package/mailgun/package.json
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/firebase-server/mailgun",
|
|
3
|
-
"version": "9.9.
|
|
3
|
+
"version": "9.9.3",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"typings": "./src/index.d.ts",
|
|
7
7
|
"dependencies": {},
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@dereekb/nestjs/mailgun": "9.9.
|
|
9
|
+
"@dereekb/nestjs/mailgun": "9.9.3",
|
|
10
10
|
"@nestjs/common": "^9.0.0",
|
|
11
11
|
"mailgun.js": "^8.0.0",
|
|
12
12
|
"form-data": "4.0.0",
|
|
13
|
-
"@dereekb/util": "9.9.
|
|
13
|
+
"@dereekb/util": "9.9.3",
|
|
14
14
|
"lodash.isequal": "^4.5.0",
|
|
15
15
|
"make-error": "^1.3.0",
|
|
16
|
+
"class-validator": "^0.13.2",
|
|
16
17
|
"ts-essentials": "^9.1.2",
|
|
17
18
|
"extra-set": "^2.2.11",
|
|
18
|
-
"@dereekb/nestjs": "9.9.
|
|
19
|
+
"@dereekb/nestjs": "9.9.3",
|
|
19
20
|
"@nestjs/config": "^2.0.1",
|
|
20
|
-
"@dereekb/firebase-server": "9.9.
|
|
21
|
+
"@dereekb/firebase-server": "9.9.3",
|
|
21
22
|
"jsonwebtoken": "^8.0.0",
|
|
22
|
-
"@dereekb/firebase": "9.9.
|
|
23
|
+
"@dereekb/firebase": "9.9.3",
|
|
23
24
|
"rxjs": "^7.5.0",
|
|
24
25
|
"firebase": "^9.9.2",
|
|
25
|
-
"@dereekb/rxjs": "9.9.
|
|
26
|
+
"@dereekb/rxjs": "9.9.3",
|
|
26
27
|
"ms": "^3.0.0-canary.1",
|
|
27
|
-
"@dereekb/model": "9.9.
|
|
28
|
+
"@dereekb/model": "9.9.3",
|
|
28
29
|
"class-transformer": "^0.5.1",
|
|
29
|
-
"
|
|
30
|
-
"@dereekb/date": "9.9.1",
|
|
30
|
+
"@dereekb/date": "9.9.3",
|
|
31
31
|
"date-fns": "^2.29.0",
|
|
32
32
|
"date-fns-tz": "^1.3.0",
|
|
33
33
|
"rrule": "git+https://git@github.com/dereekb/rrule#2b13b1ea881059ba2ecfec380e12ef244ef54570",
|
package/package.json
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/firebase-server",
|
|
3
|
-
"version": "9.9.
|
|
3
|
+
"version": "9.9.3",
|
|
4
4
|
"devDependencies": {
|
|
5
5
|
"firebase-functions-test": "2.0.2"
|
|
6
6
|
},
|
|
7
7
|
"peerDependencies": {
|
|
8
8
|
"jsonwebtoken": "^8.0.0",
|
|
9
|
-
"@dereekb/firebase": "9.9.
|
|
9
|
+
"@dereekb/firebase": "9.9.3",
|
|
10
10
|
"rxjs": "^7.5.0",
|
|
11
11
|
"firebase": "^9.9.2",
|
|
12
|
-
"@dereekb/util": "9.9.
|
|
12
|
+
"@dereekb/util": "9.9.3",
|
|
13
13
|
"lodash.isequal": "^4.5.0",
|
|
14
14
|
"make-error": "^1.3.0",
|
|
15
|
+
"class-validator": "^0.13.2",
|
|
15
16
|
"ts-essentials": "^9.1.2",
|
|
16
17
|
"extra-set": "^2.2.11",
|
|
17
|
-
"@dereekb/rxjs": "9.9.
|
|
18
|
+
"@dereekb/rxjs": "9.9.3",
|
|
18
19
|
"ms": "^3.0.0-canary.1",
|
|
19
|
-
"@dereekb/model": "9.9.
|
|
20
|
+
"@dereekb/model": "9.9.3",
|
|
20
21
|
"class-transformer": "^0.5.1",
|
|
21
|
-
"
|
|
22
|
-
"@dereekb/date": "9.9.1",
|
|
22
|
+
"@dereekb/date": "9.9.3",
|
|
23
23
|
"date-fns": "^2.29.0",
|
|
24
24
|
"date-fns-tz": "^1.3.0",
|
|
25
25
|
"rrule": "git+https://git@github.com/dereekb/rrule#2b13b1ea881059ba2ecfec380e12ef244ef54570",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@nestjs/common": "^9.0.0",
|
|
31
31
|
"@nestjs/core": "^9.0.0",
|
|
32
32
|
"@nestjs/platform-express": "^9.0.0",
|
|
33
|
-
"@dereekb/nestjs": "9.9.
|
|
33
|
+
"@dereekb/nestjs": "9.9.3",
|
|
34
34
|
"@nestjs/config": "^2.0.1",
|
|
35
35
|
"tslib": "^2.0.0"
|
|
36
36
|
},
|
|
@@ -41,14 +41,14 @@
|
|
|
41
41
|
"default": "./src/index.js"
|
|
42
42
|
},
|
|
43
43
|
"./test": {
|
|
44
|
-
"main": "./test/index.js",
|
|
45
|
-
"types": "./test/index.d.ts",
|
|
46
|
-
"default": "./test/index.js"
|
|
44
|
+
"main": "./test/src/index.js",
|
|
45
|
+
"types": "./test/src/index.d.ts",
|
|
46
|
+
"default": "./test/src/index.js"
|
|
47
47
|
},
|
|
48
48
|
"./mailgun": {
|
|
49
|
-
"main": "./mailgun/index.js",
|
|
50
|
-
"types": "./mailgun/index.d.ts",
|
|
51
|
-
"default": "./mailgun/index.js"
|
|
49
|
+
"main": "./mailgun/src/index.js",
|
|
50
|
+
"types": "./mailgun/src/index.d.ts",
|
|
51
|
+
"default": "./mailgun/src/index.js"
|
|
52
52
|
}
|
|
53
53
|
},
|
|
54
54
|
"main": "./src/index.js",
|
|
@@ -143,13 +143,13 @@ export interface FirebaseServerAuthNewUserClaims extends AuthClaimsObject {
|
|
|
143
143
|
/**
|
|
144
144
|
* Setup password time
|
|
145
145
|
*/
|
|
146
|
-
setupPassword: FirebaseServerAuthSetupPassword;
|
|
146
|
+
readonly setupPassword: FirebaseServerAuthSetupPassword;
|
|
147
147
|
/**
|
|
148
148
|
* Last setup communication time.
|
|
149
149
|
*/
|
|
150
|
-
setupCommunicationAt: ISO8601DateString;
|
|
150
|
+
readonly setupCommunicationAt: ISO8601DateString;
|
|
151
151
|
}
|
|
152
|
-
export interface FirebaseServerAuthInitializeNewUser {
|
|
152
|
+
export interface FirebaseServerAuthInitializeNewUser<D = unknown> {
|
|
153
153
|
/**
|
|
154
154
|
* Specific user identifier to use.
|
|
155
155
|
*/
|
|
@@ -176,35 +176,43 @@ export interface FirebaseServerAuthInitializeNewUser {
|
|
|
176
176
|
* Whether or not to send a setup email. Is true by default.
|
|
177
177
|
*/
|
|
178
178
|
readonly sendSetupContent?: boolean;
|
|
179
|
+
/**
|
|
180
|
+
* Any additional setup context
|
|
181
|
+
*/
|
|
182
|
+
readonly data?: D;
|
|
179
183
|
}
|
|
180
184
|
export interface FirebaseServerAuthCreateNewUserResult {
|
|
181
185
|
readonly user: admin.auth.UserRecord;
|
|
182
186
|
readonly password: FirebaseServerAuthSetupPassword;
|
|
183
187
|
}
|
|
184
|
-
export interface FirebaseServerAuthNewUserSetupDetails<U extends FirebaseServerAuthUserContext = FirebaseServerAuthUserContext> {
|
|
188
|
+
export interface FirebaseServerAuthNewUserSetupDetails<U extends FirebaseServerAuthUserContext = FirebaseServerAuthUserContext, D = unknown> {
|
|
185
189
|
readonly userContext: U;
|
|
186
190
|
readonly claims: FirebaseServerAuthNewUserClaims;
|
|
191
|
+
readonly data?: D;
|
|
187
192
|
}
|
|
188
|
-
export interface FirebaseServerNewUserService {
|
|
189
|
-
initializeNewUser(input: FirebaseServerAuthInitializeNewUser): Promise<admin.auth.UserRecord>;
|
|
190
|
-
sendSetupContent(uid: FirebaseAuthUserId): Promise<boolean>;
|
|
193
|
+
export interface FirebaseServerNewUserService<D = unknown> {
|
|
194
|
+
initializeNewUser(input: FirebaseServerAuthInitializeNewUser<D>): Promise<admin.auth.UserRecord>;
|
|
195
|
+
sendSetupContent(uid: FirebaseAuthUserId, data?: D): Promise<boolean>;
|
|
191
196
|
markUserSetupAsComplete(uid: FirebaseAuthUserId): Promise<boolean>;
|
|
192
197
|
}
|
|
193
|
-
export declare const DEFAULT_FIREBASE_PASSWORD_NUMBER_GENERATOR: import("@dereekb/util").
|
|
198
|
+
export declare const DEFAULT_FIREBASE_PASSWORD_NUMBER_GENERATOR: import("@dereekb/util").NumberFactory;
|
|
199
|
+
/**
|
|
200
|
+
* 1 hour
|
|
201
|
+
*/
|
|
194
202
|
export declare const DEFAULT_SETUP_COM_THROTTLE_TIME: number;
|
|
195
|
-
export declare abstract class AbstractFirebaseServerNewUserService<U extends FirebaseServerAuthUserContext = FirebaseServerAuthUserContext, C extends FirebaseServerAuthContext = FirebaseServerAuthContext> implements FirebaseServerNewUserService {
|
|
203
|
+
export declare abstract class AbstractFirebaseServerNewUserService<U extends FirebaseServerAuthUserContext = FirebaseServerAuthUserContext, C extends FirebaseServerAuthContext = FirebaseServerAuthContext, D = unknown> implements FirebaseServerNewUserService<D> {
|
|
196
204
|
readonly authService: FirebaseServerAuthService<U, C>;
|
|
197
205
|
protected setupThrottleTime: Milliseconds;
|
|
198
206
|
constructor(authService: FirebaseServerAuthService<U, C>);
|
|
199
|
-
initializeNewUser(input: FirebaseServerAuthInitializeNewUser): Promise<admin.auth.UserRecord>;
|
|
207
|
+
initializeNewUser(input: FirebaseServerAuthInitializeNewUser<D>): Promise<admin.auth.UserRecord>;
|
|
200
208
|
/**
|
|
201
209
|
* Sends the setup content to the user. Returns true if content was sent or was already recently sent.
|
|
202
210
|
*
|
|
203
211
|
* @param uid
|
|
204
212
|
*/
|
|
205
|
-
sendSetupContent(uid: FirebaseAuthUserId): Promise<boolean>;
|
|
206
|
-
loadSetupDetails(uid: FirebaseAuthUserId): Promise<Maybe<FirebaseServerAuthNewUserSetupDetails<U>>>;
|
|
207
|
-
protected updateSetupContentSentTime(details: FirebaseServerAuthNewUserSetupDetails<U>): Promise<void>;
|
|
213
|
+
sendSetupContent(uid: FirebaseAuthUserId, data?: D): Promise<boolean>;
|
|
214
|
+
loadSetupDetails(uid: FirebaseAuthUserId, data?: D): Promise<Maybe<FirebaseServerAuthNewUserSetupDetails<U, D>>>;
|
|
215
|
+
protected updateSetupContentSentTime(details: FirebaseServerAuthNewUserSetupDetails<U, D>): Promise<void>;
|
|
208
216
|
/**
|
|
209
217
|
* Update a user's claims to clear any setup-related content.
|
|
210
218
|
*
|
|
@@ -213,9 +221,9 @@ export declare abstract class AbstractFirebaseServerNewUserService<U extends Fir
|
|
|
213
221
|
* @param uid
|
|
214
222
|
*/
|
|
215
223
|
markUserSetupAsComplete(uid: FirebaseAuthUserId): Promise<boolean>;
|
|
216
|
-
protected createNewUser(input: FirebaseServerAuthInitializeNewUser): Promise<FirebaseServerAuthCreateNewUserResult>;
|
|
224
|
+
protected createNewUser(input: FirebaseServerAuthInitializeNewUser<D>): Promise<FirebaseServerAuthCreateNewUserResult>;
|
|
217
225
|
protected generateRandomSetupPassword(): FirebaseServerAuthSetupPassword;
|
|
218
|
-
protected abstract sendSetupContentToUser(user: FirebaseServerAuthNewUserSetupDetails<U>): Promise<void>;
|
|
226
|
+
protected abstract sendSetupContentToUser(user: FirebaseServerAuthNewUserSetupDetails<U, D>): Promise<void>;
|
|
219
227
|
protected updateClaimsToClearUser(userContext: U): Promise<void>;
|
|
220
228
|
}
|
|
221
229
|
export declare class NoSetupContentFirebaseServerNewUserService<U extends FirebaseServerAuthUserContext = FirebaseServerAuthUserContext> extends AbstractFirebaseServerNewUserService<U> {
|
|
@@ -120,6 +120,9 @@ exports.AbstractFirebaseServerAuthContext = AbstractFirebaseServerAuthContext;
|
|
|
120
120
|
exports.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_PASSWORD_KEY = 'setupPassword';
|
|
121
121
|
exports.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_LAST_COM_DATE_KEY = 'setupCommunicationAt';
|
|
122
122
|
exports.DEFAULT_FIREBASE_PASSWORD_NUMBER_GENERATOR = (0, util_1.randomNumberFactory)({ min: 100000, max: 1000000 - 1 });
|
|
123
|
+
/**
|
|
124
|
+
* 1 hour
|
|
125
|
+
*/
|
|
123
126
|
exports.DEFAULT_SETUP_COM_THROTTLE_TIME = (0, date_1.hoursToMs)(1);
|
|
124
127
|
class AbstractFirebaseServerNewUserService {
|
|
125
128
|
constructor(authService) {
|
|
@@ -128,7 +131,7 @@ class AbstractFirebaseServerNewUserService {
|
|
|
128
131
|
}
|
|
129
132
|
initializeNewUser(input) {
|
|
130
133
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
131
|
-
const { uid,
|
|
134
|
+
const { uid, email, phone, sendSetupContent: sendSetupEmail } = input;
|
|
132
135
|
let userRecordPromise;
|
|
133
136
|
if (uid) {
|
|
134
137
|
userRecordPromise = this.authService.auth.getUser(uid);
|
|
@@ -164,9 +167,9 @@ class AbstractFirebaseServerNewUserService {
|
|
|
164
167
|
*
|
|
165
168
|
* @param uid
|
|
166
169
|
*/
|
|
167
|
-
sendSetupContent(uid) {
|
|
170
|
+
sendSetupContent(uid, data) {
|
|
168
171
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
169
|
-
const setupDetails = yield this.loadSetupDetails(uid);
|
|
172
|
+
const setupDetails = yield this.loadSetupDetails(uid, data);
|
|
170
173
|
if (setupDetails) {
|
|
171
174
|
const { setupCommunicationAt } = setupDetails.claims;
|
|
172
175
|
if (!setupCommunicationAt || (0, date_1.timeHasExpired)(new Date(setupCommunicationAt), this.setupThrottleTime)) {
|
|
@@ -177,7 +180,7 @@ class AbstractFirebaseServerNewUserService {
|
|
|
177
180
|
return false;
|
|
178
181
|
});
|
|
179
182
|
}
|
|
180
|
-
loadSetupDetails(uid) {
|
|
183
|
+
loadSetupDetails(uid, data) {
|
|
181
184
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
182
185
|
const userContext = this.authService.userContext(uid);
|
|
183
186
|
const userExists = yield userContext.exists();
|
|
@@ -190,7 +193,8 @@ class AbstractFirebaseServerNewUserService {
|
|
|
190
193
|
claims: {
|
|
191
194
|
setupPassword,
|
|
192
195
|
setupCommunicationAt
|
|
193
|
-
}
|
|
196
|
+
},
|
|
197
|
+
data
|
|
194
198
|
};
|
|
195
199
|
}
|
|
196
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/auth/auth.service.ts"],"names":[],"mappings":";;;;AAGA,wCAAuY;AACvY,iDAA+F;AAC/F,iDAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
package/src/lib/nest/app.js
CHANGED
|
@@ -33,6 +33,9 @@ function nestServerInstance(config) {
|
|
|
33
33
|
providers.push({
|
|
34
34
|
provide: env_service_1.FirebaseServerEnvService,
|
|
35
35
|
useClass: env_1.DefaultFirebaseServerEnvService
|
|
36
|
+
}, {
|
|
37
|
+
provide: nestjs_1.ServerEnvironmentService,
|
|
38
|
+
useExisting: env_service_1.FirebaseServerEnvService
|
|
36
39
|
});
|
|
37
40
|
}
|
|
38
41
|
}
|
package/src/lib/nest/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/nest/app.ts"],"names":[],"mappings":";;;;AAAA,wCAAoG;AAEpG,uCAA2C;AAC3C,+DAA0D;AAC1D,mCAAmC;AACnC,gEAA4E;AAE5E,6CAAmH;AAEnH,6DAA6F;AAC7F,oDAA8D;AAC9D,+BAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/nest/app.ts"],"names":[],"mappings":";;;;AAAA,wCAAoG;AAEpG,uCAA2C;AAC3C,+DAA0D;AAC1D,mCAAmC;AACnC,gEAA4E;AAE5E,6CAAmH;AAEnH,6DAA6F;AAC7F,oDAA8D;AAC9D,+BAAwD;AACxD,4CAA4G;AA4B5G,MAAa,4BAA4B;CAAG;AAA5C,oEAA4C;AAyC5C,SAAgB,kBAAkB,CAAI,MAAmC;IACvE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IACpI,MAAM,YAAY,GAAG,IAAI,GAAG,EAAsB,CAAC;IAEnD,MAAM,cAAc,GAAG,CAAC,WAA0B,EAAE,GAAiC,EAAc,EAAE;QACnG,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC;QACjC,MAAM,oBAAoB,GAAG,yBAAyB,aAAzB,yBAAyB,cAAzB,yBAAyB,GAAI,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;QAE5F,IAAI,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE3C,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC;YACzB,MAAM,gBAAgB,GAAG,CAAO,eAAgC,EAAE,EAAE;gBAClE,MAAM,SAAS,GAAmC,CAAC,IAAA,gDAA8B,EAAC,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAE1G,kCAAkC;gBAClC,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,KAAI,IAAI,EAAE;oBAC5B,SAAS,CAAC,IAAI,CAAC,IAAA,+BAAsB,EAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;oBAExD,IAAI,MAAM,CAAC,mBAAmB,KAAK,KAAK,EAAE;wBACxC,SAAS,CAAC,IAAI,CACZ;4BACE,OAAO,EAAE,sCAAwB;4BACjC,QAAQ,EAAE,qCAA+B;yBAC1C,EACD;4BACE,OAAO,EAAE,iCAAwB;4BACjC,WAAW,EAAE,sCAAwB;yBACtC,CACF,CAAC;qBACH;iBACF;gBAED,IAAI,mBAAmB,EAAE;oBACvB,IAAA,iCAA0B,EAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;iBAC5D;gBAED,MAAM,OAAO,GAAsC,CAAC,WAAW,CAAC,CAAC;gBAEjE,mFAAmF;gBACnF,MAAM,OAAO,GAA2B,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC,uCAAuC;gBAEtG,IAAI,MAAM,CAAC,iBAAiB,EAAE;oBAC5B,OAAO,CAAC,IAAI,CAAC,qDAAwC,CAAC,CAAC;iBACxD;gBAED,IAAI,MAAM,CAAC,eAAe,IAAI,KAAK,EAAE;oBACnC,OAAO,CAAC,IAAI,CAAC,sDAAyC,CAAC,CAAC;iBACzD;gBAED,IAAI,oBAAoB,EAAE;oBACxB,SAAS,CAAC,IAAI,CACZ,IAAA,kEAAiD,EAAC;wBAChD,eAAe,EAAE,oBAAoB;wBACrC,WAAW,EAAE,kBAAkB;qBAChC,CAAC,CACH,CAAC;iBACH;gBAED,MAAM,eAAe,GAAkB;oBACrC,MAAM,EAAE,4BAA4B;oBACpC,OAAO;oBACP,SAAS;oBACT,OAAO,EAAE,SAAS;oBAClB,MAAM,EAAE,IAAI;iBACb,CAAC;gBAEF,MAAM,OAAO,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,iCAAc,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC;gBAExG,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;YACxB,CAAC,CAAA,CAAC;YAEF,MAAM,IAAI,GAA8B,gBAAgB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC7E,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;gBAC3C,MAAM,GAAG,CAAC;YACZ,CAAC,CAA8B,CAAC;YAEhC,UAAU,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAA,iBAAU,EAAC,IAAI,CAAC,EAAE,CAAC;YAChD,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;SACvC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAO,WAA0B,EAAoB,EAAE;QAC9E,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC;QACjC,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAyB,CAAC;QAE9B,IAAI,UAAU,EAAE;YACd,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC7B,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SAClC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,WAAW;QACX,cAAc;QACd,gBAAgB;KACjB,CAAC;AACJ,CAAC;AA1GD,gDA0GC"}
|
package/test/package.json
CHANGED
|
@@ -1,40 +1,40 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/firebase-server/test",
|
|
3
|
-
"version": "9.9.
|
|
3
|
+
"version": "9.9.3",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"typings": "./src/index.d.ts",
|
|
7
7
|
"dependencies": {},
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@dereekb/firebase": "9.9.
|
|
9
|
+
"@dereekb/firebase": "9.9.3",
|
|
10
10
|
"rxjs": "^7.5.0",
|
|
11
11
|
"firebase": "^9.9.2",
|
|
12
|
-
"@dereekb/util": "9.9.
|
|
12
|
+
"@dereekb/util": "9.9.3",
|
|
13
13
|
"lodash.isequal": "^4.5.0",
|
|
14
14
|
"make-error": "^1.3.0",
|
|
15
|
+
"class-validator": "^0.13.2",
|
|
15
16
|
"ts-essentials": "^9.1.2",
|
|
16
17
|
"extra-set": "^2.2.11",
|
|
17
|
-
"@dereekb/rxjs": "9.9.
|
|
18
|
+
"@dereekb/rxjs": "9.9.3",
|
|
18
19
|
"ms": "^3.0.0-canary.1",
|
|
19
|
-
"@dereekb/model": "9.9.
|
|
20
|
+
"@dereekb/model": "9.9.3",
|
|
20
21
|
"class-transformer": "^0.5.1",
|
|
21
|
-
"
|
|
22
|
-
"@dereekb/date": "9.9.1",
|
|
22
|
+
"@dereekb/date": "9.9.3",
|
|
23
23
|
"date-fns": "^2.29.0",
|
|
24
24
|
"date-fns-tz": "^1.3.0",
|
|
25
25
|
"rrule": "git+https://git@github.com/dereekb/rrule#2b13b1ea881059ba2ecfec380e12ef244ef54570",
|
|
26
26
|
"@vvo/tzdb": "^6.56.0",
|
|
27
|
-
"@dereekb/util/test": "9.9.
|
|
27
|
+
"@dereekb/util/test": "9.9.3",
|
|
28
28
|
"firebase-admin": "^11.0.0",
|
|
29
29
|
"jsonwebtoken": "^8.0.0",
|
|
30
30
|
"firebase-functions": "^3.22.0",
|
|
31
31
|
"@nestjs/common": "^9.0.0",
|
|
32
32
|
"@google-cloud/firestore": "^5.0.2",
|
|
33
|
-
"@dereekb/firebase/test": "9.9.
|
|
34
|
-
"@dereekb/firebase-server": "9.9.
|
|
33
|
+
"@dereekb/firebase/test": "9.9.3",
|
|
34
|
+
"@dereekb/firebase-server": "9.9.3",
|
|
35
35
|
"@nestjs/core": "^9.0.0",
|
|
36
36
|
"@nestjs/platform-express": "^9.0.0",
|
|
37
|
-
"@dereekb/nestjs": "9.9.
|
|
37
|
+
"@dereekb/nestjs": "9.9.3",
|
|
38
38
|
"@nestjs/config": "^2.0.1",
|
|
39
39
|
"tslib": "^2.0.0"
|
|
40
40
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FirebaseAuthUserId } from '@dereekb/firebase';
|
|
2
|
-
import { Factory, GetterOrValue, PromiseOrValue } from '@dereekb/util';
|
|
2
|
+
import { Factory, GetterOrValue, PromiseOrValue, EmailAddress, E164PhoneNumber } from '@dereekb/util';
|
|
3
3
|
import { AbstractChildJestTestContextFixture, JestTestContextFixture } from '@dereekb/util/test';
|
|
4
4
|
import { FirebaseAdminTestContext } from './firebase.admin';
|
|
5
5
|
import { CreateRequest } from 'firebase-admin/lib/auth/auth-config';
|
|
@@ -36,6 +36,10 @@ export declare class AuthorizedUserTestContextInstance<PI extends FirebaseAdminT
|
|
|
36
36
|
readonly testContext: PI;
|
|
37
37
|
constructor(uid: FirebaseAuthUserId, testContext: PI);
|
|
38
38
|
loadUserRecord(): Promise<UserRecord>;
|
|
39
|
+
loadUserEmailAndPhone(): Promise<{
|
|
40
|
+
email: EmailAddress;
|
|
41
|
+
phone?: E164PhoneNumber;
|
|
42
|
+
}>;
|
|
39
43
|
loadIdToken(): Promise<string>;
|
|
40
44
|
loadDecodedIdToken(): Promise<DecodedIdToken>;
|
|
41
45
|
makeContextOptions(): Promise<ContextOptions>;
|
|
@@ -89,11 +93,19 @@ export declare type AuthorizedUserTestContextFactoryConfig<PI extends FirebaseAd
|
|
|
89
93
|
export interface AuthorizedUserTestContextFactoryParams<PI extends FirebaseAdminTestContext = FirebaseAdminTestContext, PF extends JestTestContextFixture<PI> = JestTestContextFixture<PI>> {
|
|
90
94
|
f: PF;
|
|
91
95
|
user?: CreateRequest;
|
|
96
|
+
/**
|
|
97
|
+
* Whether or not to add contact info. Is false by default.
|
|
98
|
+
*
|
|
99
|
+
* Any generated contact info will be overwritten by the input template.
|
|
100
|
+
*/
|
|
101
|
+
addContactInfo?: boolean;
|
|
92
102
|
/**
|
|
93
103
|
* Optional template details.
|
|
94
104
|
*/
|
|
95
105
|
template?: AuthorizedUserTestContextDetailsTemplate;
|
|
96
106
|
}
|
|
107
|
+
export declare const AUTHORIZED_USER_RANDOM_EMAIL_FACTORY: import("@dereekb/util").RandomEmailFactory;
|
|
108
|
+
export declare const AUTHORIZED_USER_RANDOM_PHONE_NUMBER_FACTORY: import("@dereekb/util").RandomPhoneNumberFactory;
|
|
97
109
|
/**
|
|
98
110
|
* Creates a new Jest Context that has a random user for authorization for use in firebase server tests.
|
|
99
111
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.testFirestoreClaimsFromUserRecord = exports.decodeEncodedCreateCustomTokenResult = exports.createEncodedTestFirestoreTokenForUserRecord = exports.createTestFirestoreTokenForUserRecord = exports.createTestFunctionContextAuthData = exports.createTestFunctionContextOptions = exports.testUidFactory = exports.authorizedUserContextFactory = exports.authorizedUserContext = exports.AuthorizedUserTestContextInstance = exports.AuthorizedUserTestContextFixture = void 0;
|
|
3
|
+
exports.testFirestoreClaimsFromUserRecord = exports.decodeEncodedCreateCustomTokenResult = exports.createEncodedTestFirestoreTokenForUserRecord = exports.createTestFirestoreTokenForUserRecord = exports.createTestFunctionContextAuthData = exports.createTestFunctionContextOptions = exports.testUidFactory = exports.authorizedUserContextFactory = exports.AUTHORIZED_USER_RANDOM_PHONE_NUMBER_FACTORY = exports.AUTHORIZED_USER_RANDOM_EMAIL_FACTORY = exports.authorizedUserContext = exports.AuthorizedUserTestContextInstance = exports.AuthorizedUserTestContextFixture = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const util_1 = require("@dereekb/util");
|
|
6
6
|
const test_1 = require("@dereekb/util/test");
|
|
@@ -35,6 +35,15 @@ class AuthorizedUserTestContextInstance {
|
|
|
35
35
|
loadUserRecord() {
|
|
36
36
|
return this.testContext.auth.getUser(this.uid);
|
|
37
37
|
}
|
|
38
|
+
loadUserEmailAndPhone() {
|
|
39
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
const record = yield this.loadUserRecord();
|
|
41
|
+
return {
|
|
42
|
+
email: record.email,
|
|
43
|
+
phone: record.phoneNumber
|
|
44
|
+
};
|
|
45
|
+
});
|
|
46
|
+
}
|
|
38
47
|
loadIdToken() {
|
|
39
48
|
return this.loadUserRecord().then((record) => createEncodedTestFirestoreTokenForUserRecord(this.testContext.auth, record));
|
|
40
49
|
}
|
|
@@ -59,6 +68,8 @@ function authorizedUserContext(config, buildTests) {
|
|
|
59
68
|
authorizedUserContextFactory(config)({ f: config.f }, buildTests);
|
|
60
69
|
}
|
|
61
70
|
exports.authorizedUserContext = authorizedUserContext;
|
|
71
|
+
exports.AUTHORIZED_USER_RANDOM_EMAIL_FACTORY = (0, util_1.randomEmailFactory)();
|
|
72
|
+
exports.AUTHORIZED_USER_RANDOM_PHONE_NUMBER_FACTORY = (0, util_1.randomPhoneNumberFactory)();
|
|
62
73
|
/**
|
|
63
74
|
* Creates a new Jest Context that has a random user for authorization for use in firebase server tests.
|
|
64
75
|
*/
|
|
@@ -66,7 +77,7 @@ function authorizedUserContextFactory(config) {
|
|
|
66
77
|
const { uid: uidGetter, makeInstance = (uid, testInstance) => new AuthorizedUserTestContextInstance(uid, testInstance), makeFixture = (f) => new AuthorizedUserTestContextFixture(f), makeUserDetails = () => ({}), initUser } = config;
|
|
67
78
|
const makeUid = uidGetter ? (0, util_1.asGetter)(uidGetter) : exports.testUidFactory;
|
|
68
79
|
return (params, buildTests) => {
|
|
69
|
-
const { f, user: inputUser } = params;
|
|
80
|
+
const { f, user: inputUser, addContactInfo } = params;
|
|
70
81
|
return (0, test_1.useJestContextFixture)({
|
|
71
82
|
fixture: makeFixture(f),
|
|
72
83
|
buildTests,
|
|
@@ -74,7 +85,14 @@ function authorizedUserContextFactory(config) {
|
|
|
74
85
|
const uid = (inputUser === null || inputUser === void 0 ? void 0 : inputUser.uid) || makeUid();
|
|
75
86
|
const { details, claims } = Object.assign(Object.assign({}, makeUserDetails(uid, params)), params.template);
|
|
76
87
|
const auth = f.instance.auth;
|
|
77
|
-
|
|
88
|
+
let email;
|
|
89
|
+
let phoneNumber;
|
|
90
|
+
if (addContactInfo) {
|
|
91
|
+
email = (0, exports.AUTHORIZED_USER_RANDOM_EMAIL_FACTORY)();
|
|
92
|
+
phoneNumber = (0, exports.AUTHORIZED_USER_RANDOM_PHONE_NUMBER_FACTORY)();
|
|
93
|
+
}
|
|
94
|
+
const userRecord = yield auth.createUser(Object.assign(Object.assign({ uid, displayName: 'Test Person', email,
|
|
95
|
+
phoneNumber }, details), inputUser));
|
|
78
96
|
if (claims) {
|
|
79
97
|
yield auth.setCustomUserClaims(uid, claims);
|
|
80
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase.admin.auth.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.auth.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"firebase.admin.auth.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.auth.ts"],"names":[],"mappings":";;;;AACA,wCAAiN;AACjN,6CAAwH;AAMxH,+CAAmD;AAoBnD,MAAa,gCAA8P,SAAQ,0CAA0C;IAC3T,8CAA8C;IAC9C,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;IACxC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IAC5C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IAC5C,CAAC;IAED,iBAAiB,CAA2C,EAAK,EAAE,MAAkC;QACnG,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;CACF;AAzBD,4EAyBC;AAID,MAAa,iCAAiC;IAC5C,YAAqB,GAAuB,EAAW,WAAe;QAAjD,QAAG,GAAH,GAAG,CAAoB;QAAW,gBAAW,GAAX,WAAW,CAAI;IAAG,CAAC;IAE1E,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;IAEK,qBAAqB;;YACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAe;gBAC7B,KAAK,EAAE,MAAM,CAAC,WAA8B;aAC7C,CAAC;QACJ,CAAC;KAAA;IAED,WAAW;QACT,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,4CAA4C,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7H,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;IACvE,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gCAAgC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IACjH,CAAC;IAED,iBAAiB,CAA2C,EAAK,EAAE,MAAkC;QACnG,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAE,EAA+B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxG,CAAC;IAED,sBAAsB,CAA8C,EAAK,EAAE,MAAkC,EAAE,cAA8C;QAC3J,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAE,EAA+B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,iCAAM,cAAc,GAAK,OAAO,EAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7J,CAAC;CACF;AAlCD,8EAkCC;AAgDD;;GAEG;AACH,SAAgB,qBAAqB,CAAmU,MAAqD,EAAE,UAA0B;IACvb,4BAA4B,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;AACpE,CAAC;AAFD,sDAEC;AAmBY,QAAA,oCAAoC,GAAG,IAAA,yBAAkB,GAAE,CAAC;AAC5D,QAAA,2CAA2C,GAAG,IAAA,+BAAwB,GAAE,CAAC;AAEtF;;GAEG;AACH,SAAgB,4BAA4B,CAC1C,MAA4D;IAE5D,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,iCAAiC,CAAC,GAAG,EAAE,YAAY,CAAM,EAAE,WAAW,GAAG,CAAC,CAAK,EAAE,EAAE,CAAC,IAAI,gCAAgC,CAAY,CAAC,CAAC,EAAE,eAAe,GAAG,GAAG,EAAE,CAAC,CAAC,EAA+C,CAAA,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACxS,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,sBAAc,CAAC;IAEjE,OAAO,CAAC,MAAS,EAAE,UAA0B,EAAE,EAAE;QAC/C,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;QAEtD,OAAO,IAAA,4BAAqB,EAAO;YACjC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAM;YAC5B,UAAU;YACV,YAAY,EAAE,GAAS,EAAE;gBACvB,MAAM,GAAG,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,KAAI,OAAO,EAAE,CAAC;gBACxC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,mCAAQ,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,GAAK,MAAM,CAAC,QAAQ,CAAE,CAAC;gBACpF,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAE7B,IAAI,KAA+B,CAAC;gBACpC,IAAI,WAAwC,CAAC;gBAE7C,IAAI,cAAc,EAAE;oBAClB,KAAK,GAAG,IAAA,4CAAoC,GAAE,CAAC;oBAC/C,WAAW,GAAG,IAAA,mDAA2C,GAAE,CAAC;iBAC7D;gBAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,+BACtC,GAAG,EACH,WAAW,EAAE,aAAa,EAC1B,KAAK;oBACL,WAAW,IACR,OAAO,GACP,SAAS,EACZ,CAAC;gBAEH,IAAI,MAAM,EAAE;oBACV,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;iBAC7C;gBAED,MAAM,QAAQ,GAAM,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;gBAE5E,IAAI,QAAQ,EAAE;oBACZ,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;iBAClC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAA;YACD,eAAe,EAAE,CAAO,QAAW,EAAE,EAAE;gBACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC;gBACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;gBACzB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC,CAAA;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AArDD,oEAqDC;AAED;;;;GAIG;AACU,QAAA,cAAc,GAAgC,IAAA,gBAAS,EAAC,IAAA,gCAAyB,GAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;AAUzI;;;;;;GAMG;AACH,SAAsB,gCAAgC,CAAC,IAAU,EAAE,UAAsB;;QACvF,MAAM,QAAQ,GAAa,MAAM,iCAAiC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAErF,MAAM,cAAc,GAA2B;YAC7C,IAAI,EAAE,QAAQ;SACf,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AARD,4EAQC;AAED;;;;;;GAMG;AACH,SAAsB,iCAAiC,CAAC,IAAU,EAAE,UAAsB;;QACxF,MAAM,KAAK,GAAG,MAAM,qCAAqC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAE5E,MAAM,QAAQ,GAAa;YACzB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,KAAK;SACN,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AATD,8EASC;AAED;;;;;;GAMG;AACH,SAAgB,qCAAqC,CAAC,IAAU,EAAE,UAAsB;IACtF,OAAO,4CAA4C,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;AACnH,CAAC;AAFD,sFAEC;AAED;;;;;;GAMG;AACH,SAAgB,4CAA4C,CAAC,IAAU,EAAE,UAAsB;IAC7F,4IAA4I;IAE5I,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,EAAE,iCAAiC,CAAC,UAAU,CAAC,CAAC,CAAC;AAC/F,CAAC;AAJD,oGAIC;AAED,SAAgB,oCAAoC,CAAC,KAAgC;;IACnF,MAAM,OAAO,GAAG,IAAA,qBAAS,EAAC,KAAK,CAA4C,CAAC;IAC5E,MAAM,YAAY,iDACb,OAAO,GACP,OAAO,CAAC,MAAM,KACjB,SAAS,EAAE,OAAO,CAAC,GAAG,EACtB,QAAQ,EAAE,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,QAAQ,mCAAI,EAAE,GACzC,CAAC;IAEF,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,yCAAyC;IACrE,OAAO,YAAY,CAAC;AACtB,CAAC;AAXD,oFAWC;AAED,SAAgB,iCAAiC,CAAC,UAAsB;;IACtE,sDAAsD;IACtD,MAAM,UAAU,GAAyC;QACvD,OAAO,EAAE,UAAU,CAAC,QAAQ;QAC5B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,cAAc,EAAE,MAAA,UAAU,CAAC,aAAa,mCAAI,KAAK;QACjD,QAAQ,EAAE;YACR,gBAAgB,EAAE,+BAA+B;YACjD,UAAU,EAAE,EAAE;SACf;KACF,CAAC;IAEF,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAC7C,MAAM,MAAM,mCACP,YAAY,GACZ,UAAU,CACd,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAnBD,8EAmBC"}
|
|
@@ -63,6 +63,9 @@ function firebaseAdminNestContextWithFixture(config, f, buildTests) {
|
|
|
63
63
|
providers.push({
|
|
64
64
|
provide: firebase_server_1.FirebaseServerEnvService,
|
|
65
65
|
useClass: firebase_server_1.DefaultFirebaseServerEnvService
|
|
66
|
+
}, {
|
|
67
|
+
provide: nestjs_1.ServerEnvironmentService,
|
|
68
|
+
useExisting: firebase_server_1.FirebaseServerEnvService
|
|
66
69
|
});
|
|
67
70
|
}
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase.admin.nest.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.nest.ts"],"names":[],"mappings":";;;;AAAA,6CAAmL;AACnL,qDAAoJ;AAGpJ,8DAA8M;AAC9M,6CAAsD;AACtD,wCAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"firebase.admin.nest.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.nest.ts"],"names":[],"mappings":"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"}
|