@travetto/scaffold 3.1.5 → 3.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
     "generator",

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

@@ -4,11 +4,9 @@ import { Inject } from '@travetto/di';
 import { ModelQuery } from '@travetto/model-query';
 import { Schema } from '@travetto/schema';
 // {{#modules.auth_rest}}
-import { Authenticated } from '@travetto/auth-rest';
+import { AuthService, Authenticated } from '@travetto/auth-rest';
+import { } from '@travetto/auth-rest';
 // {{/modules.auth_rest}}
-// {{#modules.auth_rest_context}}
-import { AuthContextService } from '@travetto/auth-rest-context';
-// {{/modules.auth_rest_context}}
 import { $_modelService_$ } from '$_modelImport_$';
 
 import { Todo } from '../model/todo';
@@ -16,9 +14,9 @@ import { Todo } from '../model/todo';
 @Schema()
 class Query {
   q: {
-    // {{#modules.auth_rest_context}}
+    // {{#modules.auth_rest}}
     userId?: string;
-    // {{/modules.auth_rest_context}}
+    // {{/modules.auth_rest}}
   } = {};
 }
 
@@ -34,10 +32,10 @@ export class TodoController {
   @Inject()
   source: $_modelService_$;
 
-  // {{#modules.auth_rest_context}}
+  // {{#modules.auth_rest}}
   @Inject()
-  auth: AuthContextService;
-  // {{/modules.auth_rest_context}}
+  auth: AuthService;
+  // {{/modules.auth_rest}}
 
   /**
    * Get all Todos
@@ -45,9 +43,9 @@ export class TodoController {
   @Get('/')
   async getAll(query: Query): Promise<Todo[]> {
     query.q ??= {};
-    // {{#modules.auth_rest_context}}
-    query.q.userId = this.auth.get()?.id;
-    // {{/modules.auth_rest_context}}
+    // {{#modules.auth_rest}}
+    query.q.userId = this.auth.getPrincipal()?.id;
+    // {{/modules.auth_rest}}
     return this.source.query(Todo, { where: query.q });
   }
 
@@ -57,11 +55,11 @@ export class TodoController {
   @Get('/:id')
   async getOne(id: string): Promise<Todo> {
     const q: ModelQuery<Todo> = { where: { id } };
-    // {{#modules.auth_rest_context}}
+    // {{#modules.auth_rest}}
     if (typeof q.where !== 'string') {
-      q.where!.userId = this.auth.get()?.id;
+      q.where!.userId = this.auth.getPrincipal()?.id;
     }
-    // {{/modules.auth_rest_context}}
+    // {{/modules.auth_rest}}
     return this.source.queryOne(Todo, q);
   }
 
@@ -70,9 +68,9 @@ export class TodoController {
    */
   @Post('/')
   async save(todo: Todo): Promise<Todo> {
-    // {{#modules.auth_rest_context}}
-    todo.userId = this.auth.get()?.id;
-    // {{/modules.auth_rest_context}}
+    // {{#modules.auth_rest}}
+    todo.userId = this.auth.getPrincipal()?.id;
+    // {{/modules.auth_rest}}
     return this.source.create(Todo, todo);
   }
 
@@ -81,9 +79,9 @@ export class TodoController {
    */
   @Put('/:id')
   async update(todo: Todo): Promise<Todo> {
-    // {{#modules.auth_rest_context}}
-    todo.userId = this.auth.get()?.id;
-    // {{/modules.auth_rest_context}}
+    // {{#modules.auth_rest}}
+    todo.userId = this.auth.getPrincipal()?.id;
+    // {{/modules.auth_rest}}
     return this.source.update(Todo, todo);
   }
 
@@ -93,11 +91,11 @@ export class TodoController {
   @Delete('/:id')
   async remove(id: string): Promise<void> {
     const q: ModelQuery<Todo> = { where: { id } };
-    // {{#modules.auth_rest_context}}
+    // {{#modules.auth_rest}}
     if (typeof q.where !== 'string') {
-      q.where!.userId = this.auth.get()?.id;
+      q.where!.userId = this.auth.getPrincipal()?.id;
     }
-    // {{/modules.auth_rest_context}}
+    // {{/modules.auth_rest}}
     if (await this.source.deleteByQuery(Todo, q) !== 1) {
       throw new NotFoundError(Todo, id);
     }

package/support/bin/features.ts

@@ -47,7 +47,6 @@ export const FEATURES: Feature[] = [
     addons: [
       { title: 'Rest Session', package: '@travetto/rest-session' },
       { title: 'Auth Rest Session', package: '@travetto/auth-rest-session' },
-      { title: 'Auth Rest Context', package: '@travetto/auth-rest-context' }
     ]
   },
   {