@travetto/auth-model 5.0.0-rc.0 → 5.0.0-rc.10

package/README.md

@@ -129,7 +129,7 @@ class AuthConfig {
 
 **Code: Sample usage**
 ```typescript
-import { AppError } from '@travetto/base';
+import { AppError } from '@travetto/runtime';
 import { Injectable, Inject } from '@travetto/di';
 import { ModelAuthService } from '@travetto/auth-model';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/auth-model",
-  "version": "5.0.0-rc.0",
+  "version": "5.0.0-rc.10",
   "description": "Authentication model support for the Travetto framework",
   "keywords": [
     "authentication",
@@ -25,11 +25,11 @@
     "directory": "module/auth-model"
   },
   "dependencies": {
-    "@travetto/auth": "^5.0.0-rc.0",
-    "@travetto/model": "^5.0.0-rc.0"
+    "@travetto/auth": "^5.0.0-rc.9",
+    "@travetto/model": "^5.0.0-rc.10"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.0.0-rc.0"
+    "@travetto/test": "^5.0.0-rc.9"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/model.ts

@@ -1,4 +1,4 @@
-import { AppError, Util, Class, TimeUtil, Env } from '@travetto/base';
+import { AppError, Util, Class, TimeUtil, Runtime } from '@travetto/runtime';
 import { ModelCrudSupport, ModelType, NotFoundError, OptionalId } from '@travetto/model';
 import { AuthUtil, Principal, Authenticator, Authorizer } from '@travetto/auth';
 import { isStorageSupported } from '@travetto/model/src/internal/service/common';
@@ -49,7 +49,7 @@ export class ModelAuthService<T extends ModelType> implements
   constructor(
     modelService: ModelCrudSupport,
     cls: Class<T>,
-    public toPrincipal: (t: T) => RegisteredPrincipal,
+    public toPrincipal: (t: OptionalId<T>) => RegisteredPrincipal,
     public fromPrincipal: (t: Partial<RegisteredPrincipal>) => Partial<T>,
   ) {
     this.#modelService = modelService;
@@ -91,7 +91,7 @@ export class ModelAuthService<T extends ModelType> implements
   }
 
   async postConstruct(): Promise<void> {
-    if (isStorageSupported(this.#modelService) && Env.dynamic) {
+    if (isStorageSupported(this.#modelService) && Runtime.dynamic) {
       await this.#modelService.createModel?.(this.#cls);
     }
   }
@@ -101,8 +101,7 @@ export class ModelAuthService<T extends ModelType> implements
    * @param user The user to register
    */
   async register(user: OptionalId<T>): Promise<T> {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const ident = this.toPrincipal(user as T);
+    const ident = this.toPrincipal(user);
 
     try {
       if (ident.id) {

package/support/test/model.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 
-import { AppError, Class } from '@travetto/base';
+import { AppError, Class } from '@travetto/runtime';
 import { Suite, Test } from '@travetto/test';
 import { Inject, InjectableFactory } from '@travetto/di';
 import { ModelCrudSupport, Model } from '@travetto/model';