added optional socks configuration for Solr client. Moved config file…

… schema to a separate JSON schema file to make it easier to validate the config file in the editor.

config/default.example.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../src/schema/common/config.json",
   "callbackUrls": {
     "passwordReset": "http://localhost:8080/password-reset"
   },

config/default.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../src/schema/common/config.json",
   "isPublicApi": true,
   "availablePlans": ["plan-basic", "plan-educational", "plan-researcher"],
   "allowedCorsOrigins": [

package.json

@@ -80,6 +80,7 @@
     "feathers-sequelize": "^6.0.1",
     "feathers-solr": "^3.1.0",
     "feathers-swagger": "3.0.0",
+    "fetch-socks": "^1.3.2",
     "form-data": "^3.0.0",
     "generic-pool": "^3.8.2",
     "graphology": "^0.16.1",

src/app.ts

@@ -48,7 +48,7 @@ app.configure(rateLimiter)
 
 app.set(
   'cacheManager',
-  cache(app.get('redis'), app.get('cache').enabled, (error: Error) => {
+  cache(app.get('redis'), app.get('cache')?.enabled, (error: Error) => {
     console.error('Cache error. Restarting', error.stack)
     process.exit(1)
   })

src/authentication.ts

@@ -124,7 +124,7 @@ class ImlAppJWTStrategy extends JWTStrategy {
     const authConfig = (this.app as ImpressoApplication)?.get('imlAuthConfiguration')
 
     const imlOps: JwtVerifyOptions = { ...params.jwt }
-    if (authConfig != null) {
+    if (authConfig?.jwtOptions?.audience != null) {
       imlOps.audience = authConfig.jwtOptions.audience
     }
 

src/celery.ts

@@ -2,7 +2,7 @@ import { Application, HookContext, NextFunction } from '@feathersjs/feathers'
 import { createClient } from 'celery-node'
 import RedisBackend from 'celery-node/dist/backends/redis'
 import debugModule from 'debug'
-import { CeleryConfiguration } from './configuration'
+import { CeleryConfig } from './configuration'
 import { logger } from './logger'
 import Job from './models/jobs.model'
 import type { LogData } from './services/logs/logs.class'
@@ -21,7 +21,7 @@ export interface CeleryClient {
   run: (task: { task: string; args: any[] }) => Promise<AsyncResult>
 }
 
-const getCeleryClient = (config: CeleryConfiguration, app: ImpressoApplication) => {
+const getCeleryClient = (config: CeleryConfig, app: ImpressoApplication) => {
   const client = createClient(config.brokerUrl, config.backendUrl)
   const backend: RedisBackend = client.backend as RedisBackend