@thzero/library_server_fastify 0.15.33 → 0.15.36

package/boot/index.js

@@ -9,6 +9,7 @@ import fastifyRoutes from 'fastify-routes';
 import fastifyStatic from 'fastify-static';
 
 import LibraryConstants from '@thzero/library_server/constants';
+import LibraryCommonServiceConstants from '@thzero/library_common_service/constants';
 
 import injector from '@thzero/library_common/utility/injector';
 
@@ -249,10 +250,18 @@ class FastifyBootMain extends BootMain {
 		const capitalize = (word) => {
 			return word[0].toUpperCase() + word.slice(1).toLowerCase();
 		};
-		for (let [key, value] of this._initAuthentication(new Map()).entries())
-			fastify.decorate('authentication' + capitalize(key), value);
-		for (let [key, value] of this._initAuthorization(new Map()).entries())
-			fastify.decorate('authorization' + capitalize(key), value);
+		
+		let item;
+		for (let [key, value] of this._initAuthentication(new Map()).entries()) {
+			item = value.init(injector);
+			fastify.decorate('authentication' + capitalize(key), item.callback);
+			fastify.decorate('authenticationMiddleware' + capitalize(key), item.service);
+		}
+		for (let [key, value] of this._initAuthorization(new Map()).entries()) {
+			item = value.init(injector);
+			fastify.decorate('authorization' + capitalize(key), item.callback);
+			fastify.decorate('authorizationMiddleware' + capitalize(key), item.service);
+		}
 
 		this._initPostAuth(fastify);
 
@@ -297,12 +306,12 @@ class FastifyBootMain extends BootMain {
     }
 
 	_initAuthentication(map) {
-		map.set('default', authenticationDefault);
+		map.set('default', new authenticationDefault());
 		return map;
 	}
 
 	_initAuthorization(map) {
-		map.set('default', authorizationDefault);
+		map.set('default', new authorizationDefault());
 		return map;
 	}
 

package/middleware/authentication.js

@@ -1,78 +1,94 @@
 import LibraryConstants from '@thzero/library_server/constants';
 import LibraryCommonServiceConstants from '@thzero/library_common_service/constants';
 
-import injector from '@thzero/library_common/utility/injector';
-
 const separator = ': ';
 
-function getAuthToken(request, logger) {
-	if (!request)
-		return null;
-	if (!logger)
-		return null;
-
-	const token = request.headers[LibraryConstants.Headers.AuthKeys.AUTH];
-	logger.debug('middleware', 'getAuthToken', 'token', token, request.correlationId);
-	const split = token.split(LibraryConstants.Headers.AuthKeys.AUTH_BEARER + separator);
-	logger.debug('middleware', 'getAuthToken', 'split', split, request.correlationId);
-	logger.debug('middleware', 'getAuthToken', 'split.length', split.length, request.correlationId);
-	if (split.length > 1)
-		return split[1];
-
-	logger.debug('middleware', 'getAuthToken', 'fail', null, request.correlationId);
-	return null;
-}
+class DefaultAuthenticationMiddleware {
+	constructor() {
+		this._serviceAuth = null;
+		this._serviceLogger = null;
+	}
 
-export default async (request, reply, done, options) => {
-	const logger = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_LOGGER);
+	init(injector) {
+		this._serviceAuth = injector.getService(LibraryConstants.InjectorKeys.SERVICE_AUTH);
+		this._serviceLogger = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_LOGGER);
 
-	const required = options && (options.required !== null) && (options.required !== undefined) ? options.required : true;
+		return {
+			callback: async (request, reply, done, options) => {
+				const middleware = request.server.authenticationMiddlewareDefault;
+				await middleware.authenticate(request, reply, done, options)
+			},
+			service: this
+		}
+	}
 
-	const token = getAuthToken(request, logger);
-	logger.debug('middleware', 'authentication', 'token', token, request.correlationId);
-	logger.debug('middleware', 'authentication', 'required', required, request.correlationId);
-	const valid = ((required && !String.isNullOrEmpty(token)) || !required);
-	logger.debug('middleware', 'authentication', 'valid', valid, request.correlationId);
-	if (valid) {
-		if (!String.isNullOrEmpty(token)) {
-			const service = injector.getService(LibraryConstants.InjectorKeys.SERVICE_AUTH);
-			const results = await service.verifyToken(request.correlationId, token);
-			logger.debug('middleware', 'authentication', 'results', results, request.correlationId);
-			if (!results || !results.success) {
-				logger.warn('middleware', 'authentication', 'Unauthenticated... invalid token', null, request.correlationId);
-				ctx.throw(401);
-				return;
+	async authenticate(request, reply, done, options) {
+		const required = options && (options.required !== null) && (options.required !== undefined) ? options.required : true;
+	
+		const token = this._getAuthToken(request);
+		this._serviceLogger.debug('middleware', 'authentication', 'token', token, request.correlationId);
+		this._serviceLogger.debug('middleware', 'authentication', 'required', required, request.correlationId);
+		const valid = ((required && !String.isNullOrEmpty(token)) || !required);
+		this._serviceLogger.debug('middleware', 'authentication', 'valid', valid, request.correlationId);
+		if (valid) {
+			if (!String.isNullOrEmpty(token)) {
+				const results = await this._serviceAuth.verifyToken(request.correlationId, token);
+				this._serviceLogger.debug('middleware', 'authentication', 'results', results, request.correlationId);
+				if (!results || !results.success) {
+					this._serviceLogger.warn('middleware', 'authentication', 'Unauthenticated... invalid token', null, request.correlationId);
+					ctx.throw(401);
+					return;
+				}
+	
+				request.token = token;
+				request.user = results.user;
+				request.claims = results.claims;
 			}
-
-			request.token = token;
-			request.user = results.user;
-			request.claims = results.claims;
+	
+			// done(); // not for async
+			return;
 		}
-
-		// done(); // not for async
-		return;
+	
+		(async () => {
+			const usageMetrics = {
+				url: request.routerPath,
+				correlationId: request.correlationId,
+				href: request.url,
+				headers: request.headers,
+				host: request.hostname,
+				hostname: request.hostname,
+				querystring: request.query,
+				token: request.token
+			};
+			const serviceUsageMetrics = request.server[LibraryConstants.InjectorKeys.SERVICE_USAGE_METRIC];
+			await serviceUsageMetrics.register(usageMetrics).catch((err) => {
+				this._serviceLogger.error('middleware', 'authentication', err, null, request.correlationId);
+			});
+		})();
+	
+		this._serviceLogger.warn('middleware', 'authentication', 'Unauthorized... authentication unknown', null, request.correlationId);
+		// reply.code(401);
+		// done(new Error('Unauthorized... authentication unknown')); // not for async
+		throw new Error('Unauthorized... authentication unknown');
 	}
 
-	(async () => {
-		const usageMetrics = {
-			url: request.routerPath,
-			correlationId: request.correlationId,
-			href: request.url,
-			headers: request.headers,
-			host: request.hostname,
-			hostname: request.hostname,
-			querystring: request.query,
-			token: request.token
-		};
-		const serviceUsageMetrics = injector.getService(LibraryConstants.InjectorKeys.SERVICE_USAGE_METRIC);
-		await serviceUsageMetrics.register(usageMetrics).catch((err) => {
-			// const logger = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_LOGGER);
-			logger.error('middleware', 'authentication', err, null, request.correlationId);
-		});
-	})();
-
-	logger.warn('middleware', 'authentication', 'Unauthorized... authentication unknown', null, request.correlationId);
-	// reply.code(401);
-	// done(new Error('Unauthorized... authentication unknown')); // not for async
-	throw new Error('Unauthorized... authentication unknown');
+	_getAuthToken(request) {
+		if (!request)
+			return null;
+	
+		const token = request.headers[LibraryConstants.Headers.AuthKeys.AUTH];
+		if (token !== null && token !== undefined) {
+			this._serviceLogger.debug('middleware', 'getAuthToken', 'token', token, request.correlationId);
+			const split = token.split(LibraryConstants.Headers.AuthKeys.AUTH_BEARER + separator);
+			this._serviceLogger.debug('middleware', 'getAuthToken', 'split', split, request.correlationId);
+			this._serviceLogger.debug('middleware', 'getAuthToken', 'split.length', split.length, request.correlationId);
+			if (split.length > 1)
+				return split[1];
+		}
+	
+		this._serviceLogger.debug('middleware', 'getAuthToken', 'fail', null, request.correlationId);
+		return null;
+	}
 }
+
+export default DefaultAuthenticationMiddleware;

package/middleware/authorization.js

@@ -1,8 +1,6 @@
 import LibraryConstants from '@thzero/library_server/constants';
 import LibraryCommonServiceConstants from '@thzero/library_common_service/constants';
 
-import injector from '@thzero/library_common/utility/injector';
-
 // require('../utility/string.cjs');
 String.isNullOrEmpty = function(value) {
 	//return !(typeof value === 'string' && value.length > 0)
@@ -22,93 +20,196 @@ String.trim = function(value) {
 const logicalAnd = 'and';
 const logicalOr = 'or';
 
-const authorizationCheckClaims = async (request, success, logical, security, logger) => {
-	if (!request)
-		return false;
-	if (!(request.claims && Array.isArray(request.claims)))
-		return false;
-
-	let result;
-	let roleAct;
-	let roleObj;
-	let roleParts;
-	for (const claim of request.claims) {
-		logger.debug('middleware', 'authorization', 'authorization.claim', claim, request.correlationId);
-
-		for (const role of request.roles) {
-			logger.debug('middleware', 'authorization', 'role', role, request.correlationId);
-
-			roleParts = role.split('.');
-			if (roleParts && roleParts.length < 1)
-				success = false;
-
-			roleObj = roleParts[0];
-			roleAct = roleParts.length >= 2 ? roleParts[1] : null
-
-			result = await security.validate(claim, null, roleObj, roleAct);
-			logger.debug('middleware', 'authorization', 'result', result, request.correlationId);
-			if (logical === logicalOr)
-				success = success || result;
-			else
-				success = success && result;
+class DefaultAuthenticationMiddleware {
+	constructor() {
+		this._serviceConfig = null;
+		this._serviceLogger = null;
+		this._serviceSecurity = null;
+	}
+
+	init(injector) {
+		this._serviceConfig = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_CONFIG);
+		this._serviceLogger = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_LOGGER);
+		this._serviceSecurity = injector.getService(LibraryConstants.InjectorKeys.SERVICE_SECURITY);
+
+		return {
+			callback: async (request, reply, done, options) => {
+				const middleware = request.server.authorizationMiddlewareDefault;
+				await middleware.authorization(request, reply, done, options)
+			},
+			service: this
 		}
 	}
 
-	return success;
-}
+	async authorization(request, reply, done, options) {
+		let logical = logicalOr;
+		let roles = [];
+		if (options) {
+			logical = options.logical;
+			if (String.isNullOrEmpty(logical) || (logical !== logicalAnd) || (logical !== logicalOr))
+				logical = logicalOr;
+			
+			if (options.roles && Array.isArray(options.roles) && (options.roles.length > 0))
+				roles = options.roles;
+		}
+	
+		// this._serviceLogger.debug('token', request.token);
+		this._serviceLogger.debug('middleware', 'authorization', 'user', request.user, request.correlationId);
+		this._serviceLogger.debug('middleware', 'authorization', 'claims', request.claims, request.correlationId);
+		this._serviceLogger.debug('middleware', 'authorization', 'roles1', roles, request.correlationId);
+		request.roles = [];
+		if (roles) {
+			// this._serviceLogger.debug('authorization.roles1', roles);
+			// this._serviceLogger.debug('authorization.roles1', (typeof roles));
+			// this._serviceLogger.debug('authorization.roles1', Array.isArray(roles));
+			// this._serviceLogger.debug('authorization.roles1', ((typeof(roles) === 'string') || (roles instanceof String)));
+			// if (Array.isArray(roles)) {
+			// 	// this._serviceLogger.debug('authorization.roles1a', roles);
+			// 	request.roles = roles;
+			// }
+			// else if ((typeof(roles) === 'string') || (roles instanceof String)) {
+			// 	// this._serviceLogger.debug('authorization.roles1b', roles);
+			// 	request.roles = roles.split(',');
+			// 	request.roles.map(item => item ? item.trim() : item);
+			// }
+			this._initalizeRoles(request, roles);
+		}
+		this._serviceLogger.debug('middleware', 'authorization', 'roles2', request.roles, request.correlationId);
+	
+		let success = false; //(logical === logicalOr ? false : true);
+		if (request.roles && Array.isArray(request.roles) && (request.roles.length > 0)) {
+			const auth = this._serviceConfig.get('auth');
+			if (auth) {
+				this._serviceLogger.debug('middleware', 'authorization', 'auth.claims', auth.claims, request.correlationId);
+				this._serviceLogger.debug('middleware', 'authorization', 'auth.claims.check', auth.claims.check, request.correlationId);
+			}
+			if (auth && auth.claims && auth.claims.check)
+				success = await this._authorizationCheckClaims(request, (logical === logicalOr ? false : true), logical);
+	
+			if (!success)
+				success = await this._authorizationCheckRoles(request, (logical === logicalOr ? false : true), logical);
+		}
+	
+		this._serviceLogger.debug('middleware', 'authorization', 'success', null, request.success, request.correlationId);
+		if (success) {
+			// done(); // not for async
+			return;
+		}
+	
+		(async () => {
+			const usageMetrics = {
+				url: request.routerPath,
+				correlationId: request.correlationId,
+				href: request.url,
+				headers: request.headers,
+				host: request.hostname,
+				hostname: request.hostname,
+				querystring: request.query,
+				token: request.token
+			};
+			const serviceUsageMetrics = request.server[LibraryConstants.InjectorKeys.SERVICE_USAGE_METRIC];
+			await serviceUsageMetrics.register(usageMetrics).catch((err) => {
+				this._serviceLogger.error('middleware', 'authorization', err, null, request.correlationId);
+			});
+		})();
+	
+		this._serviceLogger.warn('middleware', 'authorization', 'Unauthorized... authorization unknown', null, request.correlationId);
+		// reply.code(401);
+		// done(new Error('Unauthorized... authentication unknown')); // not for async
+		throw new Error('Unauthorized... authentication unknown');
+	}
+	
+	async _authorizationCheckClaims (request, success, logical) {
+		if (!request)
+			return false;
+		if (!(request.claims && Array.isArray(request.claims)))
+			return false;
+
+		let result;
+		let roleAct;
+		let roleObj;
+		let roleParts;
+		for (const claim of request.claims) {
+			this._serviceLogger.debug('middleware', 'authorization', 'authorization.claim', claim, request.correlationId);
+
+			for (const role of request.roles) {
+				this._serviceLogger.debug('middleware', 'authorization', 'role', role, request.correlationId);
+
+				roleParts = role.split('.');
+				if (roleParts && roleParts.length < 1)
+					success = false;
+
+				roleObj = roleParts[0];
+				roleAct = roleParts.length >= 2 ? roleParts[1] : null
+
+				result = await this._serviceSecurity.validate(claim, null, roleObj, roleAct);
+				this._serviceLogger.debug('middleware', 'authorization', 'result', result, request.correlationId);
+				if (logical === logicalOr)
+					success = success || result;
+				else
+					success = success && result;
+			}
+		}
 
-const authorizationCheckRoles = async (request, success, logical, security, logger) => {
-	if (!request)
-		return false;
+		return success;
+	}
+
+	async _authorizationCheckRoles (request, success, logical) {
+		if (!request)
+			return false;
 
-	logger.debug('middleware', 'authorizationCheckRoles', 'user', request.user, request.correlationId);
-	if (!(request.user && request.user.roles && Array.isArray(request.user.roles)))
-		return false;
+		this._serviceLogger.debug('middleware', '_authorizationCheckRoles', 'user', request.user, request.correlationId);
+		if (!(request.user && request.user.roles && Array.isArray(request.user.roles)))
+			return false;
 
-	logger.debug('middleware', 'authorizationCheckRoles', 'logical', logical, request.correlationId);
+		this._serviceLogger.debug('middleware', '_authorizationCheckRoles', 'logical', logical, request.correlationId);
 
-	let result;
-	let roleAct;
-	let roleObj;
-	let roleParts;
-	for (const userRole of request.user.roles) {
-		logger.debug('middleware', 'authorizationCheckRoles', 'userRole', userRole, request.correlationId);
+		let result;
+		let roleAct;
+		let roleObj;
+		let roleParts;
+		for (const userRole of request.user.roles) {
+			this._serviceLogger.debug('middleware', '_authorizationCheckRoles', 'userRole', userRole, request.correlationId);
 
-		for (const role of request.roles) {
-			logger.debug('middleware', 'authorizationCheckRoles', 'role', role, request.correlationId);
+			for (const role of request.roles) {
+				this._serviceLogger.debug('middleware', '_authorizationCheckRoles', 'role', role, request.correlationId);
 
-			roleParts = role.split('.');
-			if (roleParts && roleParts.length < 1)
-				success = false;
+				roleParts = role.split('.');
+				if (roleParts && roleParts.length < 1)
+					success = false;
 
-			roleObj = roleParts[0];
-			roleAct = roleParts.length >= 2 ? roleParts[1] : null
+				roleObj = roleParts[0];
+				roleAct = roleParts.length >= 2 ? roleParts[1] : null
 
-			result = await security.validate(userRole, null, roleObj, roleAct);
-			logger.debug('middleware', 'authorizationCheckRoles', 'result', result, request.correlationId);
-			if (logical === logicalOr) {
-				if (result)
-					return result;
+				result = await this._serviceSecurity.validate(userRole, null, roleObj, roleAct);
+				this._serviceLogger.debug('middleware', '_authorizationCheckRoles', 'result', result, request.correlationId);
+				if (logical === logicalOr) {
+					if (result)
+						return result;
 
-				success = false;
+					success = false;
+				}
+				else
+					success = success && result;
 			}
-			else
-				success = success && result;
 		}
-	}
-
-	return success;
-}
 
-const initalizeRoles = (request, roles, logger) => {
-	if (Array.isArray(roles)) {
-		// logger.debug('middleware', 'initalizeRoles', 'roles1a', roles);
-		request.roles = roles;
+		return success;
 	}
-	else if ((typeof(roles) === 'string') || (roles instanceof String)) {
-		// logger.debug('middleware', 'initalizeRoles', 'roles1b', roles);
-		request.roles = roles.split(',');
-		request.roles.map(item => item ? item.trim() : item);
+
+	_initalizeRoles (request, roles) {
+		if (Array.isArray(roles)) {
+			this._serviceLogger.debug('middleware', '_initalizeRoles', 'roles1a', roles);
+			request.roles = roles;
+			return;
+		}
+		
+		if ((typeof(roles) === 'string') || (roles instanceof String)) {
+			// logger.debug('middleware', '_initalizeRoles', 'roles1b', roles);
+			request.roles = roles.split(',');
+			request.roles.map(item => item ? item.trim() : item);
+			return;
+		}
 	}
 }
 
@@ -116,85 +217,4 @@ const initalizeRoles = (request, roles, logger) => {
 // 	if (String.isNullOrEmpty(logical) || (logical !== logicalAnd) || (logical !== logicalOr))
 // 		logical = logicalOr;
 
-export default async (request, reply, done, options) => {
-	let logical = logicalOr;
-	let roles = [];
-	if (options) {
-		logical = options.logical;
-		if (String.isNullOrEmpty(logical) || (logical !== logicalAnd) || (logical !== logicalOr))
-			logical = logicalOr;
-		
-		if (options.roles && Array.isArray(options.roles) && (options.roles.length > 0))
-			roles = options.roles;
-	}
-
-	const config = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_CONFIG);
-	const logger = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_LOGGER);
-	const security = injector.getService(LibraryConstants.InjectorKeys.SERVICE_SECURITY);
-
-	// logger.debug('token', request.token);
-	logger.debug('middleware', 'authorization', 'user', request.user, request.correlationId);
-	logger.debug('middleware', 'authorization', 'claims', request.claims, request.correlationId);
-	logger.debug('middleware', 'authorization', 'roles1', roles, request.correlationId);
-	request.roles = [];
-	if (roles) {
-		// logger.debug('authorization.roles1', roles);
-		// logger.debug('authorization.roles1', (typeof roles));
-		// logger.debug('authorization.roles1', Array.isArray(roles));
-		// logger.debug('authorization.roles1', ((typeof(roles) === 'string') || (roles instanceof String)));
-		// if (Array.isArray(roles)) {
-		// 	// logger.debug('authorization.roles1a', roles);
-		// 	request.roles = roles;
-		// }
-		// else if ((typeof(roles) === 'string') || (roles instanceof String)) {
-		// 	// logger.debug('authorization.roles1b', roles);
-		// 	request.roles = roles.split(',');
-		// 	request.roles.map(item => item ? item.trim() : item);
-		// }
-		initalizeRoles(request, roles, logger);
-	}
-	logger.debug('middleware', 'authorization', 'roles2', request.roles, request.correlationId);
-
-	let success = false; //(logical === logicalOr ? false : true);
-	if (request.roles && Array.isArray(request.roles) && (request.roles.length > 0)) {
-		const auth = config.get('auth');
-		if (auth) {
-			logger.debug('middleware', 'authorization', 'auth.claims', auth.claims, request.correlationId);
-			logger.debug('middleware', 'authorization', 'auth.claims.check', auth.claims.check, request.correlationId);
-		}
-		if (auth && auth.claims && auth.claims.check)
-			success = await authorizationCheckClaims(request, (logical === logicalOr ? false : true), logical, security, logger);
-
-		if (!success)
-			success = await authorizationCheckRoles(request, (logical === logicalOr ? false : true), logical, security, logger);
-	}
-
-	logger.debug('middleware', 'authorization', 'success', null, request.success, request.correlationId);
-	if (success) {
-		// done(); // not for async
-		return;
-	}
-
-	(async () => {
-		const usageMetrics = {
-			url: request.routerPath,
-			correlationId: request.correlationId,
-			href: request.url,
-			headers: request.headers,
-			host: request.hostname,
-			hostname: request.hostname,
-			querystring: request.query,
-			token: request.token
-		};
-		const serviceUsageMetrics = injector.getService(LibraryConstants.InjectorKeys.SERVICE_USAGE_METRIC);
-		await serviceUsageMetrics.register(usageMetrics).catch((err) => {
-			// const logger = injector.getService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_LOGGER);
-			logger.error('middleware', 'authorization', err, null, request.correlationId);
-		});
-	})();
-
-	logger.warn('middleware', 'authorization', 'Unauthorized... authorization unknown', null, request.correlationId);
-	// reply.code(401);
-	// done(new Error('Unauthorized... authentication unknown')); // not for async
-	throw new Error('Unauthorized... authentication unknown');
-}
+export default DefaultAuthenticationMiddleware;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@thzero/library_server_fastify",
   "type": "module",
-  "version": "0.15.33",
+  "version": "0.15.36",
   "version_major": 0,
   "version_minor": 15,
-  "version_patch": 33,
-  "version_date": "04/19/2022",
+  "version_patch": 36,
+  "version_date": "04/22/2022",
   "description": "An opinionated library of common functionality to bootstrap a Fastify based API application.",
   "author": "thZero",
   "license": "MIT",
@@ -21,8 +21,7 @@
     "node": ">=12.8.3"
   },
   "scripts": {
-    "cli-update": "./node_modules/.bin/library-cli --updateversion --pi",
-    "cli-update-w": ".\\node_modules\\.bin\\library-cli --updateversion --pi",
+    "cli-update": "library-cli --updateversion --pi",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
@@ -36,6 +35,7 @@
   },
   "peerDependencies": {
     "@thzero/library_common": "^0.15",
-    "@thzero/library_common_service": "^0.15"
+    "@thzero/library_common_service": "^0.15",
+    "@thzero/library_server": "^0.15"
   }
 }

package/routes/admin/index.js

@@ -1,5 +1,3 @@
-import LibraryUtility from '@thzero/library_common/utility';
-
 import BaseRoute from '../index';
 
 class AdminBaseRoute extends BaseRoute {
@@ -52,7 +50,7 @@ class AdminBaseRoute extends BaseRoute {
 			// eslint-disable-next-line
 			async (request, reply) => {
 				const response = (await router[this._options.serviceKey].create(request.correlationId, request.user, request.body)).check(request);
-				this._jsonResponse(reply, LibraryUtility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}
@@ -74,7 +72,7 @@ class AdminBaseRoute extends BaseRoute {
 			// eslint-disable-next-line
 			async (request, reply) => {
 				const response = (await router[this._options.serviceKey].delete(request.correlationId, request.user, request.params.id)).check(request);
-				this._jsonResponse(reply, LibraryUtility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}
@@ -96,7 +94,7 @@ class AdminBaseRoute extends BaseRoute {
 			// eslint-disable-next-line
 			async (request, reply) => {
 				const response = (await router[this._options.serviceKey].update(request.correlationId, request.user, request.params.id, request.body)).check(request);
-				this._jsonResponse(reply, LibraryUtility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}
@@ -121,7 +119,7 @@ class AdminBaseRoute extends BaseRoute {
 			// eslint-disable-next-line
 			async (request, reply) => {
 				const response = (await router[this._options.serviceKey].search(request.correlationId, request.user, request.body)).check(request);
-				this._jsonResponse(reply, LibraryUtility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 

package/routes/baseNews.js

@@ -38,7 +38,7 @@ class BaseNewsRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_NEWS);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_NEWS].latest(request.correlationId, request.user, parseInt(request.params.date))).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			});
 	}
 }

package/routes/baseUsers.js

@@ -48,7 +48,7 @@ class BaseUsersRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_USERS);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_USERS].fetchByGamerId(request.correlationId, request.params.gamerId)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}
@@ -72,7 +72,7 @@ class BaseUsersRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_USERS);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_USERS].fetchByGamerTag(request.correlationId, request.params.gamerTag)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}
@@ -95,7 +95,7 @@ class BaseUsersRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_USERS);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_USERS].refreshSettings(request.correlationId, request.body)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}
@@ -118,7 +118,7 @@ class BaseUsersRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_USERS);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_USERS].update(request.correlationId, request.body)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}
@@ -141,7 +141,7 @@ class BaseUsersRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_USERS);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_USERS].updateSettings(request.correlationId, request.body)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}

package/routes/index.js

@@ -1,5 +1,7 @@
 import fastifyPlugin from 'fastify-plugin';
 
+import Utility from '@thzero/library_common/utility';
+
 import BaseRoute from'@thzero/library_server/routes/index';
 
 class FastifyBaseRoute extends BaseRoute {
@@ -32,7 +34,7 @@ class FastifyBaseRoute extends BaseRoute {
 		reply
 			.code(200)
 			.header('Content-Type', 'application/json; charset=utf-8')
-			.send(json);
+			.send((typeof user === 'string') ? json : Utility.stringify(json));
 	}
 }
 

package/routes/plans.js

@@ -27,7 +27,7 @@ class PlansRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_PLANS);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_PLANS].listing(request.correlationId, request.body)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}

package/routes/utility.js

@@ -40,7 +40,7 @@ class UtilityRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_UTILITY);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_UTILITY].logger(request.correlationId, request.body)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}

package/routes/version.js

@@ -27,7 +27,7 @@ class VersionRoute extends BaseRoute {
 			async (request, reply) => {
 				// const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_VERSION);
 				const response = (await router[LibraryConstants.InjectorKeys.SERVICE_VERSION].version(request.correlationId)).check(request);
-				this._jsonResponse(reply, Utility.stringify(response));
+				this._jsonResponse(reply, response);
 			}
 		);
 	}