@tech4good/angular-schematics 17.0.3 → 18.0.0

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 (220) hide show
  1. package/README.md +8 -0
  2. package/package.json +4 -4
  3. package/src/collection.json +0 -16
  4. package/src/component/files/__name@dasherize__/__name@dasherize__.component.ts.template +22 -8
  5. package/src/component/index.js +2 -45
  6. package/src/component/index.js.map +1 -1
  7. package/src/component/schema.json +0 -5
  8. package/src/entity/files/__name@dasherize__/__name@dasherize__.mock.ts.template +12 -0
  9. package/src/entity/files/__name@dasherize__/__name@dasherize__.model.ts.template +1 -0
  10. package/src/entity/files/__name@dasherize__/__name@dasherize__.store.ts.template +41 -0
  11. package/src/entity/index.js +29 -50
  12. package/src/entity/index.js.map +1 -1
  13. package/src/init/files/.firebaserc.template +8 -0
  14. package/src/init/files/README.md.template +6 -6
  15. package/src/init/files/angular.json.template +18 -11
  16. package/src/init/files/package.json.template +28 -29
  17. package/src/init/files/src/app/admin/{waitlist/waitlist.animations.ts.template → admin-panel/admin-panel.animations.ts.template} +1 -1
  18. package/src/init/files/src/app/admin/{waitlist/waitlist.component.html.template → admin-panel/admin-panel.component.html.template} +3 -3
  19. package/src/init/files/src/app/admin/{waitlist/waitlist.component.scss.template → admin-panel/admin-panel.component.scss.template} +1 -1
  20. package/src/init/files/src/app/admin/admin-panel/admin-panel.component.spec.ts.template +25 -0
  21. package/src/init/files/src/app/admin/admin-panel/admin-panel.component.ts.template +99 -0
  22. package/src/init/files/src/app/app.component.html.template +1 -0
  23. package/src/init/files/src/app/app.component.ts.template +14 -8
  24. package/src/init/files/src/app/app.config.ts.template +63 -0
  25. package/src/init/files/src/app/app.routes.ts.template +32 -0
  26. package/src/init/files/src/app/core/analytics/log.service.ts.template +122 -89
  27. package/src/init/files/src/app/core/analytics/time-analytics.service.ts.template +9 -17
  28. package/src/init/files/src/app/core/auth/auth.guard.ts.template +25 -22
  29. package/src/init/files/src/app/core/firebase/cached-listeners.service.ts.template +291 -0
  30. package/src/init/files/src/app/core/firebase/database.service.ts.template +56 -0
  31. package/src/init/files/src/app/core/firebase/firebase.mock.service.ts.template +276 -0
  32. package/src/init/files/src/app/core/firebase/firebase.service.ts.template +265 -215
  33. package/src/init/files/src/app/core/local-storage/session.service.ts.template +3 -4
  34. package/src/init/files/src/app/core/store/app.model.ts.template +19 -0
  35. package/src/init/files/src/app/core/store/app.store.ts.template +1074 -0
  36. package/src/init/files/src/app/core/store/auth/auth.mock.ts.template +20 -0
  37. package/src/init/files/src/app/core/store/auth/auth.store.ts.template +136 -0
  38. package/src/init/files/src/app/core/store/batch-write.firebase.service.ts.template +58 -0
  39. package/src/init/files/src/app/core/store/batch-write.mock.service.ts.template +105 -0
  40. package/src/init/files/src/app/core/store/batch-write.service.ts.template +126 -0
  41. package/src/init/files/src/app/core/store/user/user.mock.ts.template +24 -0
  42. package/src/init/files/src/app/core/store/user/user.model.ts.template +1 -1
  43. package/src/init/files/src/app/core/store/user/user.store.ts.template +41 -0
  44. package/src/init/files/src/app/core/store/user-context/user-context.mock.ts.template +24 -0
  45. package/src/init/files/src/app/core/store/user-context/user-context.model.ts.template +1 -0
  46. package/src/init/files/src/app/core/store/user-context/user-context.store.ts.template +41 -0
  47. package/src/init/files/src/app/core/utils/rand.utils.ts.template +13 -0
  48. package/src/init/files/src/app/{onboarding → first-time}/consent/consent.component.html.template +8 -13
  49. package/src/init/files/src/app/first-time/consent/consent.component.ts.template +90 -0
  50. package/src/init/files/src/app/first-time/early-access/early-access.animations.ts.template +4 -0
  51. package/src/init/files/src/app/first-time/early-access/early-access.component.html.template +69 -0
  52. package/src/init/files/src/app/{onboarding/waiting/waiting.component.scss.template → first-time/early-access/early-access.component.scss.template} +1 -1
  53. package/src/init/files/src/app/first-time/early-access/early-access.component.spec.ts.template +25 -0
  54. package/src/init/files/src/app/first-time/early-access/early-access.component.ts.template +194 -0
  55. package/src/init/files/src/app/first-time/early-access/early-access.model.ts.template +7 -0
  56. package/src/init/files/src/app/{general → first-time}/landing/landing.component.html.template +1 -1
  57. package/src/init/files/src/app/first-time/landing/landing.component.ts.template +44 -0
  58. package/src/init/files/src/app/first-time/login/login.component.html.template +10 -0
  59. package/src/init/files/src/app/first-time/login/login.component.ts.template +45 -0
  60. package/src/init/files/src/app/first-time/onboarding/onboarding.animations.ts.template +4 -0
  61. package/src/init/files/src/app/first-time/onboarding/onboarding.component.html.template +2 -0
  62. package/src/init/files/src/app/first-time/onboarding/onboarding.component.scss.template +5 -0
  63. package/src/init/files/src/app/{admin/waitlist/waitlist.component.spec.ts.template → first-time/onboarding/onboarding.component.spec.ts.template} +6 -6
  64. package/src/init/files/src/app/first-time/onboarding/onboarding.component.ts.template +41 -0
  65. package/src/init/files/src/app/main/home/home.component.html.template +5 -0
  66. package/src/init/files/src/app/main/home/home.component.ts.template +51 -0
  67. package/src/init/files/src/app/shared/navbar/navbar.component.html.template +15 -0
  68. package/src/init/files/src/app/shared/navbar/navbar.component.scss.template +43 -0
  69. package/src/init/files/src/app/shared/navbar/navbar.component.spec.ts.template +25 -0
  70. package/src/init/files/src/app/shared/navbar/navbar.component.ts.template +40 -0
  71. package/src/init/files/src/app/shared/redeployment-warning/redeployment-warning.component.html.template +9 -0
  72. package/src/init/files/src/app/shared/{components/redeployment-warning → redeployment-warning}/redeployment-warning.component.ts.template +17 -6
  73. package/src/init/files/src/app/shared/{components/redeployment-warning → redeployment-warning}/redeployment-warning.service.ts.template +2 -2
  74. package/src/init/files/src/assets/images/close-x.svg +3 -0
  75. package/src/init/files/src/environments/environment.ts.template +1 -0
  76. package/src/init/files/src/index.html.template +1 -1
  77. package/src/init/files/tsconfig.json.template +0 -1
  78. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.actions.ts.template +0 -26
  79. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.effects.ts.template +0 -48
  80. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.model.ts.template +0 -0
  81. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.selectors.ts.template +0 -20
  82. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.state.ts.template +0 -13
  83. package/src/container/files/__name@dasherize__/__name@dasherize__.animations.ts.template +0 -4
  84. package/src/container/files/__name@dasherize__/__name@dasherize__.component.html.template +0 -3
  85. package/src/container/files/__name@dasherize__/__name@dasherize__.component.scss.template +0 -5
  86. package/src/container/files/__name@dasherize__/__name@dasherize__.component.spec.ts.template +0 -25
  87. package/src/container/files/__name@dasherize__/__name@dasherize__.component.ts.template +0 -90
  88. package/src/container/index.d.ts +0 -2
  89. package/src/container/index.js +0 -127
  90. package/src/container/index.js.map +0 -1
  91. package/src/container/index_spec.d.ts +0 -1
  92. package/src/container/index_spec.js +0 -23
  93. package/src/container/index_spec.js.map +0 -1
  94. package/src/container/schema.json +0 -50
  95. package/src/entity/files/__name@dasherize__/__name@dasherize__.actions.ts.template +0 -249
  96. package/src/entity/files/__name@dasherize__/__name@dasherize__.effects.ts.template +0 -131
  97. package/src/entity/files/__name@dasherize__/__name@dasherize__.reducer.spec.ts.template +0 -13
  98. package/src/entity/files/__name@dasherize__/__name@dasherize__.reducer.ts.template +0 -51
  99. package/src/entity/files/__name@dasherize__/__name@dasherize__.service.ts.template +0 -50
  100. package/src/entity-in-example/files/__name@dasherize__/__name@dasherize__.actions.ts.template +0 -270
  101. package/src/entity-in-example/files/__name@dasherize__/__name@dasherize__.effects.ts.template +0 -131
  102. package/src/entity-in-example/files/__name@dasherize__/__name@dasherize__.model.ts.template +0 -3
  103. package/src/entity-in-example/files/__name@dasherize__/__name@dasherize__.reducer.spec.ts.template +0 -13
  104. package/src/entity-in-example/files/__name@dasherize__/__name@dasherize__.reducer.ts.template +0 -51
  105. package/src/entity-in-example/files/__name@dasherize__/__name@dasherize__.service.ts.template +0 -50
  106. package/src/entity-in-example/index.d.ts +0 -2
  107. package/src/entity-in-example/index.js +0 -141
  108. package/src/entity-in-example/index.js.map +0 -1
  109. package/src/entity-in-example/index_spec.d.ts +0 -1
  110. package/src/entity-in-example/index_spec.js +0 -23
  111. package/src/entity-in-example/index_spec.js.map +0 -1
  112. package/src/entity-in-example/schema.json +0 -45
  113. package/src/init/files/CHANGELOG.md.template +0 -10
  114. package/src/init/files/src/app/admin/admin-routing.module.ts.template +0 -17
  115. package/src/init/files/src/app/admin/admin.module.spec.ts.template +0 -13
  116. package/src/init/files/src/app/admin/admin.module.ts.template +0 -28
  117. package/src/init/files/src/app/admin/waitlist/+state/waitlist.actions.ts.template +0 -23
  118. package/src/init/files/src/app/admin/waitlist/+state/waitlist.effects.ts.template +0 -50
  119. package/src/init/files/src/app/admin/waitlist/+state/waitlist.model.ts.template +0 -0
  120. package/src/init/files/src/app/admin/waitlist/+state/waitlist.selectors.ts.template +0 -39
  121. package/src/init/files/src/app/admin/waitlist/+state/waitlist.state.ts.template +0 -13
  122. package/src/init/files/src/app/admin/waitlist/waitlist.component.ts.template +0 -141
  123. package/src/init/files/src/app/app-routing.module.ts.template +0 -26
  124. package/src/init/files/src/app/app.module.ts.template +0 -34
  125. package/src/init/files/src/app/core/core.module.ts.template +0 -75
  126. package/src/init/files/src/app/core/setup/firebase-setup.ts.template +0 -25
  127. package/src/init/files/src/app/core/setup/module-import-guard.ts.template +0 -5
  128. package/src/init/files/src/app/core/snackbar/snackbar.actions.ts.template +0 -24
  129. package/src/init/files/src/app/core/snackbar/snackbar.effects.ts.template +0 -41
  130. package/src/init/files/src/app/core/store/app-state/app-state.actions.ts.template +0 -249
  131. package/src/init/files/src/app/core/store/app-state/app-state.effects.ts.template +0 -131
  132. package/src/init/files/src/app/core/store/app-state/app-state.model.ts.template +0 -8
  133. package/src/init/files/src/app/core/store/app-state/app-state.reducer.spec.ts.template +0 -13
  134. package/src/init/files/src/app/core/store/app-state/app-state.reducer.ts.template +0 -51
  135. package/src/init/files/src/app/core/store/app-state/app-state.service.ts.template +0 -50
  136. package/src/init/files/src/app/core/store/app.actions.ts.template +0 -92
  137. package/src/init/files/src/app/core/store/app.effects.ts.template +0 -175
  138. package/src/init/files/src/app/core/store/app.reducer.ts.template +0 -36
  139. package/src/init/files/src/app/core/store/app.selectors.ts.template +0 -42
  140. package/src/init/files/src/app/core/store/auth/auth.actions.ts.template +0 -77
  141. package/src/init/files/src/app/core/store/auth/auth.effects.ts.template +0 -163
  142. package/src/init/files/src/app/core/store/auth/auth.reducer.spec.ts.template +0 -13
  143. package/src/init/files/src/app/core/store/auth/auth.reducer.ts.template +0 -26
  144. package/src/init/files/src/app/core/store/auth/auth.selectors.ts.template +0 -25
  145. package/src/init/files/src/app/core/store/cached-load-connections.service.ts.template +0 -405
  146. package/src/init/files/src/app/core/store/cached-selectors.service.ts.template +0 -376
  147. package/src/init/files/src/app/core/store/effects.helpers.ts.template +0 -66
  148. package/src/init/files/src/app/core/store/user/user.actions.ts.template +0 -248
  149. package/src/init/files/src/app/core/store/user/user.effects.ts.template +0 -149
  150. package/src/init/files/src/app/core/store/user/user.reducer.spec.ts.template +0 -13
  151. package/src/init/files/src/app/core/store/user/user.reducer.ts.template +0 -50
  152. package/src/init/files/src/app/core/store/user/user.service.ts.template +0 -50
  153. package/src/init/files/src/app/core/store/user-context/user-context.actions.ts.template +0 -248
  154. package/src/init/files/src/app/core/store/user-context/user-context.effects.ts.template +0 -131
  155. package/src/init/files/src/app/core/store/user-context/user-context.reducer.spec.ts.template +0 -13
  156. package/src/init/files/src/app/core/store/user-context/user-context.reducer.ts.template +0 -51
  157. package/src/init/files/src/app/core/store/user-context/user-context.service.ts.template +0 -50
  158. package/src/init/files/src/app/core/utils/string-case.utils.ts.template +0 -96
  159. package/src/init/files/src/app/general/general-routing.module.ts.template +0 -25
  160. package/src/init/files/src/app/general/general.module.spec.ts.template +0 -13
  161. package/src/init/files/src/app/general/general.module.ts.template +0 -36
  162. package/src/init/files/src/app/general/home/+state/home.actions.ts.template +0 -26
  163. package/src/init/files/src/app/general/home/+state/home.effects.ts.template +0 -48
  164. package/src/init/files/src/app/general/home/+state/home.model.ts.template +0 -0
  165. package/src/init/files/src/app/general/home/+state/home.selectors.ts.template +0 -20
  166. package/src/init/files/src/app/general/home/+state/home.state.ts.template +0 -13
  167. package/src/init/files/src/app/general/home/home.component.html.template +0 -5
  168. package/src/init/files/src/app/general/home/home.component.ts.template +0 -88
  169. package/src/init/files/src/app/general/landing/+state/landing.actions.ts.template +0 -26
  170. package/src/init/files/src/app/general/landing/+state/landing.effects.ts.template +0 -48
  171. package/src/init/files/src/app/general/landing/+state/landing.model.ts.template +0 -0
  172. package/src/init/files/src/app/general/landing/+state/landing.selectors.ts.template +0 -20
  173. package/src/init/files/src/app/general/landing/+state/landing.state.ts.template +0 -13
  174. package/src/init/files/src/app/general/landing/landing.component.ts.template +0 -98
  175. package/src/init/files/src/app/general/login/login.component.html.template +0 -11
  176. package/src/init/files/src/app/general/login/login.component.ts.template +0 -80
  177. package/src/init/files/src/app/onboarding/consent/+state/consent.actions.ts.template +0 -23
  178. package/src/init/files/src/app/onboarding/consent/+state/consent.effects.ts.template +0 -47
  179. package/src/init/files/src/app/onboarding/consent/+state/consent.model.ts.template +0 -0
  180. package/src/init/files/src/app/onboarding/consent/+state/consent.selectors.ts.template +0 -20
  181. package/src/init/files/src/app/onboarding/consent/+state/consent.state.ts.template +0 -13
  182. package/src/init/files/src/app/onboarding/consent/consent.component.ts.template +0 -151
  183. package/src/init/files/src/app/onboarding/onboarding-routing.module.ts.template +0 -19
  184. package/src/init/files/src/app/onboarding/onboarding.module.spec.ts.template +0 -13
  185. package/src/init/files/src/app/onboarding/onboarding.module.ts.template +0 -32
  186. package/src/init/files/src/app/onboarding/waiting/+state/waiting.actions.ts.template +0 -26
  187. package/src/init/files/src/app/onboarding/waiting/+state/waiting.effects.ts.template +0 -52
  188. package/src/init/files/src/app/onboarding/waiting/+state/waiting.model.ts.template +0 -9
  189. package/src/init/files/src/app/onboarding/waiting/+state/waiting.selectors.ts.template +0 -42
  190. package/src/init/files/src/app/onboarding/waiting/+state/waiting.state.ts.template +0 -13
  191. package/src/init/files/src/app/onboarding/waiting/waiting.animations.ts.template +0 -4
  192. package/src/init/files/src/app/onboarding/waiting/waiting.component.html.template +0 -57
  193. package/src/init/files/src/app/onboarding/waiting/waiting.component.spec.ts.template +0 -25
  194. package/src/init/files/src/app/onboarding/waiting/waiting.component.ts.template +0 -281
  195. package/src/init/files/src/app/shared/components/redeployment-warning/redeployment-warning.component.html.template +0 -10
  196. package/src/init/files/src/app/shared/shared.module.ts.template +0 -87
  197. package/src/init/files/src/main.ts.template +0 -12
  198. package/src/module/files/__name@dasherize__/__name@dasherize__-routing.module.ts.template +0 -15
  199. package/src/module/files/__name@dasherize__/__name@dasherize__.module.spec.ts.template +0 -13
  200. package/src/module/files/__name@dasherize__/__name@dasherize__.module.ts.template +0 -24
  201. package/src/module/index.d.ts +0 -2
  202. package/src/module/index.js +0 -97
  203. package/src/module/index.js.map +0 -1
  204. package/src/module/index_spec.d.ts +0 -1
  205. package/src/module/index_spec.js +0 -23
  206. package/src/module/index_spec.js.map +0 -1
  207. package/src/module/schema.json +0 -38
  208. /package/src/init/files/src/app/{onboarding → first-time}/consent/consent.animations.ts.template +0 -0
  209. /package/src/init/files/src/app/{onboarding → first-time}/consent/consent.component.scss.template +0 -0
  210. /package/src/init/files/src/app/{onboarding → first-time}/consent/consent.component.spec.ts.template +0 -0
  211. /package/src/init/files/src/app/{general → first-time}/landing/landing.animations.ts.template +0 -0
  212. /package/src/init/files/src/app/{general → first-time}/landing/landing.component.scss.template +0 -0
  213. /package/src/init/files/src/app/{general → first-time}/landing/landing.component.spec.ts.template +0 -0
  214. /package/src/init/files/src/app/{general → first-time}/login/login.component.scss.template +0 -0
  215. /package/src/init/files/src/app/{general → first-time}/login/login.component.spec.ts.template +0 -0
  216. /package/src/init/files/src/app/{general → main}/home/home.animations.ts.template +0 -0
  217. /package/src/init/files/src/app/{general → main}/home/home.component.scss.template +0 -0
  218. /package/src/init/files/src/app/{general → main}/home/home.component.spec.ts.template +0 -0
  219. /package/src/init/files/src/app/shared/{components/redeployment-warning → redeployment-warning}/redeployment-warning.component.scss.template +0 -0
  220. /package/src/init/files/src/app/shared/{components/redeployment-warning → redeployment-warning}/redeployment-warning.component.spec.ts.template +0 -0
@@ -1,54 +1,60 @@
1
- import { Injectable } from '@angular/core';
2
- import { AngularFirestore } from '@angular/fire/compat/firestore';
3
- import { AngularFireAuth } from '@angular/fire/compat/auth';
1
+ import { Injectable, inject, InjectionToken } from '@angular/core';
4
2
  import { Observable, combineLatest, merge, of, from, pipe } from 'rxjs';
5
3
  import { tap, pluck, mergeMap, filter, takeUntil, skip, switchMap, map, take } from 'rxjs/operators';
6
- import firebase from 'firebase/compat/app';
7
4
  import { environment } from '../../../environments/environment';
5
+ import { Firestore, DocumentSnapshot, serverTimestamp, sum, count, average, Timestamp, getDoc, getDocs, doc, setDoc, updateDoc, deleteDoc, docData, collection, collectionData, collectionChanges, query, where, orderBy, OrderByDirection, limit, startAt, startAfter, endAt, endBefore, DocumentChange, increment, AggregateQuerySnapshot, AggregateField, AggregateSpec, getAggregateFromServer, getCountFromServer, writeBatch, WriteBatch } from '@angular/fire/firestore';
6
+ import { Auth, user, User, signInWithPopup, signInWithCredential, signOut, linkWithPopup, linkWithCredential, fetchSignInMethodsForEmail, GoogleAuthProvider, GithubAuthProvider } from '@angular/fire/auth';
7
+ import { QueryParams, QueryOptions, AnyEntity } from '../store/app.model';
8
+ import { DatabaseService } from './database.service';
8
9
 
9
10
  @Injectable({
10
11
  providedIn: 'root',
11
12
  })
12
- export class FirebaseService {
13
+ export class FirebaseService implements DatabaseService {
14
+ private afAuth = inject(Auth);
15
+ private firestore = inject(Firestore);
16
+ private user$ = user(this.afAuth);
17
+
13
18
  constructor(
14
- private afStore: AngularFirestore,
15
- private afAuth: AngularFireAuth,
16
19
  ) { }
17
20
 
18
21
  /** Creates a unique id */
19
- createId = (): string => {
20
- return this.afStore.createId();
21
- };
22
+ createId(): string {
23
+ // see https://stackoverflow.com/questions/56574593/access-firestore-id-generator-on-the-front-end?noredirect=1&lq=1
24
+ // see https://github.com/firebase/firebase-js-sdk/blob/73a586c92afe3f39a844b2be86086fddb6877bb7/packages/firestore/src/util/misc.ts#L36
25
+ // Alphanumeric characters
26
+ const chars =
27
+ 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
28
+ let autoId = '';
29
+ for (let i = 0; i < 20; i++) {
30
+ autoId += chars.charAt(Math.floor(Math.random() * chars.length));
31
+ }
32
+ return autoId;
33
+ }
22
34
 
23
- afUser = () => {
24
- return this.afAuth.user;
25
- };
35
+ afUser(): Observable<User> {
36
+ return this.user$;
37
+ }
26
38
 
27
- login = (providerId, scope?: string): Observable<any> => {
39
+ login(providerId, scope?: string): any {
28
40
  const provider = this.getProvider(providerId, scope);
29
41
 
30
42
  if (provider) {
31
- return from(this.afAuth.signInWithPopup(provider)).pipe(
32
- mergeMap((results) => {
33
- return this.queryObjOnce('users', results.user.uid).pipe(
34
- map((dbUser) => Object.assign({}, results, { dbUser })),
35
- );
36
- }),
37
- );
43
+ return signInWithPopup(this.afAuth, provider);
38
44
  } else {
39
- return of(undefined);
45
+ return undefined;
40
46
  }
41
- };
47
+ }
42
48
 
43
49
  private getProvider(providerId, scope?: string) {
44
50
  let provider;
45
51
  switch (providerId) {
46
52
  case 'google.com': {
47
- provider = new firebase.auth.GoogleAuthProvider();
53
+ provider = new GoogleAuthProvider();
48
54
  break;
49
55
  }
50
56
  case 'github.com': {
51
- provider = new firebase.auth.GithubAuthProvider();
57
+ provider = new GithubAuthProvider();
52
58
  break;
53
59
  }
54
60
  }
@@ -58,227 +64,271 @@ export class FirebaseService {
58
64
  return provider;
59
65
  }
60
66
 
61
- loginLink = (error) => {
62
- firebase.auth().fetchSignInMethodsForEmail(error.email)
63
- .then((providers) => {
64
- this.queryListOnce('users', [['email', '==', error.email]]).subscribe((users) => {
65
- firebase.auth().signInWithPopup(this.getProvider(providers[0])).then((auth1) => {
66
- firebase.auth().signInWithCredential(auth1.credential)
67
- .then((auth2) => {
68
- auth2.user.linkWithCredential(error.credential);
69
- })
70
- .catch((error2) => console.log(error2));
67
+ loginLink(error) {
68
+ fetchSignInMethodsForEmail(this.afAuth, error.email)
69
+ .then(async (providers) => {
70
+ const provider = this.getProvider(providers[0]);
71
+
72
+ // This only handles if you already had an OAuthProvider user and are now signing in with email for first time
73
+ // Thus, it starts by signing into the OAuthProvider account with popup, then linking it together
74
+ // If we want to do the reverse, need to have them sign in with email
75
+ // If we want to link two OAuth, then see https://firebase.google.com/docs/auth/web/account-linking#web-modular-api_6
76
+ signInWithPopup(this.afAuth, provider).then((result) => {
77
+ const credential = provider.credentialFromResult(result);
78
+ signInWithCredential(this.afAuth, credential).then((result2) => {
79
+ linkWithCredential(result2.user, error.credential);
71
80
  });
81
+ console.log('Successfully linked');
72
82
  });
73
83
  });
74
- };
75
-
76
- logout = (): Observable<any> => {
77
- return from(this.afAuth.signOut());
78
- };
79
-
80
- queryObjValueChanges = <T>(collection: string, id: string) => {
81
- return this.afStore.doc<T>(`/${collection}/${id}`).valueChanges();
82
- };
84
+ }
83
85
 
84
- queryObjOnce<S>(
85
- collection: string,
86
- id: string,
87
- ): Observable<S>;
86
+ logout() {
87
+ return signOut(this.afAuth);
88
+ }
88
89
 
89
- queryObjOnce<S, T>(
90
- collection: string,
91
- id: string,
92
- childrenFn?: (e: S) => { [index: string]: Observable<any> },
93
- ): Observable<T>;
90
+ streamEntity<T>(collectionName: string, id: string) {
91
+ const docRef = doc(this.firestore, `${collectionName}/${id}`);
92
+ return docData(docRef) as Observable<T>;
93
+ }
94
94
 
95
- queryObjOnce<S, T>(
96
- collection: string,
97
- id: string,
98
- childrenFn?: (e: S) => { [index: string]: Observable<any> },
99
- ): Observable<T> {
100
- return this.queryObjValueChanges<S>(collection, id).pipe(
101
- take(1),
102
- switchMap((e) => {
103
- if (!e || !childrenFn) {
104
- return of(e);
105
- } else {
106
- const children = childrenFn(e);
107
- // transform the hash of observables into an array of observable hashes
108
- const obsArray = Object.keys(children).map((objKey) => {
109
- const obs = children[objKey];
110
- return obs.pipe(
111
- map((entity) => {
112
- const obj = {};
113
- obj[objKey] = entity;
114
- return obj;
115
- }),
116
- );
117
- });
118
- return obsArray.length === 0 ? of(e) : combineLatest(obsArray).pipe(
119
- map((array) => {
120
- return Object.assign({}, e, ...array);
121
- }),
122
- );
123
- }
124
- }),
125
- );
95
+ streamEntities<T>(collectionName, queryParams, queryOptions?) {
96
+ const collectionRef = collection(this.firestore, collectionName);
97
+ if (queryParams.length === 0 && (!queryOptions || Object.keys(queryOptions).length === 0)) {
98
+ return collectionData(collectionRef) as Observable<T[]>;
99
+ } else {
100
+ return collectionData(
101
+ query(collectionRef, ...this.constructQueryListRefMod(queryParams, queryOptions)),
102
+ ) as Observable<T[]>;
103
+ }
126
104
  }
127
105
 
128
- queryListStateChanges = <T>(collection, queryParams, queryOptions?) => {
106
+ streamEntitiesChanges<T>(collectionName, queryParams, queryOptions?): Observable<{
107
+ type: string;
108
+ docData: T;
109
+ }[]> {
129
110
  let stateChangeObs$;
111
+ const collectionRef = collection(this.firestore, collectionName);
130
112
 
131
113
  if (queryParams.length === 0 && (!queryOptions || Object.keys(queryOptions).length === 0)) {
132
- stateChangeObs$ = this.afStore.collection<T>(`/${collection}`).stateChanges();
114
+ stateChangeObs$ = collectionChanges(collectionRef);
133
115
  } else {
134
- stateChangeObs$ = this.afStore.collection<T>(
135
- `/${collection}`,
136
- this.constructQueryListRef(queryParams, queryOptions),
137
- ).stateChanges();
116
+ stateChangeObs$ = collectionChanges(
117
+ query(collectionRef, ...this.constructQueryListRefMod(queryParams, queryOptions)),
118
+ ) as Observable<DocumentChange<T>[]>;
138
119
  }
139
120
 
140
121
  return stateChangeObs$.pipe(
141
- map((changes: any[]) => {
142
- return changes.map((change) => {
143
- return {
144
- type: change.type,
145
- result: change.payload.doc.data(),
146
- };
147
- });
122
+ map((changes: DocumentChange<T>[]) => {
123
+ return changes.map((dc) => ({
124
+ type: dc.type,
125
+ docData: dc.doc.data(),
126
+ }));
148
127
  }),
149
128
  );
150
- };
129
+ }
151
130
 
152
- queryListValueChanges = <T>(collection, queryParams, queryOptions?) => {
153
- if (queryParams.length === 0 && (!queryOptions || Object.keys(queryOptions).length === 0)) {
154
- return this.afStore.collection<T>(`/${collection}`).valueChanges();
155
- } else {
156
- return this.afStore.collection<T>(
157
- `/${collection}`,
158
- this.constructQueryListRef(queryParams, queryOptions),
159
- ).valueChanges();
160
- }
161
- };
162
-
163
- private constructQueryListRef = (queryParams, queryOptions?) => (ref) => {
164
- const refWithQueries = queryParams.reduce((func, query) => {
165
- const [prop, comp, val] = query;
166
- return func.where(prop, comp, val);
167
- }, ref);
168
- if (!queryOptions) {
169
- queryOptions = {};
170
- }
171
- return Object.keys(queryOptions).reduce((func, queryKey) => {
172
- switch (queryKey) {
173
- case 'orderBy': {
174
- if (Array.isArray(queryOptions.orderBy)) {
175
- return func.orderBy(...queryOptions.orderBy);
176
- } else {
177
- return func.orderBy(queryOptions.orderBy);
131
+ private constructQueryListRefMod(queryParams, queryOptions?) {
132
+ // Convert queryParams to queryArray
133
+ // Note: firestore supports setting and querying for null, but not
134
+ // undefined. We filter out cases where the value is undefined
135
+ // to protect against cases when people are doing a nested query
136
+ // and some entity does not have a particular field, e.g.
137
+ // [['__hashtagId', '==', q.__hashtagId]] when __hashtagId is
138
+ // an optional parameter
139
+ const queryArray = queryParams
140
+ .filter((query) => query[2] !== undefined)
141
+ .map((query) => {
142
+ const [prop, comp, val] = query;
143
+ return where(prop, comp, val);
144
+ });
145
+
146
+ // Add queryOptions to queryArray
147
+ if (queryOptions) {
148
+ Object.keys(queryOptions).forEach((queryKey) => {
149
+ switch (queryKey) {
150
+ case 'orderBy': {
151
+ if (Array.isArray(queryOptions.orderBy)) {
152
+ queryArray.push(orderBy(queryOptions.orderBy[0], queryOptions.orderBy[1] as OrderByDirection));
153
+ } else {
154
+ queryArray.push(orderBy(queryOptions.orderBy));
155
+ }
156
+ break;
178
157
  }
179
- }
180
- case 'limit':
181
- return func.limit(queryOptions.limit);
158
+ case 'limit':
159
+ queryArray.push(limit(queryOptions.limit));
160
+ break;
182
161
 
183
- case 'startAt':
184
- return func.startAt(queryOptions.startAt);
162
+ case 'startAt':
163
+ queryArray.push(startAt(queryOptions.startAt));
164
+ break;
185
165
 
186
- case 'startAfter':
187
- return func.startAfter(queryOptions.startAfter);
166
+ case 'startAfter':
167
+ queryArray.push(startAfter(queryOptions.startAfter));
168
+ break;
188
169
 
189
- case 'endAt':
190
- return func.endAt(queryOptions.endAt);
170
+ case 'endAt':
171
+ queryArray.push(endAt(queryOptions.endAt));
172
+ break;
191
173
 
192
- case 'endBefore':
193
- return func.endBefore(queryOptions.endBefore);
174
+ case 'endBefore':
175
+ queryArray.push(endBefore(queryOptions.endBefore));
176
+ break;
194
177
 
195
- default:
196
- return func;
197
- }
198
- }, refWithQueries);
199
- };
178
+ default:
179
+ break;
180
+ }
181
+ });
182
+ }
183
+ return queryArray;
184
+ }
200
185
 
201
- queryListOnce<S>(
202
- collection: string,
203
- queryParams: [string, string, any][],
204
- queryOptions?: { [index: string]: any },
205
- ): Observable<S[]>;
186
+ async getEntity<T>(collectionName: string, id: string) {
187
+ const docRef = doc(this.firestore, `${collectionName}/${id}`);
188
+ const docSnap = await getDoc(docRef) as DocumentSnapshot<T, T>;
206
189
 
207
- queryListOnce<S, T>(
208
- collection: string,
209
- queryParams: [string, string, any][],
210
- queryOptions?: { [index: string]: any },
211
- childrenFn?: (e: S) => { [index: string]: Observable<any> },
212
- ): Observable<T[]>;
190
+ if (docSnap.exists()) {
191
+ return docSnap.data();
192
+ } else {
193
+ return null;
194
+ }
195
+ }
213
196
 
214
- queryListOnce<S, T>(
215
- collection: string,
197
+ async getEntities<S>(
198
+ collectionName: string,
216
199
  queryParams: [string, string, any][],
217
200
  queryOptions?: { [index: string]: any },
218
- childrenFn?: (e: S) => { [index: string]: Observable<any> },
219
- ): Observable<T[]> {
220
- return this.queryListValueChanges<S>(collection, queryParams, queryOptions).pipe(
221
- take(1),
222
- switchMap((entities) => {
223
- if (!entities || !childrenFn || entities.length === 0) {
224
- return of(entities);
225
- } else {
226
- return combineLatest(entities.map((e) => {
227
- // If there are children, then we need to transform the hash of observables into an observable with the data object
228
- const children = childrenFn(e);
229
-
230
- const obsArray = Object.keys(children).map((objKey) => {
231
- const obs = children[objKey];
232
- return obs.pipe(
233
- map((entity) => {
234
- const obj = {};
235
- obj[objKey] = entity;
236
- return obj;
237
- }),
238
- );
239
- });
240
- return obsArray.length === 0 ? of(e) : combineLatest(obsArray).pipe(
241
- map((array) => {
242
- return Object.assign({}, e, ...array);
243
- }),
244
- );
245
- }));
246
- }
247
- }),
248
- );
201
+ ): Promise<S[]> {
202
+ const collectionRef = collection(this.firestore, collectionName);
203
+ let querySnapshot;
204
+ if (queryParams.length === 0 && (!queryOptions || Object.keys(queryOptions).length === 0)) {
205
+ querySnapshot = await getDocs(collectionRef);
206
+ } else {
207
+ querySnapshot = await getDocs(
208
+ query(collectionRef, ...this.constructQueryListRefMod(queryParams, queryOptions)),
209
+ );
210
+ }
211
+ const entities = querySnapshot.docs.map((doc) => doc.data());
212
+ return entities;
213
+ }
214
+
215
+ async count(
216
+ collectionName: string,
217
+ queryParams: QueryParams,
218
+ queryOptions?: QueryOptions,
219
+ ): Promise<number> {
220
+ const collectionRef = collection(this.firestore, collectionName);
221
+ let querySnapshot;
222
+ if (queryParams.length === 0 && (!queryOptions || Object.keys(queryOptions).length === 0)) {
223
+ querySnapshot = await getCountFromServer(collectionRef);
224
+ } else {
225
+ querySnapshot = await getCountFromServer(
226
+ query(collectionRef, ...this.constructQueryListRefMod(queryParams, queryOptions)),
227
+ );
228
+ }
229
+ return querySnapshot.data().count;
249
230
  }
250
231
 
251
- addEntity = (collection, entity) => {
252
- return from(this.afStore.doc(`/${collection}/${entity.__id}`).set(Object.assign({}, entity, {
253
- _createdAt: firebase.firestore.Timestamp.now(), // TODO: update to ServerValue.TIMESTAMP since more accurate
254
- _updatedAt: firebase.firestore.Timestamp.now(), // TODO: update to ServerValue.TIMESTAMP since more accurate
255
- })));
256
- };
257
-
258
- updateEntity = (collection, id, changes) => {
259
- return from(this.afStore.doc(`/${collection}/${id}`).update(Object.assign({}, changes, {
260
- _updatedAt: firebase.firestore.Timestamp.now(),
261
- })));
262
- };
263
-
264
- upsertEntity = (collection, entity): Observable<{ type: string, value: any }> => {
265
- return from((async () => {
266
- const dbEntity = await this.queryObjOnce(collection, entity.__id).toPromise();
267
- if (dbEntity) {
268
- return {
269
- type: 'update',
270
- value: await this.updateEntity(collection, entity.__id, entity),
271
- };
272
- } else {
273
- return {
274
- type: 'add',
275
- value: await this.addEntity(collection, entity),
276
- };
232
+ /*
233
+ * Example of aggregateSpec
234
+ * {
235
+ * countOfDocs: ['count'],
236
+ * totalPopulation: ['sum', 'population'],
237
+ * averagePopulation: ['average', 'population'],
238
+ * }
239
+ */
240
+ async aggregate<S extends { [k: string]: number }>(
241
+ collectionName: string,
242
+ queryParams: QueryParams,
243
+ queryOptions: QueryOptions,
244
+ aggregateParams: { [K in keyof S]: [string] | [string, string] },
245
+ ): Promise<{ [K in keyof S]: number }> {
246
+ const collectionRef = collection(this.firestore, collectionName);
247
+ let querySnapshot;
248
+
249
+ const aggregateSpec: AggregateSpec = {};
250
+
251
+ for (const key in aggregateParams) {
252
+ if (key === 'count') {
253
+ aggregateSpec[key] = count();
254
+ } else if (key === 'sum') {
255
+ aggregateSpec[key] = sum(aggregateParams[key][1]);
256
+ } else if (key === 'average') {
257
+ aggregateSpec[key] = average(aggregateParams[key][1]);
277
258
  }
278
- })());
279
- };
259
+ }
260
+
261
+ if (queryParams.length === 0 && (!queryOptions || Object.keys(queryOptions).length === 0)) {
262
+ querySnapshot = await getAggregateFromServer(collectionRef, aggregateSpec);
263
+ } else {
264
+ querySnapshot = await getAggregateFromServer(
265
+ query(collectionRef, ...this.constructQueryListRefMod(queryParams, queryOptions)),
266
+ aggregateSpec,
267
+ );
268
+ }
269
+ return querySnapshot.data();
270
+ }
271
+
272
+ async addEntity(
273
+ collectionName: string,
274
+ entity: AnyEntity,
275
+ batch?: WriteBatch,
276
+ ) {
277
+ const docRef = doc(this.firestore, `${collectionName}/${entity.__id}`);
278
+ const entityFinal = Object.assign({}, entity, {
279
+ _createdAt: serverTimestamp(),
280
+ _updatedAt: serverTimestamp(),
281
+ _deleted: false,
282
+ });
283
+ if (batch) {
284
+ return batch.set(docRef, entityFinal);
285
+ } else {
286
+ return setDoc(docRef, entityFinal);
287
+ }
288
+ }
289
+
290
+ async updateEntity(
291
+ collectionName: string,
292
+ id: string,
293
+ changes: Partial<AnyEntity>,
294
+ batch?: WriteBatch,
295
+ ) {
296
+ const docRef = doc(this.firestore, `${collectionName}/${id}`);
297
+ const changesFinal = Object.assign({}, changes, {
298
+ _updatedAt: serverTimestamp(),
299
+ });
300
+ if (batch) {
301
+ return batch.update(docRef, changesFinal);
302
+ } else {
303
+ return updateDoc(docRef, changesFinal);
304
+ }
305
+ }
306
+
307
+ async removeEntity(
308
+ collectionName: string,
309
+ id: string,
310
+ batch?: WriteBatch,
311
+ ) {
312
+ const docRef = doc(this.firestore, `${collectionName}/${id}`);
313
+ // we do soft deletes from client side
314
+ const changes = {
315
+ _updatedAt: serverTimestamp(),
316
+ _deleted: true,
317
+ };
318
+ if (batch) {
319
+ return batch.update(docRef, changes);
320
+ } else {
321
+ return updateDoc(docRef, changes);
322
+ }
323
+ }
280
324
 
281
- removeEntity = (collection, id) => {
282
- return from(this.afStore.doc(`/${collection}/${id}`).delete());
283
- };
325
+ async incrementEntityField(collectionName, id, field, delta) {
326
+ const docRef = doc(this.firestore, collectionName, id);
327
+ const changes = {};
328
+ changes[field] = increment(delta);
329
+
330
+ return updateDoc(docRef, Object.assign({}, changes, {
331
+ _updatedAt: serverTimestamp(),
332
+ }));
333
+ }
284
334
  }
@@ -1,6 +1,6 @@
1
1
  import { Injectable } from '@angular/core';
2
2
  import { LocalStorageService } from './local-storage.service';
3
- import { LoggingAngularFirestore } from '../setup/firebase-setup';
3
+ import { createId } from '../utils/rand.utils';
4
4
 
5
5
  /**
6
6
  * Create a sessionId and deviceId for the user. The sessionId should be stored
@@ -20,19 +20,18 @@ export class SessionService {
20
20
 
21
21
  constructor(
22
22
  private local: LocalStorageService,
23
- private log: LoggingAngularFirestore,
24
23
  ) {
25
24
  // Get sessionId from sessionStorage. If does not exist, create one
26
25
  this.sessionId = sessionStorage.getItem(this.SESSION_ID_KEY);
27
26
  if (!this.sessionId) {
28
- this.sessionId = this.log.createId();
27
+ this.sessionId = createId();
29
28
  sessionStorage.setItem(this.SESSION_ID_KEY, this.sessionId);
30
29
  }
31
30
  // console.log('SESSION_ID', this.sessionId);
32
31
 
33
32
  this.deviceId = this.local.getItem(this.DEVICE_ID_KEY);
34
33
  if (!this.deviceId) {
35
- this.deviceId = this.log.createId();
34
+ this.deviceId = createId();
36
35
  this.local.setItem(this.DEVICE_ID_KEY, this.deviceId);
37
36
  }
38
37
  // console.log('DEVICE_ID', this.deviceId);
@@ -0,0 +1,19 @@
1
+ // Entity Models
2
+ import { User } from './user/user.model';
3
+ import { UserContext } from './user-context/user-context.model';
4
+
5
+ export type AnyEntity =
6
+ User |
7
+ UserContext;
8
+
9
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
10
+ export type QueryParams = [string, string, any][];
11
+
12
+ export type QueryOptions = {
13
+ orderBy?: string | [string, string],
14
+ limit?: number,
15
+ startAt?: string,
16
+ startAfter?: string,
17
+ endAt?: string,
18
+ endBefore?: string,
19
+ }