Add tests for authentication schema, improve code coverage

daffl · daffl · commit 5a49020f00cc · 2022-04-04T12:21:29.000-07:00
diff --git a/packages/authentication/package.json b/packages/authentication/package.json
@@ -65,6 +65,7 @@
   },
   "devDependencies": {
     "@feathersjs/memory": "^5.0.0-pre.17",
+    "@feathersjs/schema": "^5.0.0-pre.17",
     "@types/lodash": "^4.14.178",
     "@types/mocha": "^9.1.0",
     "@types/node": "^17.0.15",
diff --git a/packages/authentication/src/options.ts b/packages/authentication/src/options.ts
@@ -48,15 +48,17 @@ export const authenticationSettingsSchema = {
     },
     jwt: {
       type: 'object',
-      header: {
-        type: 'string',
-        default: 'Authorization',
-        description: 'The HTTP header containing the JWT'
-      },
-      schemes: {
-        type: 'array',
-        items: { type: 'string' },
-        description: 'An array of schemes to support'
+      properties: {
+        header: {
+          type: 'string',
+          default: 'Authorization',
+          description: 'The HTTP header containing the JWT'
+        },
+        schemes: {
+          type: 'array',
+          items: { type: 'string' },
+          description: 'An array of schemes to support'
+        }
       }
     },
     local: {
diff --git a/packages/authentication/test/core.test.ts b/packages/authentication/test/core.test.ts
@@ -1,8 +1,10 @@
 import assert from 'assert';
 import { feathers, Application } from '@feathersjs/feathers';
 import jwt from 'jsonwebtoken';
+import { Infer, schema } from '@feathersjs/schema';
 
 import { AuthenticationBase, AuthenticationRequest } from '../src/core';
+import { authenticationSettingsSchema } from '../src/options';
 import { Strategy1, Strategy2, MockRequest } from './fixtures';
 import { ServerResponse } from 'http';
 
@@ -31,6 +33,21 @@ describe('authentication/core', () => {
   });
 
   describe('configuration', () => {
+    it('infers configuration from settings schema', async () => {
+      const settingsSchema = schema({
+        $id: 'AuthSettingsSchema',
+        ...authenticationSettingsSchema
+      } as const);
+      type Settings = Infer<typeof settingsSchema>;
+      const config: Settings = {
+        entity: 'user',
+        secret: 'supersecret',
+        authStrategies: [ 'some', 'thing' ]
+      }
+
+      await settingsSchema.validate(config);
+    });
+
     it('throws an error when app is not provided', () => {
       try {
         // @ts-ignore
diff --git a/packages/schema/src/resolver.ts b/packages/schema/src/resolver.ts
@@ -13,8 +13,6 @@ export type PropertyResolverMap<T, C> = {
 }
 
 export interface ResolverConfig<T, C> {
-  // TODO this should be `Schema<any>` but has recently produced an error, see
-  // https://github.com/ThomasAribart/json-schema-to-ts/issues/53
   schema?: Schema<T>,
   validate?: 'before'|'after'|false,
   properties: PropertyResolverMap<T, C>
diff --git a/packages/schema/test/fixture.ts b/packages/schema/test/fixture.ts
@@ -6,7 +6,7 @@ import { GeneralError } from '@feathersjs/errors';
 
 import {
   schema, resolve, Infer, resolveResult,
-  queryProperty, resolveQuery, resolveData
+  queryProperty, resolveQuery, resolveData, validateData, validateQuery
 } from '../src';
 
 export const userSchema = schema({
@@ -148,6 +148,7 @@ const app = feathers<ServiceTypes>()
   .use('messages', memory());
 
 app.service('messages').hooks([
+  validateQuery(messageQuerySchema),
   resolveQuery(messageQueryResolver),
   resolveResult(messageResultResolver)
 ]);
@@ -158,6 +159,7 @@ app.service('users').hooks([
 
 app.service('users').hooks({
   create: [
+    validateData(userSchema),
     resolveData(userDataResolver)
   ]
 });

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ export type PropertyResolverMap<T, C> = {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export interface ResolverConfig<T, C> {`
`16`		- // TODO this should be `Schema<any>` but has recently produced an error, see
`17`		`- // https://github.com/ThomasAribart/json-schema-to-ts/issues/53`
`18`	`16`	`schema?: Schema<T>,`
`19`	`17`	`validate?: 'before'\|'after'\|false,`
`20`	`18`	`properties: PropertyResolverMap<T, C>`