@travetto/scaffold 5.0.24 → 6.0.0-rc.0

package/README.md

@@ -39,7 +39,7 @@ In addition to the core functionality, the `rest` feature has some useful sub-fe
 [Logging](https://github.com/travetto/travetto/tree/main/module/log#readme "Logging framework that integrates at the console.log level.") support for better formatting, [debug](https://www.npmjs.com/package/debug) like support, and colorized output.  This is generally useful for server logs, especially during development.
 
 ## Authentication
-Authentication is also supported on the Restful endpoints by selecting [Rest Auth](https://github.com/travetto/travetto/tree/main/module/auth-rest#readme "Rest authentication integration support for the Travetto framework") during setup.  This will support basic authentication running out of local memory, with user [REST Session](https://github.com/travetto/travetto/tree/main/module/rest-session#readme "Session provider for the travetto rest module.")s.
+Authentication is also supported on the Restful endpoints by selecting [Rest Auth](https://github.com/travetto/travetto/tree/main/module/auth-rest#readme "Rest authentication integration support for the Travetto framework") during setup.  This will support basic authentication running out of local memory.
 
 ## Testing
 [Testing](https://github.com/travetto/travetto/tree/main/module/test#readme "Declarative test framework") can also be configured out of the box to provide simple test cases for the data model.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "5.0.24",
+  "version": "6.0.0-rc.0",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
     "generator",
@@ -27,13 +27,13 @@
     "trv-scaffold": "bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/cli": "^5.0.19",
-    "@travetto/runtime": "^5.0.16",
+    "@travetto/cli": "^6.0.0-rc.0",
+    "@travetto/runtime": "^6.0.0-rc.0",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"
   },
   "devDependencies": {
-    "@travetto/model": "^5.0.17",
+    "@travetto/model": "^6.0.0-rc.0",
     "@types/mustache": "^4.2.5"
   },
   "travetto": {

package/resources/templates/todo/src/rest/auth.config.ts

@@ -1,5 +1,5 @@
 import { Authorizer, Authenticator, AuthenticationError } from '@travetto/auth';
-import { SessionModelSymbol } from '@travetto/rest-session';
+import { SessionModelSymbol } from '@travetto/auth-session';
 import { InjectableFactory } from '@travetto/di';
 import { ModelExpirySupport } from '@travetto/model';
 import { MemoryModelService } from '@travetto/model-memory';

package/resources/templates/todo/src/rest/auth.ts

@@ -1,7 +1,6 @@
-import { Controller, Get, Post, Redirect, Request } from '@travetto/rest';
-import { Authenticate, Authenticated, AuthService, Unauthenticated } from '@travetto/auth-rest';
+import { Controller, Get, Post, Redirect } from '@travetto/rest';
+import { Login, Authenticated, Logout } from '@travetto/auth-rest';
 import { Principal } from '@travetto/auth';
-import { Inject } from '@travetto/di';
 
 import { BasicAuthSymbol } from './auth.config';
 
@@ -11,11 +10,8 @@ import { BasicAuthSymbol } from './auth.config';
 @Controller('/auth')
 export class ApiController {
 
-  @Inject()
-  svc: AuthService;
-
   @Post('/login')
-  @Authenticate(BasicAuthSymbol)
+  @Login(BasicAuthSymbol)
   async getAll(): Promise<Redirect> {
     return new Redirect('/auth/self', 301);
   }
@@ -27,9 +23,8 @@ export class ApiController {
   }
 
   @Get('/logout')
-  @Unauthenticated()
-  async logout(req: Request): Promise<Redirect> {
-    await this.svc.logout(req);
+  @Logout()
+  async logout(): Promise<Redirect> {
     return new Redirect('/auth/self', 301);
   }
 }

package/resources/templates/todo/src/rest/todo.ts

@@ -3,8 +3,11 @@ import { NotFoundError } from '@travetto/model';
 import { Inject } from '@travetto/di';
 import { ModelQuery } from '@travetto/model-query';
 import { Schema } from '@travetto/schema';
+// {{#modules.auth}}
+import { AuthContext } from '@travetto/auth';
+// {{/modules.auth}}
 // {{#modules.auth_rest}}
-import { AuthService, Authenticated } from '@travetto/auth-rest';
+import { Authenticated } from '@travetto/auth-rest';
 // {{/modules.auth_rest}}
 // @ts-expect-error
 import { $_modelService_$ } from '$_modelImport_$';
@@ -32,10 +35,10 @@ export class TodoController {
   @Inject()
   source: $_modelService_$;
 
-  // {{#modules.auth_rest}}
+  // {{#modules.auth}}
   @Inject()
-  auth: AuthService;
-  // {{/modules.auth_rest}}
+  authContext: AuthContext;
+  // {{/modules.auth}}
 
   /**
    * Get all Todos
@@ -44,7 +47,7 @@ export class TodoController {
   async getAll(query: Query): Promise<Todo[]> {
     query.q ??= {};
     // {{#modules.auth_rest}}
-    query.q.userId = this.auth.getPrincipal()?.id;
+    query.q.userId = this.authContext.principal?.id;
     // {{/modules.auth_rest}}
     return this.source.query(Todo, { where: query.q });
   }
@@ -57,7 +60,7 @@ export class TodoController {
     const q: ModelQuery<Todo> = { where: { id } };
     // {{#modules.auth_rest}}
     if (typeof q.where !== 'string') {
-      q.where!.userId = this.auth.getPrincipal()?.id;
+      q.where!.userId = this.authContext.principal?.id;
     }
     // {{/modules.auth_rest}}
     return this.source.queryOne(Todo, q);
@@ -69,7 +72,7 @@ export class TodoController {
   @Post('/')
   async save(todo: Todo): Promise<Todo> {
     // {{#modules.auth_rest}}
-    todo.userId = this.auth.getPrincipal()?.id;
+    todo.userId = this.authContext.principal?.id;
     // {{/modules.auth_rest}}
     return this.source.create(Todo, todo);
   }
@@ -80,7 +83,7 @@ export class TodoController {
   @Put('/:id')
   async update(todo: Todo): Promise<Todo> {
     // {{#modules.auth_rest}}
-    todo.userId = this.auth.getPrincipal()?.id;
+    todo.userId = this.authContext.principal?.id;
     // {{/modules.auth_rest}}
     return this.source.update(Todo, todo);
   }
@@ -93,7 +96,7 @@ export class TodoController {
     const q: ModelQuery<Todo> = { where: { id } };
     // {{#modules.auth_rest}}
     if (typeof q.where !== 'string') {
-      q.where!.userId = this.auth.getPrincipal()?.id;
+      q.where!.userId = this.authContext.principal?.id;
     }
     // {{/modules.auth_rest}}
     if (await this.source.deleteByQuery(Todo, q) !== 1) {

package/support/bin/features.ts

@@ -45,8 +45,7 @@ export const FEATURES: Feature[] = [
     title: 'Rest Authentication',
     package: '@travetto/auth-rest',
     addons: [
-      { title: 'Rest Session', package: ['@travetto/rest-session', '@travetto/model-memory'] },
-      { title: 'Auth Rest Session', package: ['@travetto/auth-rest-session', '@travetto/model-memory'] },
+      { title: 'Session Support', package: ['@travetto/auth-session', '@travetto/auth-rest-session', '@travetto/model-memory'] },
     ]
   },
   {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 ArcSine Technologies
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.