@travetto/auth-model 6.0.0 → 7.0.0-rc.0

package/package.json

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

package/src/model.ts

@@ -1,4 +1,4 @@
-import { Util, Class, TimeUtil, Runtime } from '@travetto/runtime';
+import { Util, Class, TimeUtil, Runtime, castTo } from '@travetto/runtime';
 import { ModelCrudSupport, ModelType, NotFoundError, OptionalId, ModelStorageUtil } from '@travetto/model';
 import { Principal, Authenticator, Authorizer, AuthenticationError } from '@travetto/auth';
 
@@ -93,7 +93,6 @@ export class ModelAuthService<T extends ModelType> implements Authenticator<T>,
     if (hash !== ident.hash) {
       throw new AuthenticationError('Invalid password');
     } else {
-      delete ident.password;
       return ident;
     }
   }
@@ -123,13 +122,8 @@ export class ModelAuthService<T extends ModelType> implements Authenticator<T>,
     }
 
     const fields = await AuthModelUtil.generatePassword(ident.password!);
-
-    ident.password = undefined; // Clear it out on set
-
-    Object.assign(user, this.fromPrincipal(fields));
-
-    const res: T = await this.#modelService.create(this.#cls, user);
-    return res;
+    const output: Partial<T> = { ...user, ...this.fromPrincipal(fields) };
+    return await this.#modelService.create(this.#cls, this.#cls.from(castTo(output)));
   }
 
   /**
@@ -154,9 +148,8 @@ export class ModelAuthService<T extends ModelType> implements Authenticator<T>,
     }
 
     const fields = await AuthModelUtil.generatePassword(password);
-    Object.assign(user, this.fromPrincipal(fields));
-
-    return await this.#modelService.update(this.#cls, user);
+    const output: Partial<T> = { ...user, ...this.fromPrincipal(fields) };
+    return await this.#modelService.update(this.#cls, this.#cls.from(castTo(output)));
   }
 
   /**
@@ -171,10 +164,8 @@ export class ModelAuthService<T extends ModelType> implements Authenticator<T>,
     ident.resetToken = await AuthModelUtil.generateHash(Util.uuid(), salt, 25000, 32);
     ident.resetExpires = TimeUtil.fromNow(1, 'h');
 
-    Object.assign(user, this.fromPrincipal(ident));
-
-    await this.#modelService.update(this.#cls, user);
-
+    const output: Partial<T> = { ...user, ...this.fromPrincipal(ident) };
+    await this.#modelService.update(this.#cls, this.#cls.from(castTo(output)));
     return ident;
   }
 

package/support/test/model.ts

@@ -3,7 +3,7 @@ import assert from 'node:assert';
 import { AppError, castTo, Class } from '@travetto/runtime';
 import { Suite, Test } from '@travetto/test';
 import { Inject, InjectableFactory } from '@travetto/di';
-import { ModelCrudSupport, Model } from '@travetto/model';
+import { ModelCrudSupport, Model, Transient } from '@travetto/model';
 import { InjectableSuite } from '@travetto/di/support/test/suite.ts';
 import { ModelSuite } from '@travetto/model/support/test/suite.ts';
 
@@ -14,6 +14,7 @@ export const TestModelSvcSymbol = Symbol.for('@travetto/auth:test-model-svc');
 @Model({ autoCreate: false })
 class User implements RegisteredPrincipal {
   id: string;
+  @Transient()
   password?: string;
   salt?: string;
   hash?: string;
@@ -58,6 +59,7 @@ export abstract class AuthModelServiceSuite {
     });
 
     const user = await this.authService.register(pre);
+    assert(user.password === undefined);
     assert.ok(user.hash);
     assert.ok(user.id);
   }
@@ -78,6 +80,7 @@ export abstract class AuthModelServiceSuite {
         const user = await this.authService.register(pre);
         assert.ok(user.hash);
         assert.ok(user.id);
+        assert(user.password === undefined);
       } else {
         throw err;
       }