@travetto/auth-model 3.0.0-rc.4 → 3.0.0-rc.6

package/README.md

@@ -1,5 +1,5 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
-<!-- Please modify https://github.com/travetto/travetto/tree/main/module/auth-model/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/auth-model/DOC.ts and execute "npx trv doc" to rebuild -->
 # Authentication Model
 ## Authentication model support for the travetto framework
 
@@ -20,16 +20,16 @@ npm install @travetto/model-{provider}
 Currently, the following are packages that provide [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts#L11):
    
    *  [DynamoDB Model Support](https://github.com/travetto/travetto/tree/main/module/model-dynamodb#readme "DynamoDB backing for the travetto model module.") - @travetto/model-dynamodb
-   *  [Elasticsearch Model Source](https://github.com/travetto/travetto/tree/main/module/model-elasticsearch#readme "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.") @travetto/model-elasticsearch
-   *  [Firestore Model Support](https://github.com/travetto/travetto/tree/main/module/model-firestore#readme "Firestore backing for the travetto model module.") @travetto/model-firestore
-   *  [MongoDB Model Support](https://github.com/travetto/travetto/tree/main/module/model-mongo#readme "Mongo backing for the travetto model module.") @travetto/model-mongo
-   *  [Redis Model Support](https://github.com/travetto/travetto/tree/main/module/model-redis#readme "Redis backing for the travetto model module.") @travetto/model-redis
-   *  [S3 Model Support](https://github.com/travetto/travetto/tree/main/module/model-s3#readme "S3 backing for the travetto model module.") @travetto/model-s3
-   *  [MySQL Model Service](https://github.com/travetto/travetto/tree/main/module/model-mysql#readme "MySQL backing for the travetto model module, with real-time modeling support for SQL schemas.") @travetto/model-mysql
-   *  [PostgreSQL Model Service](https://github.com/travetto/travetto/tree/main/module/model-postgres#readme "PostgreSQL backing for the travetto model module, with real-time modeling support for SQL schemas.") @travetto/model-postgres
-   *  [SQLite Model Service](https://github.com/travetto/travetto/tree/main/module/model-sqlite#readme "SQLite backing for the travetto model module, with real-time modeling support for SQL schemas.") @travetto/model-sqlite
-
-The module itself is fairly straightforward, and truly the only integration point for this module to work is defined at the model level.  The contract for authentication is established in code as providing translation to and from a [Registered Principal](https://github.com/travetto/travetto/tree/main/module/auth-model/src/model.ts#L10)
+   *  [Elasticsearch Model Source](https://github.com/travetto/travetto/tree/main/module/model-elasticsearch#readme "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.") - @travetto/model-elasticsearch
+   *  [Firestore Model Support](https://github.com/travetto/travetto/tree/main/module/model-firestore#readme "Firestore backing for the travetto model module.") - @travetto/model-firestore
+   *  [MongoDB Model Support](https://github.com/travetto/travetto/tree/main/module/model-mongo#readme "Mongo backing for the travetto model module.") - @travetto/model-mongo
+   *  [Redis Model Support](https://github.com/travetto/travetto/tree/main/module/model-redis#readme "Redis backing for the travetto model module.") - @travetto/model-redis
+   *  [S3 Model Support](https://github.com/travetto/travetto/tree/main/module/model-s3#readme "S3 backing for the travetto model module.") - @travetto/model-s3
+   *  [MySQL Model Service](https://github.com/travetto/travetto/tree/main/module/model-mysql#readme "MySQL backing for the travetto model module, with real-time modeling support for SQL schemas.") - @travetto/model-mysql
+   *  [PostgreSQL Model Service](https://github.com/travetto/travetto/tree/main/module/model-postgres#readme "PostgreSQL backing for the travetto model module, with real-time modeling support for SQL schemas.") - @travetto/model-postgres
+   *  [SQLite Model Service](https://github.com/travetto/travetto/tree/main/module/model-sqlite#readme "SQLite backing for the travetto model module, with real-time modeling support for SQL schemas.") - @travetto/model-sqlite
+
+The module itself is fairly straightforward, and truly the only integration point for this module to work is defined at the model level.  The contract for authentication is established in code as providing translation to and from a [Registered Principal](https://github.com/travetto/travetto/tree/main/module/auth-model/src/model.ts#L9)
 
 A registered principal extends the base concept of an principal, by adding in additional fields needed for local registration, specifically password management information.
 

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@travetto/auth-model",
-  "displayName": "Authentication Model",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.6",
   "description": "Authentication model support for the travetto framework",
   "keywords": [
     "authentication",
@@ -16,18 +15,29 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
+    "__index__.ts",
     "src",
-    "test-support"
+    "support"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/auth-model"
   },
   "dependencies": {
-    "@travetto/auth": "^3.0.0-rc.2",
-    "@travetto/model": "^3.0.0-rc.4"
+    "@travetto/auth": "^3.0.0-rc.4",
+    "@travetto/model": "^3.0.0-rc.6"
+  },
+  "peerDependencies": {
+    "@travetto/test": "^3.0.0-rc.6"
+  },
+  "peerDependenciesMeta": {
+    "@travetto/test": {
+      "optional": true
+    }
+  },
+  "travetto": {
+    "displayName": "Authentication Model"
   },
   "private": false,
   "publishConfig": {

package/src/model.ts

@@ -1,6 +1,5 @@
-import { AppError, Util, Class } from '@travetto/base';
+import { AppError, Util, Class, TimeUtil, GlobalEnv } from '@travetto/base';
 import { ModelCrudSupport, ModelType, NotFoundError, OptionalId } from '@travetto/model';
-import { EnvUtil } from '@travetto/boot';
 import { AuthUtil, Principal, Authenticator, Authorizer } from '@travetto/auth';
 import { isStorageSupported } from '@travetto/model/src/internal/service/common';
 
@@ -93,7 +92,7 @@ export class ModelAuthService<T extends ModelType> implements
   }
 
   async postConstruct(): Promise<void> {
-    if (isStorageSupported(this.#modelService) && EnvUtil.isDynamic()) {
+    if (isStorageSupported(this.#modelService) && GlobalEnv.dynamic) {
       await this.#modelService.createModel?.(this.#cls);
     }
   }
@@ -164,7 +163,7 @@ export class ModelAuthService<T extends ModelType> implements
     const salt = await Util.uuid();
 
     ident.resetToken = await AuthUtil.generateHash(Util.uuid(), salt, 25000, 32);
-    ident.resetExpires = Util.timeFromNow('1h');
+    ident.resetExpires = TimeUtil.timeFromNow('1h');
 
     Object.assign(user, this.fromPrincipal(ident));
 

package/{test-support → support/test}/model.ts

@@ -1,15 +1,15 @@
-import * as assert from 'assert';
+import assert from 'assert';
 
 import { AppError, Class } from '@travetto/base';
 import { Suite, Test } from '@travetto/test';
 import { Inject, InjectableFactory } from '@travetto/di';
 import { ModelCrudSupport, Model } from '@travetto/model';
-import { InjectableSuite } from '@travetto/di/test-support/suite';
-import { ModelSuite } from '@travetto/model/test-support/suite';
+import { InjectableSuite } from '@travetto/di/support/test/suite';
+import { ModelSuite } from '@travetto/model/support/test/suite';
 
-import { ModelAuthService, RegisteredPrincipal } from '../src/model';
+import { ModelAuthService, RegisteredPrincipal } from '../../src/model';
 
-export const TestModelSvcⲐ = Symbol.for('@trv:auth/test-model-svc');
+export const TestModelSvcⲐ = Symbol.for('@travetto/auth:test-model-svc');
 
 @Model({ autoCreate: false })
 class User implements RegisteredPrincipal {