@stevenkellner/team-conduct-api 2.0.16 → 2.0.17

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.
Files changed (8) hide show
  1. package/lib/src/firebase/Firestore.d.ts +3 -1
  2. package/lib/src/firebase/FirestoreScheme.d.ts +3 -1
  3. package/lib/src/firebase/checkAuthentication.js +1 -1
  4. package/lib/test/firebase/checkAuthentication.test.js +13 -13
  5. package/package.json +1 -1
  6. package/src/firebase/Firestore.ts +1 -1
  7. package/src/firebase/FirestoreScheme.ts +1 -1
  8. package/src/firebase/checkAuthentication.ts +1 -1
package/lib/src/firebase/Firestore.d.ts CHANGED
@@ -82,7 +82,9 @@ export declare class Firestore {
82
82
  * ```
83
83
  */
84
84
  team(id: Team.Id): FirestoreDocument<Team>;
85
- userAuth(userAuthId: UserAuthId): FirestoreDocument<User.Id>;
85
+ userAuth(userAuthId: UserAuthId): FirestoreDocument<{
86
+ userId: User.Id;
87
+ }>;
86
88
  /**
87
89
  * Gets a reference to a user document.
88
90
  *
package/lib/src/firebase/FirestoreScheme.d.ts CHANGED
@@ -16,7 +16,9 @@ import { Fine, FineTemplate, Invitation, Person, Team, User } from '../types';
16
16
  */
17
17
  export type FirestoreScheme = FirestoreDocument<never, {
18
18
  userAuthIdDict: FirestoreCollection<{
19
- [UserAuthId in string]: FirestoreDocument<User.Id>;
19
+ [UserAuthId in string]: FirestoreDocument<{
20
+ userId: User.Id;
21
+ }>;
20
22
  }>;
21
23
  users: FirestoreCollection<{
22
24
  [UserId in string]: FirestoreDocument<User>;
package/lib/src/firebase/checkAuthentication.js CHANGED
@@ -43,7 +43,7 @@ async function checkAuthentication(userAuthId, teamId, roles) {
43
43
  const userAuthSnapshot = await Firestore_1.Firestore.shared.userAuth(userAuthId).snapshot();
44
44
  if (!userAuthSnapshot.exists)
45
45
  throw new firebase_function_1.FunctionsError('permission-denied', 'User authentication does not exist');
46
- const userId = types_1.User.Id.builder.build(userAuthSnapshot.data);
46
+ const userId = types_1.User.Id.builder.build(userAuthSnapshot.data.userId);
47
47
  const userSnapshot = await Firestore_1.Firestore.shared.user(userId).snapshot();
48
48
  if (!userSnapshot.exists)
49
49
  throw new firebase_function_1.FunctionsError('permission-denied', 'User does not exist');
package/lib/test/firebase/checkAuthentication.test.js CHANGED
@@ -31,7 +31,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
31
31
  (0, mocha_1.it)('should throw "permission-denied" if user does not exist', async () => {
32
32
  (0, firebase_utils_1.configureFirebase)({
33
33
  userAuthIdDict: firebase_utils_1.Collection.docs({
34
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
34
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
35
35
  }),
36
36
  users: firebase_utils_1.Collection.docs({
37
37
  [userId.value]: firebase_utils_1.Document.empty()
@@ -45,7 +45,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
45
45
  const emptyTeams = new typescript_common_functionality_1.Dictionary(index_1.Team.Id.builder);
46
46
  (0, firebase_utils_1.configureFirebase)({
47
47
  userAuthIdDict: firebase_utils_1.Collection.docs({
48
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
48
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
49
49
  }),
50
50
  users: firebase_utils_1.Collection.docs({
51
51
  [userId.value]: firebase_utils_1.Document.user(userId, emptyTeams)
@@ -64,7 +64,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
64
64
  }));
65
65
  (0, firebase_utils_1.configureFirebase)({
66
66
  userAuthIdDict: firebase_utils_1.Collection.docs({
67
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
67
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
68
68
  }),
69
69
  users: firebase_utils_1.Collection.docs({
70
70
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -90,7 +90,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
90
90
  }));
91
91
  (0, firebase_utils_1.configureFirebase)({
92
92
  userAuthIdDict: firebase_utils_1.Collection.docs({
93
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
93
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
94
94
  }),
95
95
  users: firebase_utils_1.Collection.docs({
96
96
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -118,7 +118,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
118
118
  }));
119
119
  (0, firebase_utils_1.configureFirebase)({
120
120
  userAuthIdDict: firebase_utils_1.Collection.docs({
121
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
121
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
122
122
  }),
123
123
  users: firebase_utils_1.Collection.docs({
124
124
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -144,7 +144,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
144
144
  }));
145
145
  (0, firebase_utils_1.configureFirebase)({
146
146
  userAuthIdDict: firebase_utils_1.Collection.docs({
147
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
147
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
148
148
  }),
149
149
  users: firebase_utils_1.Collection.docs({
150
150
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -169,7 +169,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
169
169
  }));
170
170
  (0, firebase_utils_1.configureFirebase)({
171
171
  userAuthIdDict: firebase_utils_1.Collection.docs({
172
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
172
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
173
173
  }),
174
174
  users: firebase_utils_1.Collection.docs({
175
175
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -195,7 +195,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
195
195
  }));
196
196
  (0, firebase_utils_1.configureFirebase)({
197
197
  userAuthIdDict: firebase_utils_1.Collection.docs({
198
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
198
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
199
199
  }),
200
200
  users: firebase_utils_1.Collection.docs({
201
201
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -220,7 +220,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
220
220
  }));
221
221
  (0, firebase_utils_1.configureFirebase)({
222
222
  userAuthIdDict: firebase_utils_1.Collection.docs({
223
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
223
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
224
224
  }),
225
225
  users: firebase_utils_1.Collection.docs({
226
226
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -245,7 +245,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
245
245
  }));
246
246
  (0, firebase_utils_1.configureFirebase)({
247
247
  userAuthIdDict: firebase_utils_1.Collection.docs({
248
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
248
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
249
249
  }),
250
250
  users: firebase_utils_1.Collection.docs({
251
251
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -271,7 +271,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
271
271
  }));
272
272
  (0, firebase_utils_1.configureFirebase)({
273
273
  userAuthIdDict: firebase_utils_1.Collection.docs({
274
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
274
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
275
275
  }),
276
276
  users: firebase_utils_1.Collection.docs({
277
277
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -299,7 +299,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
299
299
  }));
300
300
  (0, firebase_utils_1.configureFirebase)({
301
301
  userAuthIdDict: firebase_utils_1.Collection.docs({
302
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
302
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
303
303
  }),
304
304
  users: firebase_utils_1.Collection.docs({
305
305
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
@@ -330,7 +330,7 @@ const firebase_function_1 = require("@stevenkellner/firebase-function");
330
330
  }));
331
331
  (0, firebase_utils_1.configureFirebase)({
332
332
  userAuthIdDict: firebase_utils_1.Collection.docs({
333
- [userAuthId.value]: firebase_utils_1.Document.data(userId.value)
333
+ [userAuthId.value]: firebase_utils_1.Document.data({ userId: userId.value })
334
334
  }),
335
335
  users: firebase_utils_1.Collection.docs({
336
336
  [userId.value]: firebase_utils_1.Document.user(userId, teams)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@stevenkellner/team-conduct-api",
3
- "version": "2.0.16",
3
+ "version": "2.0.17",
4
4
  "description": "Firebase API for Team Conduct",
5
5
  "license": "MIT",
6
6
  "author": "Steven Kellner",
package/src/firebase/Firestore.ts CHANGED
@@ -103,7 +103,7 @@ export class Firestore {
103
103
  .document(id.guidString) as FirestoreDocument<Team>;
104
104
  }
105
105
 
106
- public userAuth(userAuthId: UserAuthId): FirestoreDocument<User.Id> {
106
+ public userAuth(userAuthId: UserAuthId): FirestoreDocument<{ userId: User.Id }> {
107
107
  return this.base
108
108
  .collection('userAuthIdDict')
109
109
  .document(userAuthId.value);
package/src/firebase/FirestoreScheme.ts CHANGED
@@ -17,7 +17,7 @@ import { Fine, FineTemplate, Invitation, Person, Team, User } from '../types';
17
17
  */
18
18
  export type FirestoreScheme = FirestoreDocument<never, {
19
19
  userAuthIdDict: FirestoreCollection<{
20
- [UserAuthId in string]: FirestoreDocument<User.Id>
20
+ [UserAuthId in string]: FirestoreDocument<{ userId: User.Id }>
21
21
  }>,
22
22
  users: FirestoreCollection<{
23
23
  [UserId in string]: FirestoreDocument<User>
package/src/firebase/checkAuthentication.ts CHANGED
@@ -64,7 +64,7 @@ export async function checkAuthentication(userAuthId: UserAuthId | null, teamId:
64
64
  const userAuthSnapshot = await Firestore.shared.userAuth(userAuthId).snapshot();
65
65
  if (!userAuthSnapshot.exists)
66
66
  throw new FunctionsError('permission-denied', 'User authentication does not exist');
67
- const userId = User.Id.builder.build(userAuthSnapshot.data);
67
+ const userId = User.Id.builder.build(userAuthSnapshot.data.userId);
68
68
 
69
69
  const userSnapshot = await Firestore.shared.user(userId).snapshot();
70
70
  if (!userSnapshot.exists)