@aneuhold/be-ts-db-lib 4.2.19 → 4.2.21

package/CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 🔖 [4.2.21] (2026-03-20)
+
+### 🏗️ Changed
+
+- `GoogleAuthService.verifyAndFindUser` and `verifyAndFindOrCreateUser` no longer return `apiKey` in their result.
+- Updated dependencies on `@aneuhold/be-ts-lib` to `^3.1.8` and `@aneuhold/core-ts-db-lib` to `^5.0.3`.
+
+### 🔥 Removed
+
+- Removed `ApiKeyRepository` class, its tests, and its subscriber registration in `UserRepository`.
+- Removed `ApiKeyValidator` class and its usage in `DbSchemaUpdater`.
+
+## 🔖 [4.2.20] (2026-03-19)
+
+### ✅ Added
+
+- Added `GoogleAuthService.verifyAndFindUser` method that returns `null` when no matching user exists (does not create one).
+
+### 🏗️ Changed
+
+- Refactored `GoogleAuthService`: extracted private `verifyToken` helper and restructured `verifyAndFindOrCreateUser` to delegate to `verifyAndFindUser`.
+- Refactored `MigrationService` to fill in missing `projectAccess` fields with safe defaults instead of patching `refreshTokenHashes`.
+- Updated dependencies on `@aneuhold/be-ts-lib` to `^3.1.7` and `@aneuhold/core-ts-db-lib` to `^5.0.2`.
+
 ## 🔖 [4.2.19] (2026-03-18)
 
 ### ✅ Added
@@ -348,6 +372,8 @@ Updated dependencies: now requires `@aneuhold/core-ts-db-lib@^3.0.0`, `@aneuhold
 
 <!-- Link References -->
 
+[4.2.21]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.20...be-ts-db-lib-v4.2.21
+[4.2.20]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.19...be-ts-db-lib-v4.2.20
 [4.2.19]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.18...be-ts-db-lib-v4.2.19
 [4.2.18]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.17...be-ts-db-lib-v4.2.18
 [4.2.17]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.16...be-ts-db-lib-v4.2.17

package/lib/index.d.ts

@@ -1,5 +1,4 @@
 import BaseRepository from './repositories/BaseRepository.js';
-import ApiKeyRepository from './repositories/common/ApiKeyRepository.js';
 import UserRepository from './repositories/common/UserRepository.js';
 import DashboardBaseRepository from './repositories/dashboard/DashboardBaseRepository.js';
 import DashboardBaseWithUserIdRepository from './repositories/dashboard/DashboardBaseWithUserIdRepository.js';
@@ -21,6 +20,6 @@ import WorkoutSetRepository from './repositories/workout/WorkoutSetRepository.js
 import GoogleAuthService from './services/GoogleAuthService.js';
 import DbOperationMetaData from './util/DbOperationMetaData.js';
 import DocumentDb from './util/DocumentDb.js';
-export { ApiKeyRepository, BaseRepository, DashboardBaseRepository, DashboardBaseWithUserIdRepository, DashboardNonogramKatanaItemRepository, DashboardNonogramKatanaUpgradeRepository, DashboardTaskRepository, DashboardUserConfigRepository, DbOperationMetaData, DocumentDb, GoogleAuthService, UserRepository, WorkoutBaseRepository, WorkoutBaseWithUserIdRepository, WorkoutEquipmentTypeRepository, WorkoutExerciseCalibrationRepository, WorkoutExerciseRepository, WorkoutMesocycleRepository, WorkoutMicrocycleRepository, WorkoutMuscleGroupRepository, WorkoutSessionExerciseRepository, WorkoutSessionRepository, WorkoutSetRepository };
+export { BaseRepository, DashboardBaseRepository, DashboardBaseWithUserIdRepository, DashboardNonogramKatanaItemRepository, DashboardNonogramKatanaUpgradeRepository, DashboardTaskRepository, DashboardUserConfigRepository, DbOperationMetaData, DocumentDb, GoogleAuthService, UserRepository, WorkoutBaseRepository, WorkoutBaseWithUserIdRepository, WorkoutEquipmentTypeRepository, WorkoutExerciseCalibrationRepository, WorkoutExerciseRepository, WorkoutMesocycleRepository, WorkoutMicrocycleRepository, WorkoutMuscleGroupRepository, WorkoutSessionExerciseRepository, WorkoutSessionRepository, WorkoutSetRepository };
 export type {};
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,gBAAgB,MAAM,2CAA2C,CAAC;AACzE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,iCAAiC,MAAM,+DAA+D,CAAC;AAC9G,OAAO,qCAAqC,MAAM,mEAAmE,CAAC;AACtH,OAAO,wCAAwC,MAAM,sEAAsE,CAAC;AAC5H,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,6BAA6B,MAAM,2DAA2D,CAAC;AACtG,OAAO,qBAAqB,MAAM,iDAAiD,CAAC;AACpF,OAAO,+BAA+B,MAAM,2DAA2D,CAAC;AACxG,OAAO,8BAA8B,MAAM,0DAA0D,CAAC;AACtG,OAAO,oCAAoC,MAAM,gEAAgE,CAAC;AAClH,OAAO,yBAAyB,MAAM,qDAAqD,CAAC;AAC5F,OAAO,0BAA0B,MAAM,sDAAsD,CAAC;AAC9F,OAAO,2BAA2B,MAAM,uDAAuD,CAAC;AAChG,OAAO,4BAA4B,MAAM,wDAAwD,CAAC;AAClG,OAAO,gCAAgC,MAAM,4DAA4D,CAAC;AAC1G,OAAO,wBAAwB,MAAM,oDAAoD,CAAC;AAC1F,OAAO,oBAAoB,MAAM,gDAAgD,CAAC;AAClF,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACvB,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,uBAAuB,EACvB,6BAA6B,EAC7B,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,+BAA+B,EAC/B,8BAA8B,EAC9B,oCAAoC,EACpC,yBAAyB,EACzB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,gCAAgC,EAChC,wBAAwB,EACxB,oBAAoB,EACrB,CAAC;AAGF,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,iCAAiC,MAAM,+DAA+D,CAAC;AAC9G,OAAO,qCAAqC,MAAM,mEAAmE,CAAC;AACtH,OAAO,wCAAwC,MAAM,sEAAsE,CAAC;AAC5H,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,6BAA6B,MAAM,2DAA2D,CAAC;AACtG,OAAO,qBAAqB,MAAM,iDAAiD,CAAC;AACpF,OAAO,+BAA+B,MAAM,2DAA2D,CAAC;AACxG,OAAO,8BAA8B,MAAM,0DAA0D,CAAC;AACtG,OAAO,oCAAoC,MAAM,gEAAgE,CAAC;AAClH,OAAO,yBAAyB,MAAM,qDAAqD,CAAC;AAC5F,OAAO,0BAA0B,MAAM,sDAAsD,CAAC;AAC9F,OAAO,2BAA2B,MAAM,uDAAuD,CAAC;AAChG,OAAO,4BAA4B,MAAM,wDAAwD,CAAC;AAClG,OAAO,gCAAgC,MAAM,4DAA4D,CAAC;AAC1G,OAAO,wBAAwB,MAAM,oDAAoD,CAAC;AAC1F,OAAO,oBAAoB,MAAM,gDAAgD,CAAC;AAClF,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EACL,cAAc,EACd,uBAAuB,EACvB,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,uBAAuB,EACvB,6BAA6B,EAC7B,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,+BAA+B,EAC/B,8BAA8B,EAC9B,oCAAoC,EACpC,yBAAyB,EACzB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,gCAAgC,EAChC,wBAAwB,EACxB,oBAAoB,EACrB,CAAC;AAGF,YAAY,EAAE,CAAC"}

package/lib/index.js

@@ -1,5 +1,4 @@
 import BaseRepository from './repositories/BaseRepository.js';
-import ApiKeyRepository from './repositories/common/ApiKeyRepository.js';
 import UserRepository from './repositories/common/UserRepository.js';
 import DashboardBaseRepository from './repositories/dashboard/DashboardBaseRepository.js';
 import DashboardBaseWithUserIdRepository from './repositories/dashboard/DashboardBaseWithUserIdRepository.js';
@@ -22,5 +21,5 @@ import GoogleAuthService from './services/GoogleAuthService.js';
 import DbOperationMetaData from './util/DbOperationMetaData.js';
 import DocumentDb from './util/DocumentDb.js';
 // Export all the functions and classes from this library
-export { ApiKeyRepository, BaseRepository, DashboardBaseRepository, DashboardBaseWithUserIdRepository, DashboardNonogramKatanaItemRepository, DashboardNonogramKatanaUpgradeRepository, DashboardTaskRepository, DashboardUserConfigRepository, DbOperationMetaData, DocumentDb, GoogleAuthService, UserRepository, WorkoutBaseRepository, WorkoutBaseWithUserIdRepository, WorkoutEquipmentTypeRepository, WorkoutExerciseCalibrationRepository, WorkoutExerciseRepository, WorkoutMesocycleRepository, WorkoutMicrocycleRepository, WorkoutMuscleGroupRepository, WorkoutSessionExerciseRepository, WorkoutSessionRepository, WorkoutSetRepository };
+export { BaseRepository, DashboardBaseRepository, DashboardBaseWithUserIdRepository, DashboardNonogramKatanaItemRepository, DashboardNonogramKatanaUpgradeRepository, DashboardTaskRepository, DashboardUserConfigRepository, DbOperationMetaData, DocumentDb, GoogleAuthService, UserRepository, WorkoutBaseRepository, WorkoutBaseWithUserIdRepository, WorkoutEquipmentTypeRepository, WorkoutExerciseCalibrationRepository, WorkoutExerciseRepository, WorkoutMesocycleRepository, WorkoutMicrocycleRepository, WorkoutMuscleGroupRepository, WorkoutSessionExerciseRepository, WorkoutSessionRepository, WorkoutSetRepository };
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,gBAAgB,MAAM,2CAA2C,CAAC;AACzE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,iCAAiC,MAAM,+DAA+D,CAAC;AAC9G,OAAO,qCAAqC,MAAM,mEAAmE,CAAC;AACtH,OAAO,wCAAwC,MAAM,sEAAsE,CAAC;AAC5H,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,6BAA6B,MAAM,2DAA2D,CAAC;AACtG,OAAO,qBAAqB,MAAM,iDAAiD,CAAC;AACpF,OAAO,+BAA+B,MAAM,2DAA2D,CAAC;AACxG,OAAO,8BAA8B,MAAM,0DAA0D,CAAC;AACtG,OAAO,oCAAoC,MAAM,gEAAgE,CAAC;AAClH,OAAO,yBAAyB,MAAM,qDAAqD,CAAC;AAC5F,OAAO,0BAA0B,MAAM,sDAAsD,CAAC;AAC9F,OAAO,2BAA2B,MAAM,uDAAuD,CAAC;AAChG,OAAO,4BAA4B,MAAM,wDAAwD,CAAC;AAClG,OAAO,gCAAgC,MAAM,4DAA4D,CAAC;AAC1G,OAAO,wBAAwB,MAAM,oDAAoD,CAAC;AAC1F,OAAO,oBAAoB,MAAM,gDAAgD,CAAC;AAClF,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAE9C,yDAAyD;AACzD,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACvB,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,uBAAuB,EACvB,6BAA6B,EAC7B,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,+BAA+B,EAC/B,8BAA8B,EAC9B,oCAAoC,EACpC,yBAAyB,EACzB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,gCAAgC,EAChC,wBAAwB,EACxB,oBAAoB,EACrB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,iCAAiC,MAAM,+DAA+D,CAAC;AAC9G,OAAO,qCAAqC,MAAM,mEAAmE,CAAC;AACtH,OAAO,wCAAwC,MAAM,sEAAsE,CAAC;AAC5H,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,6BAA6B,MAAM,2DAA2D,CAAC;AACtG,OAAO,qBAAqB,MAAM,iDAAiD,CAAC;AACpF,OAAO,+BAA+B,MAAM,2DAA2D,CAAC;AACxG,OAAO,8BAA8B,MAAM,0DAA0D,CAAC;AACtG,OAAO,oCAAoC,MAAM,gEAAgE,CAAC;AAClH,OAAO,yBAAyB,MAAM,qDAAqD,CAAC;AAC5F,OAAO,0BAA0B,MAAM,sDAAsD,CAAC;AAC9F,OAAO,2BAA2B,MAAM,uDAAuD,CAAC;AAChG,OAAO,4BAA4B,MAAM,wDAAwD,CAAC;AAClG,OAAO,gCAAgC,MAAM,4DAA4D,CAAC;AAC1G,OAAO,wBAAwB,MAAM,oDAAoD,CAAC;AAC1F,OAAO,oBAAoB,MAAM,gDAAgD,CAAC;AAClF,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAE9C,yDAAyD;AACzD,OAAO,EACL,cAAc,EACd,uBAAuB,EACvB,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,uBAAuB,EACvB,6BAA6B,EAC7B,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,+BAA+B,EAC/B,8BAA8B,EAC9B,oCAAoC,EACpC,yBAAyB,EACzB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,gCAAgC,EAChC,wBAAwB,EACxB,oBAAoB,EACrB,CAAC"}

package/lib/index.ts

@@ -1,5 +1,4 @@
 import BaseRepository from './repositories/BaseRepository.js';
-import ApiKeyRepository from './repositories/common/ApiKeyRepository.js';
 import UserRepository from './repositories/common/UserRepository.js';
 import DashboardBaseRepository from './repositories/dashboard/DashboardBaseRepository.js';
 import DashboardBaseWithUserIdRepository from './repositories/dashboard/DashboardBaseWithUserIdRepository.js';
@@ -24,7 +23,6 @@ import DocumentDb from './util/DocumentDb.js';
 
 // Export all the functions and classes from this library
 export {
-  ApiKeyRepository,
   BaseRepository,
   DashboardBaseRepository,
   DashboardBaseWithUserIdRepository,

package/lib/repositories/common/UserRepository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserRepository.d.ts","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAalD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,cAAc,CAAC,IAAI,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAW;IAEzC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAA6B;IAE7D,OAAO;IAIP,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAclC;;OAEG;IACH,MAAM,CAAC,OAAO,IAAI,cAAc;IAO1B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAWrE;;;;OAIG;IACG,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAQlE,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAO5D"}
+{"version":3,"file":"UserRepository.d.ts","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAWlD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,cAAc,CAAC,IAAI,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAW;IAEzC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAA6B;IAE7D,OAAO;IAIP,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAalC;;OAEG;IACH,MAAM,CAAC,OAAO,IAAI,cAAc;IAO1B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAWrE;;;;OAIG;IACG,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAQlE,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAO5D"}

package/lib/repositories/common/UserRepository.js

@@ -10,7 +10,6 @@ import WorkoutExerciseRepository from '../workout/WorkoutExerciseRepository.js';
 import WorkoutMesocycleRepository from '../workout/WorkoutMesocycleRepository.js';
 import WorkoutMicrocycleRepository from '../workout/WorkoutMicrocycleRepository.js';
 import WorkoutMuscleGroupRepository from '../workout/WorkoutMuscleGroupRepository.js';
-import ApiKeyRepository from './ApiKeyRepository.js';
 /**
  * The repository that contains {@link User} documents.
  */
@@ -21,7 +20,6 @@ export default class UserRepository extends BaseRepository {
         super(UserRepository.COLLECTION_NAME, new UserValidator());
     }
     setupSubscribers() {
-        this.subscribeToChanges(ApiKeyRepository.getListenersForUserRepo());
         this.subscribeToChanges(DashboardUserConfigRepository.getListenersForUserRepo());
         this.subscribeToChanges(DashboardTaskRepository.getListenersForUserRepo());
         this.subscribeToChanges(DashboardNonogramKatanaItemRepository.getListenersForUserRepo());

package/lib/repositories/common/UserRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserRepository.js","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserRepository.js","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"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"}

package/lib/repositories/common/UserRepository.ts

@@ -12,8 +12,6 @@ import WorkoutExerciseRepository from '../workout/WorkoutExerciseRepository.js';
 import WorkoutMesocycleRepository from '../workout/WorkoutMesocycleRepository.js';
 import WorkoutMicrocycleRepository from '../workout/WorkoutMicrocycleRepository.js';
 import WorkoutMuscleGroupRepository from '../workout/WorkoutMuscleGroupRepository.js';
-import ApiKeyRepository from './ApiKeyRepository.js';
-
 /**
  * The repository that contains {@link User} documents.
  */
@@ -27,7 +25,6 @@ export default class UserRepository extends BaseRepository<User> {
   }
 
   protected setupSubscribers(): void {
-    this.subscribeToChanges(ApiKeyRepository.getListenersForUserRepo());
     this.subscribeToChanges(DashboardUserConfigRepository.getListenersForUserRepo());
     this.subscribeToChanges(DashboardTaskRepository.getListenersForUserRepo());
     this.subscribeToChanges(DashboardNonogramKatanaItemRepository.getListenersForUserRepo());

package/lib/services/GoogleAuthService.d.ts

@@ -1,4 +1,4 @@
-import type { ApiKey, User } from '@aneuhold/core-ts-db-lib';
+import type { User } from '@aneuhold/core-ts-db-lib';
 /**
  * Service for verifying Google ID tokens and finding or creating users.
  * Handles account linking by email when a matching user exists without a
@@ -6,6 +6,15 @@ import type { ApiKey, User } from '@aneuhold/core-ts-db-lib';
  */
 export default class GoogleAuthService {
     private static readonly client;
+    /**
+     * Verifies a Google ID token and finds the associated user. Returns
+     * `null` if no matching user exists (does **not** create one).
+     *
+     * @param googleCredentialToken - The Google ID token string from the client.
+     */
+    static verifyAndFindUser(googleCredentialToken: string): Promise<{
+        user: User;
+    } | null>;
     /**
      * Verifies a Google ID token and finds or creates the associated user.
      *
@@ -13,7 +22,12 @@ export default class GoogleAuthService {
      */
     static verifyAndFindOrCreateUser(googleCredentialToken: string): Promise<{
         user: User;
-        apiKey: ApiKey;
     }>;
+    /**
+     * Verifies a Google ID token and returns the Google ID and email.
+     *
+     * @param googleCredentialToken - The Google ID token string from the client.
+     */
+    private static verifyToken;
 }
 //# sourceMappingURL=GoogleAuthService.d.ts.map

package/lib/services/GoogleAuthService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleAuthService.d.ts","sourceRoot":"","sources":["../../src/services/GoogleAuthService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAM7D;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAEpE;;;;OAIG;WACU,yBAAyB,CACpC,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAsD3C"}
+{"version":3,"file":"GoogleAuthService.d.ts","sourceRoot":"","sources":["../../src/services/GoogleAuthService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAKrD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAEpE;;;;;OAKG;WACU,iBAAiB,CAAC,qBAAqB,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAyB7F;;;;OAIG;WACU,yBAAyB,CAAC,qBAAqB,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC;IAwB9F;;;;OAIG;mBACkB,WAAW;CAmBjC"}

package/lib/services/GoogleAuthService.js

@@ -1,6 +1,5 @@
-import { GOOGLE_CLIENT_ID, UserSchema } from '@aneuhold/core-ts-db-lib';
+import { GOOGLE_CLIENT_ID, ProjectName, UserSchema } from '@aneuhold/core-ts-db-lib';
 import { OAuth2Client } from 'google-auth-library';
-import ApiKeyRepository from '../repositories/common/ApiKeyRepository.js';
 import UserRepository from '../repositories/common/UserRepository.js';
 /**
  * Service for verifying Google ID tokens and finding or creating users.
@@ -10,25 +9,14 @@ import UserRepository from '../repositories/common/UserRepository.js';
 export default class GoogleAuthService {
     static client = new OAuth2Client(GOOGLE_CLIENT_ID);
     /**
-     * Verifies a Google ID token and finds or creates the associated user.
+     * Verifies a Google ID token and finds the associated user. Returns
+     * `null` if no matching user exists (does **not** create one).
      *
      * @param googleCredentialToken - The Google ID token string from the client.
      */
-    static async verifyAndFindOrCreateUser(googleCredentialToken) {
-        const ticket = await this.client.verifyIdToken({
-            idToken: googleCredentialToken,
-            audience: GOOGLE_CLIENT_ID
-        });
-        const payload = ticket.getPayload();
-        if (!payload) {
-            throw new Error('Invalid Google token payload');
-        }
-        const { sub: googleId, email } = payload;
-        if (!email) {
-            throw new Error('Google account has no email');
-        }
+    static async verifyAndFindUser(googleCredentialToken) {
+        const { googleId, email } = await this.verifyToken(googleCredentialToken);
         const userRepo = UserRepository.getRepo();
-        const apiKeyRepo = ApiKeyRepository.getRepo();
         // 1. Look up by googleId
         let user = await userRepo.get({ auth: { googleId } });
         // 2. Fall back to email lookup (account linking)
@@ -40,26 +28,55 @@ export default class GoogleAuthService {
                 user.auth.googleId = googleId;
             }
         }
-        // 3. Create new user if neither match. The ApiKey subscriber on
-        //    UserRepository automatically creates an API key on user insertion.
         if (!user) {
-            const newUser = UserSchema.parse({
-                userName: email,
-                email,
-                auth: { googleId },
-                projectAccess: { dashboard: false, workout: true }
-            });
-            const insertedUser = await userRepo.insertNew(newUser);
-            if (!insertedUser) {
-                throw new Error('Failed to create user');
-            }
-            user = insertedUser;
+            return null;
+        }
+        return { user };
+    }
+    /**
+     * Verifies a Google ID token and finds or creates the associated user.
+     *
+     * @param googleCredentialToken - The Google ID token string from the client.
+     */
+    static async verifyAndFindOrCreateUser(googleCredentialToken) {
+        const result = await this.verifyAndFindUser(googleCredentialToken);
+        if (result) {
+            return result;
+        }
+        // Create new user.
+        const { googleId, email } = await this.verifyToken(googleCredentialToken);
+        const userRepo = UserRepository.getRepo();
+        const newUser = UserSchema.parse({
+            userName: email,
+            email,
+            auth: { googleId },
+            projectAccess: { [ProjectName.Dashboard]: false, [ProjectName.Workout]: true }
+        });
+        const insertedUser = await userRepo.insertNew(newUser);
+        if (!insertedUser) {
+            throw new Error('Failed to create user');
         }
-        const apiKey = await apiKeyRepo.get({ userId: user._id });
-        if (!apiKey) {
-            throw new Error(`No API key found for user ${user._id}`);
+        return { user: insertedUser };
+    }
+    /**
+     * Verifies a Google ID token and returns the Google ID and email.
+     *
+     * @param googleCredentialToken - The Google ID token string from the client.
+     */
+    static async verifyToken(googleCredentialToken) {
+        const ticket = await this.client.verifyIdToken({
+            idToken: googleCredentialToken,
+            audience: GOOGLE_CLIENT_ID
+        });
+        const payload = ticket.getPayload();
+        if (!payload) {
+            throw new Error('Invalid Google token payload');
+        }
+        const { sub: googleId, email } = payload;
+        if (!email) {
+            throw new Error('Google account has no email');
         }
-        return { user, apiKey };
+        return { googleId, email };
     }
 }
 //# sourceMappingURL=GoogleAuthService.js.map

package/lib/services/GoogleAuthService.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleAuthService.js","sourceRoot":"","sources":["../../src/services/GoogleAuthService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,gBAAgB,MAAM,4CAA4C,CAAC;AAC1E,OAAO,cAAc,MAAM,0CAA0C,CAAC;AAEtE;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAC5B,MAAM,CAAU,MAAM,GAAG,IAAI,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAEpE;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,yBAAyB,CACpC,qBAA6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC7C,OAAO,EAAE,qBAAqB;YAC9B,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAE9C,yBAAyB;QACzB,IAAI,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEtD,iDAAiD;QACjD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YACrC,IAAI,IAAI,EAAE,CAAC;gBACT,qCAAqC;gBACrC,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC3E,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAChC,CAAC;QACH,CAAC;QAED,gEAAgE;QAChE,wEAAwE;QACxE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC;gBAC/B,QAAQ,EAAE,KAAK;gBACf,KAAK;gBACL,IAAI,EAAE,EAAE,QAAQ,EAAE;gBAClB,aAAa,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;aACnD,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,GAAG,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1B,CAAC"}
+{"version":3,"file":"GoogleAuthService.js","sourceRoot":"","sources":["../../src/services/GoogleAuthService.ts"],"names":[],"mappings":"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"}

package/lib/services/GoogleAuthService.ts

@@ -1,7 +1,6 @@
-import type { ApiKey, User } from '@aneuhold/core-ts-db-lib';
-import { GOOGLE_CLIENT_ID, UserSchema } from '@aneuhold/core-ts-db-lib';
+import type { User } from '@aneuhold/core-ts-db-lib';
+import { GOOGLE_CLIENT_ID, ProjectName, UserSchema } from '@aneuhold/core-ts-db-lib';
 import { OAuth2Client } from 'google-auth-library';
-import ApiKeyRepository from '../repositories/common/ApiKeyRepository.js';
 import UserRepository from '../repositories/common/UserRepository.js';
 
 /**
@@ -13,29 +12,15 @@ export default class GoogleAuthService {
   private static readonly client = new OAuth2Client(GOOGLE_CLIENT_ID);
 
   /**
-   * Verifies a Google ID token and finds or creates the associated user.
+   * Verifies a Google ID token and finds the associated user. Returns
+   * `null` if no matching user exists (does **not** create one).
    *
    * @param googleCredentialToken - The Google ID token string from the client.
    */
-  static async verifyAndFindOrCreateUser(
-    googleCredentialToken: string
-  ): Promise<{ user: User; apiKey: ApiKey }> {
-    const ticket = await this.client.verifyIdToken({
-      idToken: googleCredentialToken,
-      audience: GOOGLE_CLIENT_ID
-    });
-    const payload = ticket.getPayload();
-    if (!payload) {
-      throw new Error('Invalid Google token payload');
-    }
-
-    const { sub: googleId, email } = payload;
-    if (!email) {
-      throw new Error('Google account has no email');
-    }
+  static async verifyAndFindUser(googleCredentialToken: string): Promise<{ user: User } | null> {
+    const { googleId, email } = await this.verifyToken(googleCredentialToken);
 
     const userRepo = UserRepository.getRepo();
-    const apiKeyRepo = ApiKeyRepository.getRepo();
 
     // 1. Look up by googleId
     let user = await userRepo.get({ auth: { googleId } });
@@ -50,27 +35,64 @@ export default class GoogleAuthService {
       }
     }
 
-    // 3. Create new user if neither match. The ApiKey subscriber on
-    //    UserRepository automatically creates an API key on user insertion.
     if (!user) {
-      const newUser = UserSchema.parse({
-        userName: email,
-        email,
-        auth: { googleId },
-        projectAccess: { dashboard: false, workout: true }
-      });
-      const insertedUser = await userRepo.insertNew(newUser);
-      if (!insertedUser) {
-        throw new Error('Failed to create user');
-      }
-      user = insertedUser;
+      return null;
+    }
+
+    return { user };
+  }
+
+  /**
+   * Verifies a Google ID token and finds or creates the associated user.
+   *
+   * @param googleCredentialToken - The Google ID token string from the client.
+   */
+  static async verifyAndFindOrCreateUser(googleCredentialToken: string): Promise<{ user: User }> {
+    const result = await this.verifyAndFindUser(googleCredentialToken);
+    if (result) {
+      return result;
     }
 
-    const apiKey = await apiKeyRepo.get({ userId: user._id });
-    if (!apiKey) {
-      throw new Error(`No API key found for user ${user._id}`);
+    // Create new user.
+    const { googleId, email } = await this.verifyToken(googleCredentialToken);
+    const userRepo = UserRepository.getRepo();
+
+    const newUser = UserSchema.parse({
+      userName: email,
+      email,
+      auth: { googleId },
+      projectAccess: { [ProjectName.Dashboard]: false, [ProjectName.Workout]: true }
+    });
+    const insertedUser = await userRepo.insertNew(newUser);
+    if (!insertedUser) {
+      throw new Error('Failed to create user');
+    }
+
+    return { user: insertedUser };
+  }
+
+  /**
+   * Verifies a Google ID token and returns the Google ID and email.
+   *
+   * @param googleCredentialToken - The Google ID token string from the client.
+   */
+  private static async verifyToken(
+    googleCredentialToken: string
+  ): Promise<{ googleId: string; email: string }> {
+    const ticket = await this.client.verifyIdToken({
+      idToken: googleCredentialToken,
+      audience: GOOGLE_CLIENT_ID
+    });
+    const payload = ticket.getPayload();
+    if (!payload) {
+      throw new Error('Invalid Google token payload');
+    }
+
+    const { sub: googleId, email } = payload;
+    if (!email) {
+      throw new Error('Google account has no email');
     }
 
-    return { user, apiKey };
+    return { googleId, email };
   }
 }

package/lib/services/MigrationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationService.d.ts","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC;;;;;;;;OAQG;WACU,SAAS,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAoCtD"}
+{"version":3,"file":"MigrationService.d.ts","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"AAeA;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC;;;;;;;;OAQG;WACU,SAAS,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAkDtD"}

package/lib/services/MigrationService.js

@@ -2,6 +2,15 @@
 // @ts-nocheck
 import { DR } from '@aneuhold/core-ts-lib';
 import UserRepository from '../repositories/common/UserRepository.js';
+/**
+ * The default values for each project access field. New fields should be
+ * added here and defaulted to `false` so existing users don't gain access
+ * automatically.
+ */
+const PROJECT_ACCESS_DEFAULTS = {
+    dashboard: false,
+    workout: false
+};
 /**
  * A service for migrating the DB to a new state after an existing document
  * change.
@@ -23,9 +32,14 @@ export default class MigrationService {
         DR.logger.info('Starting migration...');
         const userRepo = UserRepository.getRepo();
         const users = await userRepo.getAll();
-        // Add refreshTokenHashes to users that don't have it yet
-        const usersToUpdate = users.filter((user) => !user.auth.refreshTokenHashes);
-        DR.logger.info(`Found ${usersToUpdate.length} of ${users.length} users missing auth.refreshTokenHashes.`);
+        // Find users that are missing projectAccess entirely or are missing
+        // any of the expected fields.
+        const usersToUpdate = users.filter((user) => {
+            if (!user.projectAccess)
+                return true;
+            return Object.keys(PROJECT_ACCESS_DEFAULTS).some((key) => user.projectAccess[key] === undefined);
+        });
+        DR.logger.info(`Found ${usersToUpdate.length} of ${users.length} users with missing projectAccess fields.`);
         if (usersToUpdate.length === 0) {
             DR.logger.success('No migration needed.');
             return;
@@ -33,16 +47,20 @@ export default class MigrationService {
         if (dryRun) {
             DR.logger.info('Dry run: Would update the following users:');
             usersToUpdate.forEach((user) => {
-                DR.logger.info(`  - ${user.userName} (${user._id})`);
+                const existing = user.projectAccess ?? {};
+                const merged = { ...PROJECT_ACCESS_DEFAULTS, ...existing };
+                DR.logger.info(`  - ${user.userName} (${user._id}): ${JSON.stringify(existing)} → ${JSON.stringify(merged)}`);
             });
             return;
         }
         for (const user of usersToUpdate) {
+            const existing = user.projectAccess ?? {};
+            const merged = { ...PROJECT_ACCESS_DEFAULTS, ...existing };
             await userRepo.update({
                 _id: user._id,
-                auth: { ...user.auth, refreshTokenHashes: [] }
+                projectAccess: merged
             });
-            DR.logger.info(`Updated user ${user.userName} (${user._id})`);
+            DR.logger.info(`Updated user ${user.userName} (${user._id}): ${JSON.stringify(existing)} → ${JSON.stringify(merged)}`);
         }
         DR.logger.success(`Migration complete. Updated ${usersToUpdate.length} users.`);
     }

package/lib/services/MigrationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationService.js","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,cAAc;AACd,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC3C,OAAO,cAAc,MAAM,0CAA0C,CAAC;AAEtE;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK;QACnC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAExC,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;QAEtC,yDAAyD;QACzD,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE5E,EAAE,CAAC,MAAM,CAAC,IAAI,CACZ,SAAS,aAAa,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,yCAAyC,CAC1F,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;YAC7D,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC7B,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,QAAQ,CAAC,MAAM,CAAC;gBACpB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE;aAC/C,CAAC,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QAChE,CAAC;QAED,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,+BAA+B,aAAa,CAAC,MAAM,SAAS,CAAC,CAAC;IAClF,CAAC;CACF"}
+{"version":3,"file":"MigrationService.js","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,cAAc;AACd,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC3C,OAAO,cAAc,MAAM,0CAA0C,CAAC;AAEtE;;;;GAIG;AACH,MAAM,uBAAuB,GAAG;IAC9B,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,KAAK;CACf,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK;QACnC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAExC,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;QAEtC,oEAAoE;QACpE,8BAA8B;QAC9B,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,aAAa;gBAAE,OAAO,IAAI,CAAC;YACrC,OAAO,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAC9C,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,SAAS,CAC/C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,MAAM,CAAC,IAAI,CACZ,SAAS,aAAa,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,2CAA2C,CAC5F,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;YAC7D,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;gBAC1C,MAAM,MAAM,GAAG,EAAE,GAAG,uBAAuB,EAAE,GAAG,QAAQ,EAAE,CAAC;gBAC3D,EAAE,CAAC,MAAM,CAAC,IAAI,CACZ,OAAO,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAC9F,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,EAAE,GAAG,uBAAuB,EAAE,GAAG,QAAQ,EAAE,CAAC;YAC3D,MAAM,QAAQ,CAAC,MAAM,CAAC;gBACpB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,aAAa,EAAE,MAAM;aACtB,CAAC,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,IAAI,CACZ,gBAAgB,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CACvG,CAAC;QACJ,CAAC;QAED,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,+BAA+B,aAAa,CAAC,MAAM,SAAS,CAAC,CAAC;IAClF,CAAC;CACF"}

package/lib/services/MigrationService.ts

@@ -3,6 +3,16 @@
 import { DR } from '@aneuhold/core-ts-lib';
 import UserRepository from '../repositories/common/UserRepository.js';
 
+/**
+ * The default values for each project access field. New fields should be
+ * added here and defaulted to `false` so existing users don't gain access
+ * automatically.
+ */
+const PROJECT_ACCESS_DEFAULTS = {
+  dashboard: false,
+  workout: false
+};
+
 /**
  * A service for migrating the DB to a new state after an existing document
  * change.
@@ -26,11 +36,17 @@ export default class MigrationService {
     const userRepo = UserRepository.getRepo();
     const users = await userRepo.getAll();
 
-    // Add refreshTokenHashes to users that don't have it yet
-    const usersToUpdate = users.filter((user) => !user.auth.refreshTokenHashes);
+    // Find users that are missing projectAccess entirely or are missing
+    // any of the expected fields.
+    const usersToUpdate = users.filter((user) => {
+      if (!user.projectAccess) return true;
+      return Object.keys(PROJECT_ACCESS_DEFAULTS).some(
+        (key) => user.projectAccess[key] === undefined
+      );
+    });
 
     DR.logger.info(
-      `Found ${usersToUpdate.length} of ${users.length} users missing auth.refreshTokenHashes.`
+      `Found ${usersToUpdate.length} of ${users.length} users with missing projectAccess fields.`
     );
 
     if (usersToUpdate.length === 0) {
@@ -41,17 +57,25 @@ export default class MigrationService {
     if (dryRun) {
       DR.logger.info('Dry run: Would update the following users:');
       usersToUpdate.forEach((user) => {
-        DR.logger.info(`  - ${user.userName} (${user._id})`);
+        const existing = user.projectAccess ?? {};
+        const merged = { ...PROJECT_ACCESS_DEFAULTS, ...existing };
+        DR.logger.info(
+          `  - ${user.userName} (${user._id}): ${JSON.stringify(existing)} → ${JSON.stringify(merged)}`
+        );
       });
       return;
     }
 
     for (const user of usersToUpdate) {
+      const existing = user.projectAccess ?? {};
+      const merged = { ...PROJECT_ACCESS_DEFAULTS, ...existing };
       await userRepo.update({
         _id: user._id,
-        auth: { ...user.auth, refreshTokenHashes: [] }
+        projectAccess: merged
       });
-      DR.logger.info(`Updated user ${user.userName} (${user._id})`);
+      DR.logger.info(
+        `Updated user ${user.userName} (${user._id}): ${JSON.stringify(existing)} → ${JSON.stringify(merged)}`
+      );
     }
 
     DR.logger.success(`Migration complete. Updated ${usersToUpdate.length} users.`);

package/lib/util/DbSchemaUpdater.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DbSchemaUpdater.d.ts","sourceRoot":"","sources":["../../src/util/DbSchemaUpdater.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;WACrB,uBAAuB,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBpE"}
+{"version":3,"file":"DbSchemaUpdater.d.ts","sourceRoot":"","sources":["../../src/util/DbSchemaUpdater.ts"],"names":[],"mappings":"AAeA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;WACrB,uBAAuB,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBpE"}

package/lib/util/DbSchemaUpdater.js

@@ -1,4 +1,3 @@
-import ApiKeyValidator from '../validators/common/ApiKeyValidator.js';
 import UserValidator from '../validators/common/UserValidator.js';
 import DashboardNonogramKatanaItemValidator from '../validators/dashboard/NonogramKatanaItemValidator.js';
 import DashboardNonogramKatanaUpgradeValidator from '../validators/dashboard/NonogramKatanaUpgradeValidator.js';
@@ -20,7 +19,6 @@ export default class DbSchemaUpdater {
     static async updateSchemaForAllRepos(dryRun = false) {
         // Common validators
         await new UserValidator().validateRepositoryInDb(dryRun);
-        await new ApiKeyValidator().validateRepositoryInDb(dryRun);
         // Dashboard validators
         await new DashboardUserConfigValidator().validateRepositoryInDb(dryRun);
         await new DashboardTaskValidator().validateRepositoryInDb(dryRun);

package/lib/util/DbSchemaUpdater.js.map

@@ -1 +1 @@
-{"version":3,"file":"DbSchemaUpdater.js","sourceRoot":"","sources":["../../src/util/DbSchemaUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,aAAa,MAAM,uCAAuC,CAAC;AAClE,OAAO,oCAAoC,MAAM,wDAAwD,CAAC;AAC1G,OAAO,uCAAuC,MAAM,2DAA2D,CAAC;AAChH,OAAO,sBAAsB,MAAM,0CAA0C,CAAC;AAC9E,OAAO,4BAA4B,MAAM,gDAAgD,CAAC;AAC1F,OAAO,6BAA6B,MAAM,iDAAiD,CAAC;AAC5F,OAAO,mCAAmC,MAAM,uDAAuD,CAAC;AACxG,OAAO,wBAAwB,MAAM,4CAA4C,CAAC;AAClF,OAAO,yBAAyB,MAAM,6CAA6C,CAAC;AACpF,OAAO,0BAA0B,MAAM,8CAA8C,CAAC;AACtF,OAAO,2BAA2B,MAAM,+CAA+C,CAAC;AACxF,OAAO,+BAA+B,MAAM,mDAAmD,CAAC;AAChG,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,GAAG,KAAK;QACjD,oBAAoB;QACpB,MAAM,IAAI,aAAa,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,IAAI,eAAe,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAE3D,uBAAuB;QACvB,MAAM,IAAI,4BAA4B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACxE,MAAM,IAAI,sBAAsB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAClE,MAAM,IAAI,oCAAoC,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAChF,MAAM,IAAI,uCAAuC,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAEnF,qBAAqB;QACrB,MAAM,IAAI,6BAA6B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACzE,MAAM,IAAI,mCAAmC,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC/E,MAAM,IAAI,wBAAwB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACpE,MAAM,IAAI,yBAAyB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACrE,MAAM,IAAI,0BAA0B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACtE,MAAM,IAAI,2BAA2B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACvE,MAAM,IAAI,+BAA+B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC3E,MAAM,IAAI,uBAAuB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACnE,MAAM,IAAI,mBAAmB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACF"}
+{"version":3,"file":"DbSchemaUpdater.js","sourceRoot":"","sources":["../../src/util/DbSchemaUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,uCAAuC,CAAC;AAClE,OAAO,oCAAoC,MAAM,wDAAwD,CAAC;AAC1G,OAAO,uCAAuC,MAAM,2DAA2D,CAAC;AAChH,OAAO,sBAAsB,MAAM,0CAA0C,CAAC;AAC9E,OAAO,4BAA4B,MAAM,gDAAgD,CAAC;AAC1F,OAAO,6BAA6B,MAAM,iDAAiD,CAAC;AAC5F,OAAO,mCAAmC,MAAM,uDAAuD,CAAC;AACxG,OAAO,wBAAwB,MAAM,4CAA4C,CAAC;AAClF,OAAO,yBAAyB,MAAM,6CAA6C,CAAC;AACpF,OAAO,0BAA0B,MAAM,8CAA8C,CAAC;AACtF,OAAO,2BAA2B,MAAM,+CAA+C,CAAC;AACxF,OAAO,+BAA+B,MAAM,mDAAmD,CAAC;AAChG,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,GAAG,KAAK;QACjD,oBAAoB;QACpB,MAAM,IAAI,aAAa,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAEzD,uBAAuB;QACvB,MAAM,IAAI,4BAA4B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACxE,MAAM,IAAI,sBAAsB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAClE,MAAM,IAAI,oCAAoC,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAChF,MAAM,IAAI,uCAAuC,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAEnF,qBAAqB;QACrB,MAAM,IAAI,6BAA6B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACzE,MAAM,IAAI,mCAAmC,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC/E,MAAM,IAAI,wBAAwB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACpE,MAAM,IAAI,yBAAyB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACrE,MAAM,IAAI,0BAA0B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACtE,MAAM,IAAI,2BAA2B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACvE,MAAM,IAAI,+BAA+B,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC3E,MAAM,IAAI,uBAAuB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACnE,MAAM,IAAI,mBAAmB,EAAE,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACF"}

package/lib/util/DbSchemaUpdater.ts

@@ -1,4 +1,3 @@
-import ApiKeyValidator from '../validators/common/ApiKeyValidator.js';
 import UserValidator from '../validators/common/UserValidator.js';
 import DashboardNonogramKatanaItemValidator from '../validators/dashboard/NonogramKatanaItemValidator.js';
 import DashboardNonogramKatanaUpgradeValidator from '../validators/dashboard/NonogramKatanaUpgradeValidator.js';
@@ -21,7 +20,6 @@ export default class DbSchemaUpdater {
   static async updateSchemaForAllRepos(dryRun = false): Promise<void> {
     // Common validators
     await new UserValidator().validateRepositoryInDb(dryRun);
-    await new ApiKeyValidator().validateRepositoryInDb(dryRun);
 
     // Dashboard validators
     await new DashboardUserConfigValidator().validateRepositoryInDb(dryRun);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aneuhold/be-ts-db-lib",
   "author": "Anton G. Neuhold Jr.",
   "license": "MIT",
-  "version": "4.2.19",
+  "version": "4.2.21",
   "description": "A backend database library meant to actually interact with various databases in personal projects",
   "packageManager": "pnpm@10.25.0",
   "type": "module",
@@ -58,8 +58,8 @@
     "MongoDB"
   ],
   "dependencies": {
-    "@aneuhold/be-ts-lib": "^3.1.6",
-    "@aneuhold/core-ts-db-lib": "^5.0.1",
+    "@aneuhold/be-ts-lib": "^3.1.8",
+    "@aneuhold/core-ts-db-lib": "^5.0.3",
     "@aneuhold/core-ts-lib": "^2.4.3",
     "bson": "^7.0.0",
     "google-auth-library": "^10.6.1",

package/lib/repositories/common/ApiKeyRepository.d.ts

@@ -1,18 +0,0 @@
-import type { ApiKey, User } from '@aneuhold/core-ts-db-lib';
-import type { RepoListeners } from '../../services/RepoSubscriptionService.js';
-import BaseRepository from '../BaseRepository.js';
-/**
- * The repository that contains {@link ApiKey} documents.
- */
-export default class ApiKeyRepository extends BaseRepository<ApiKey> {
-    private static COLLECTION_NAME;
-    private static singletonInstance;
-    static getListenersForUserRepo(): RepoListeners<User>;
-    private constructor();
-    protected setupSubscribers(): void;
-    /**
-     * Gets the singleton instance of the {@link ApiKeyRepository}.
-     */
-    static getRepo(): ApiKeyRepository;
-}
-//# sourceMappingURL=ApiKeyRepository.d.ts.map

package/lib/repositories/common/ApiKeyRepository.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ApiKeyRepository.d.ts","sourceRoot":"","sources":["../../../src/repositories/common/ApiKeyRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAElD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc,CAAC,MAAM,CAAC;IAClE,OAAO,CAAC,MAAM,CAAC,eAAe,CAAa;IAE3C,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAA+B;IAE/D,MAAM,CAAC,uBAAuB,IAAI,aAAa,CAAC,IAAI,CAAC;IA0BrD,OAAO;IAIP,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAElC;;OAEG;WACW,OAAO,IAAI,gBAAgB;CAM1C"}

package/lib/repositories/common/ApiKeyRepository.js

@@ -1,45 +0,0 @@
-import { ApiKeySchema } from '@aneuhold/core-ts-db-lib';
-import ApiKeyValidator from '../../validators/common/ApiKeyValidator.js';
-import BaseRepository from '../BaseRepository.js';
-/**
- * The repository that contains {@link ApiKey} documents.
- */
-export default class ApiKeyRepository extends BaseRepository {
-    static COLLECTION_NAME = 'apiKeys';
-    static singletonInstance;
-    static getListenersForUserRepo() {
-        const apiKeyRepo = ApiKeyRepository.getRepo();
-        return {
-            deleteOne: async (userId) => {
-                await (await apiKeyRepo.getCollection()).deleteOne({
-                    userId
-                });
-            },
-            deleteList: async (userIds) => {
-                await (await apiKeyRepo.getCollection()).deleteMany({
-                    userId: { $in: userIds }
-                });
-            },
-            insertNew: async (user) => {
-                await apiKeyRepo.insertNew(ApiKeySchema.parse({ userId: user._id }));
-            },
-            insertMany: async (users) => {
-                await apiKeyRepo.insertMany(users.map((user) => ApiKeySchema.parse({ userId: user._id })));
-            }
-        };
-    }
-    constructor() {
-        super(ApiKeyRepository.COLLECTION_NAME, new ApiKeyValidator());
-    }
-    setupSubscribers() { }
-    /**
-     * Gets the singleton instance of the {@link ApiKeyRepository}.
-     */
-    static getRepo() {
-        if (!ApiKeyRepository.singletonInstance) {
-            ApiKeyRepository.singletonInstance = new ApiKeyRepository();
-        }
-        return ApiKeyRepository.singletonInstance;
-    }
-}
-//# sourceMappingURL=ApiKeyRepository.js.map

package/lib/repositories/common/ApiKeyRepository.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ApiKeyRepository.js","sourceRoot":"","sources":["../../../src/repositories/common/ApiKeyRepository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,eAAe,MAAM,4CAA4C,CAAC;AACzE,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAElD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAsB;IAC1D,MAAM,CAAC,eAAe,GAAG,SAAS,CAAC;IAEnC,MAAM,CAAC,iBAAiB,CAA+B;IAE/D,MAAM,CAAC,uBAAuB;QAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9C,OAAO;YACL,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;gBAC1B,MAAM,CACJ,MAAM,UAAU,CAAC,aAAa,EAAE,CACjC,CAAC,SAAS,CAAC;oBACV,MAAM;iBACP,CAAC,CAAC;YACL,CAAC;YACD,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC5B,MAAM,CACJ,MAAM,UAAU,CAAC,aAAa,EAAE,CACjC,CAAC,UAAU,CAAC;oBACX,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;iBACzB,CAAC,CAAC;YACL,CAAC;YACD,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACxB,MAAM,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACvE,CAAC;YACD,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC1B,MAAM,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7F,CAAC;SACF,CAAC;IACJ,CAAC;IAED;QACE,KAAK,CAAC,gBAAgB,CAAC,eAAe,EAAE,IAAI,eAAe,EAAE,CAAC,CAAC;IACjE,CAAC;IAES,gBAAgB,KAAU,CAAC;IAErC;;OAEG;IACI,MAAM,CAAC,OAAO;QACnB,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;YACxC,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAC9D,CAAC;QACD,OAAO,gBAAgB,CAAC,iBAAiB,CAAC;IAC5C,CAAC"}

package/lib/repositories/common/ApiKeyRepository.ts

@@ -1,56 +0,0 @@
-import type { ApiKey, User } from '@aneuhold/core-ts-db-lib';
-import { ApiKeySchema } from '@aneuhold/core-ts-db-lib';
-import type { RepoListeners } from '../../services/RepoSubscriptionService.js';
-import ApiKeyValidator from '../../validators/common/ApiKeyValidator.js';
-import BaseRepository from '../BaseRepository.js';
-
-/**
- * The repository that contains {@link ApiKey} documents.
- */
-export default class ApiKeyRepository extends BaseRepository<ApiKey> {
-  private static COLLECTION_NAME = 'apiKeys';
-
-  private static singletonInstance: ApiKeyRepository | undefined;
-
-  static getListenersForUserRepo(): RepoListeners<User> {
-    const apiKeyRepo = ApiKeyRepository.getRepo();
-    return {
-      deleteOne: async (userId) => {
-        await (
-          await apiKeyRepo.getCollection()
-        ).deleteOne({
-          userId
-        });
-      },
-      deleteList: async (userIds) => {
-        await (
-          await apiKeyRepo.getCollection()
-        ).deleteMany({
-          userId: { $in: userIds }
-        });
-      },
-      insertNew: async (user) => {
-        await apiKeyRepo.insertNew(ApiKeySchema.parse({ userId: user._id }));
-      },
-      insertMany: async (users) => {
-        await apiKeyRepo.insertMany(users.map((user) => ApiKeySchema.parse({ userId: user._id })));
-      }
-    };
-  }
-
-  private constructor() {
-    super(ApiKeyRepository.COLLECTION_NAME, new ApiKeyValidator());
-  }
-
-  protected setupSubscribers(): void {}
-
-  /**
-   * Gets the singleton instance of the {@link ApiKeyRepository}.
-   */
-  public static getRepo(): ApiKeyRepository {
-    if (!ApiKeyRepository.singletonInstance) {
-      ApiKeyRepository.singletonInstance = new ApiKeyRepository();
-    }
-    return ApiKeyRepository.singletonInstance;
-  }
-}

package/lib/validators/common/ApiKeyValidator.d.ts

@@ -1,9 +0,0 @@
-import type { ApiKey } from '@aneuhold/core-ts-db-lib';
-import IValidator from '../BaseValidator.js';
-export default class ApiKeyValidator extends IValidator<ApiKey> {
-    constructor();
-    protected validateNewObjectBusinessLogic(newApiKey: ApiKey): Promise<void>;
-    protected validateUpdateObjectBusinessLogic(updatedApiKey: Partial<ApiKey>): Promise<void>;
-    validateRepositoryInDb(dryRun: boolean): Promise<void>;
-}
-//# sourceMappingURL=ApiKeyValidator.d.ts.map

package/lib/validators/common/ApiKeyValidator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ApiKeyValidator.d.ts","sourceRoot":"","sources":["../../../src/validators/common/ApiKeyValidator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAMvD,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,MAAM,CAAC;;cAK7C,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBhF,SAAS,CAAC,iCAAiC,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpF,sBAAsB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB7D"}

package/lib/validators/common/ApiKeyValidator.js

@@ -1,57 +0,0 @@
-import { ApiKeySchema } from '@aneuhold/core-ts-db-lib';
-import { DR, ErrorUtils } from '@aneuhold/core-ts-lib';
-import ApiKeyRepository from '../../repositories/common/ApiKeyRepository.js';
-import UserRepository from '../../repositories/common/UserRepository.js';
-import IValidator from '../BaseValidator.js';
-export default class ApiKeyValidator extends IValidator {
-    constructor() {
-        super(ApiKeySchema, ApiKeySchema.partial());
-    }
-    async validateNewObjectBusinessLogic(newApiKey) {
-        // Check if the user exists
-        const userRepo = UserRepository.getRepo();
-        const userInDb = await userRepo.get({ _id: newApiKey.userId });
-        if (!userInDb) {
-            DR.logger.error(`User with ID: ${newApiKey.userId} does not exist in the database.`);
-            ErrorUtils.throwError(`User with ID: ${newApiKey.userId} does not exist in the database.`, newApiKey);
-            return;
-        }
-        // Check if the user already has an API key
-        const apiKeyRepo = ApiKeyRepository.getRepo();
-        const apiKeyInDb = await apiKeyRepo.get({ userId: newApiKey.userId });
-        if (apiKeyInDb) {
-            DR.logger.error(`User with ID: ${newApiKey.userId} already has an API key.`);
-            ErrorUtils.throwError(`User with ID: ${newApiKey.userId} already has an API key.`, newApiKey);
-        }
-    }
-    validateUpdateObjectBusinessLogic(updatedApiKey) {
-        // Throw, because API keys should not be updated. Only created and deleted.
-        DR.logger.error(`API keys should not be updated at this time. Only created and deleted.`);
-        ErrorUtils.throwError(`API keys should not be updated at this time. Only created and deleted.`, updatedApiKey);
-        return Promise.resolve();
-    }
-    async validateRepositoryInDb(dryRun) {
-        const apiKeyRepo = ApiKeyRepository.getRepo();
-        const allApiKeys = await apiKeyRepo.getAll();
-        const allUserIds = await UserRepository.getRepo().getAllIdsAsHash();
-        await this.runStandardValidationForRepository({
-            dryRun,
-            docName: 'API Key',
-            allDocs: allApiKeys,
-            shouldDelete: (apiKey) => {
-                if (!allUserIds[apiKey.userId]) {
-                    DR.logger.error(`API Key with ID: ${apiKey._id} has no valid associated user.`);
-                    return true;
-                }
-                return false;
-            },
-            deletionFunction: async (docIdsToDelete) => {
-                await apiKeyRepo.deleteList(docIdsToDelete);
-            },
-            updateFunction: async (docsToUpdate) => {
-                await apiKeyRepo.updateMany(docsToUpdate);
-            }
-        });
-    }
-}
-//# sourceMappingURL=ApiKeyValidator.js.map

package/lib/validators/common/ApiKeyValidator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ApiKeyValidator.js","sourceRoot":"","sources":["../../../src/validators/common/ApiKeyValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,gBAAgB,MAAM,+CAA+C,CAAC;AAC7E,OAAO,cAAc,MAAM,6CAA6C,CAAC;AACzE,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAkB;IAC7D;QACE,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IAES,KAAK,CAAC,8BAA8B,CAAC,SAAiB;QAC9D,2BAA2B;QAC3B,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,SAAS,CAAC,MAAM,kCAAkC,CAAC,CAAC;YACrF,UAAU,CAAC,UAAU,CACnB,iBAAiB,SAAS,CAAC,MAAM,kCAAkC,EACnE,SAAS,CACV,CAAC;YACF,OAAO;QACT,CAAC;QACD,2CAA2C;QAC3C,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,IAAI,UAAU,EAAE,CAAC;YACf,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,SAAS,CAAC,MAAM,0BAA0B,CAAC,CAAC;YAC7E,UAAU,CAAC,UAAU,CAAC,iBAAiB,SAAS,CAAC,MAAM,0BAA0B,EAAE,SAAS,CAAC,CAAC;QAChG,CAAC;IACH,CAAC;IAES,iCAAiC,CAAC,aAA8B;QACxE,2EAA2E;QAC3E,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC1F,UAAU,CAAC,UAAU,CACnB,wEAAwE,EACxE,aAAa,CACd,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAAe;QAC1C,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;QAEpE,MAAM,IAAI,CAAC,kCAAkC,CAAC;YAC5C,MAAM;YACN,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,UAAU;YACnB,YAAY,EAAE,CAAC,MAAc,EAAE,EAAE;gBAC/B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC/B,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,MAAM,CAAC,GAAG,gCAAgC,CAAC,CAAC;oBAChF,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,gBAAgB,EAAE,KAAK,EAAE,cAAsB,EAAE,EAAE;gBACjD,MAAM,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAC9C,CAAC;YACD,cAAc,EAAE,KAAK,EAAE,YAAsB,EAAE,EAAE;gBAC/C,MAAM,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/validators/common/ApiKeyValidator.ts

@@ -1,69 +0,0 @@
-import type { ApiKey } from '@aneuhold/core-ts-db-lib';
-import { ApiKeySchema } from '@aneuhold/core-ts-db-lib';
-import { DR, ErrorUtils } from '@aneuhold/core-ts-lib';
-import type { UUID } from 'crypto';
-import ApiKeyRepository from '../../repositories/common/ApiKeyRepository.js';
-import UserRepository from '../../repositories/common/UserRepository.js';
-import IValidator from '../BaseValidator.js';
-
-export default class ApiKeyValidator extends IValidator<ApiKey> {
-  constructor() {
-    super(ApiKeySchema, ApiKeySchema.partial());
-  }
-
-  protected async validateNewObjectBusinessLogic(newApiKey: ApiKey): Promise<void> {
-    // Check if the user exists
-    const userRepo = UserRepository.getRepo();
-    const userInDb = await userRepo.get({ _id: newApiKey.userId });
-    if (!userInDb) {
-      DR.logger.error(`User with ID: ${newApiKey.userId} does not exist in the database.`);
-      ErrorUtils.throwError(
-        `User with ID: ${newApiKey.userId} does not exist in the database.`,
-        newApiKey
-      );
-      return;
-    }
-    // Check if the user already has an API key
-    const apiKeyRepo = ApiKeyRepository.getRepo();
-    const apiKeyInDb = await apiKeyRepo.get({ userId: newApiKey.userId });
-    if (apiKeyInDb) {
-      DR.logger.error(`User with ID: ${newApiKey.userId} already has an API key.`);
-      ErrorUtils.throwError(`User with ID: ${newApiKey.userId} already has an API key.`, newApiKey);
-    }
-  }
-
-  protected validateUpdateObjectBusinessLogic(updatedApiKey: Partial<ApiKey>): Promise<void> {
-    // Throw, because API keys should not be updated. Only created and deleted.
-    DR.logger.error(`API keys should not be updated at this time. Only created and deleted.`);
-    ErrorUtils.throwError(
-      `API keys should not be updated at this time. Only created and deleted.`,
-      updatedApiKey
-    );
-    return Promise.resolve();
-  }
-
-  async validateRepositoryInDb(dryRun: boolean): Promise<void> {
-    const apiKeyRepo = ApiKeyRepository.getRepo();
-    const allApiKeys = await apiKeyRepo.getAll();
-    const allUserIds = await UserRepository.getRepo().getAllIdsAsHash();
-
-    await this.runStandardValidationForRepository({
-      dryRun,
-      docName: 'API Key',
-      allDocs: allApiKeys,
-      shouldDelete: (apiKey: ApiKey) => {
-        if (!allUserIds[apiKey.userId]) {
-          DR.logger.error(`API Key with ID: ${apiKey._id} has no valid associated user.`);
-          return true;
-        }
-        return false;
-      },
-      deletionFunction: async (docIdsToDelete: UUID[]) => {
-        await apiKeyRepo.deleteList(docIdsToDelete);
-      },
-      updateFunction: async (docsToUpdate: ApiKey[]) => {
-        await apiKeyRepo.updateMany(docsToUpdate);
-      }
-    });
-  }
-}