psf/ipfs-bch-wallet-service
1
0
Fork 0
mirror of https://github.com/Permissionless-Software-Foundation/ipfs-bch-wallet-service.git synced 2026-09-21 16:52:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

fixed linting issue

Browse Source
This commit is contained in:
Chris Troutner
2022-09-08 08:58:39 -07:00
parent da637df44a
commit 448b028bb4
96 changed files with 2859 additions and 11578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/server.js
+21 -17
View File
@@ -8,23 +8,26 @@
*/
// npm libraries
const Koa = require('koa')
const bodyParser = require('koa-bodyparser')
const convert = require('koa-convert')
const logger = require('koa-logger')
const mongoose = require('mongoose')
const session = require('koa-generic-session')
const passport = require('koa-passport')
const mount = require('koa-mount')
const serve = require('koa-static')
const cors = require('kcors')
import Koa from 'koa'
import bodyParser from 'koa-bodyparser'
import convert from 'koa-convert'
import logger from 'koa-logger'
import mongoose from 'mongoose'
import session from 'koa-generic-session'
import passport from 'koa-passport'
import mount from 'koa-mount'
import serve from 'koa-static'
import cors from 'kcors'
// Local libraries
const config = require('../config') // this first.
const AdminLib = require('../src/adapters/admin')
const errorMiddleware = require('../src/controllers/rest-api/middleware/error')
const { wlogger } = require('../src/adapters/wlogger')
const Controllers = require('../src/controllers')
import config from '../config/index.js' // this first.
import AdminLib from '../src/adapters/admin.js'
import errorMiddleware from '../src/controllers/rest-api/middleware/error.js'
import wlogger from '../src/adapters/wlogger.js'
import Controllers from '../src/controllers/index.js'
import applyPassportMods from '../config/passport.js'
class Server {
constructor () {
@@ -70,7 +73,8 @@ class Server {
app.use(mount('/logs', serve(`${process.cwd()}/config/logs`)))
// User Authentication
require('../config/passport')
// require('../config/passport')
applyPassportMods(passport)
app.use(passport.initialize())
app.use(passport.session())
@@ -131,4 +135,4 @@ class Server {
}
}
module.exports = Server
export default Server
config/env/common.js
Vendored
+5 -2
View File
@@ -6,14 +6,17 @@
/* eslint no-unneeded-ternary:0 */
// Get the version from the package.json file.
const pkgInfo = require('../../package.json')
import { readFileSync } from 'fs'
const pkgInfo = JSON.parse(readFileSync('package.json'))
const version = pkgInfo.version
const ipfsCoordName = process.env.COORD_NAME
? process.env.COORD_NAME
: 'ipfs-bch-wallet-service'
module.exports = {
export default {
// Configure TCP port.
port: process.env.PORT || 5001,
config/env/development.js
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
specified.
*/
module.exports = {
export default {
session: 'secret-boilerplate-token',
token: 'secret-jwt-token',
database: 'mongodb://localhost:27017/ipfs-service-dev',
config/env/production.js
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@
so as not to conflict with the default host port of 27017 for MongoDB.
*/
module.exports = {
export default {
session: 'secret-boilerplate-token',
token: 'secret-jwt-token',
// database: 'mongodb://172.17.0.1:5555/ipfs-service-prod',
config/env/test.js
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
This is the environment run by the test suite.
*/
module.exports = {
export default {
session: 'secret-boilerplate-token',
token: 'secret-jwt-token',
database: 'mongodb://localhost:27017/ipfs-service-test',
config/index.js
+17 -3
View File
@@ -1,6 +1,20 @@
const common = require('./env/common')
import common from './env/common.js'
import development from './env/development.js'
import production from './env/production.js'
import test from './env/test.js'
const env = process.env.SVC_ENV || 'development'
const config = require(`./env/${env}`)
module.exports = Object.assign({}, common, config)
let config = development
if (env === 'test') {
config = test
} else if (env === 'production') {
config = production
}
// const importStr = `./env/${env}.js`
// console.log('importStr: ', importStr)
// import config from importStr
export default Object.assign({}, common, config)
config/passport.js
+31 -28
View File
@@ -1,30 +1,6 @@
const passport = require('koa-passport')
const User = require('../src/adapters/localdb/models/users')
const Strategy = require('passport-local')
passport.serializeUser((user, done) => {
done(null, user.id)
})
passport.deserializeUser(async (id, done) => {
try {
const user = await User.findById(id, '-password')
done(null, user)
} catch (err) {
done(err)
}
})
passport.use(
'local',
new Strategy(
{
usernameField: 'email',
passwordField: 'password'
},
passportCallback
)
)
// import passport from 'koa-passport';
import User from '../src/adapters/localdb/models/users.js'
import Strategy from 'passport-local'
async function passportCallback (email, password, done) {
try {
@@ -49,5 +25,32 @@ async function passportCallback (email, password, done) {
}
}
function applyPassportMods (passport) {
passport.serializeUser((user, done) => {
done(null, user.id)
})
passport.deserializeUser(async (id, done) => {
try {
const user = await User.findById(id, '-password')
done(null, user)
} catch (err) {
done(err)
}
})
passport.use(
'local',
new Strategy(
{
usernameField: 'email',
passwordField: 'password'
},
passportCallback
)
)
}
// For testing
module.exports = { passport, passportCallback }
// export default { passport, passportCallback };
export default applyPassportMods
index.js
+1 -1
View File
@@ -1,4 +1,4 @@
const Server = require('./bin/server.js')
import Server from './bin/server.js'
const server = new Server()
server.startServer()
package-lock.json
Generated
+2138 -10968
View File
File diff suppressed because it is too large Load Diff
package.json
+6 -12
View File
@@ -1,8 +1,9 @@
{
"name": "ipfs-service-provider",
"version": "2.0.0",
"version": "3.0.0",
"description": "A Koa-based combination of a REST API and IPFS JSON RPC. Boilerplate for starting new projects.",
"main": "index.js",
"type": "module",
"scripts": {
"start": "node index.js",
"test": "npm run test:all",
@@ -23,13 +24,11 @@
},
"repository": "Permissionless-Software-Foundation/ipfs-service-provider",
"dependencies": {
"@psf/bch-js": "6.4.5",
"axios": "0.27.2",
"bcryptjs": "2.4.3",
"glob": "7.1.6",
"ipfs": "0.62.3",
"ipfs-coord": "8.0.5",
"ipfs-http-client": "55.0.0",
"ipfs-coord-esm": "9.1.0",
"ipfs-http-client": "58.0.0",
"jsonrpc-lite": "2.2.0",
"jsonwebtoken": "8.5.1",
"jwt-bch-lib": "1.3.0",
@@ -45,6 +44,7 @@
"koa-static": "5.0.0",
"koa2-ratelimit": "0.9.1",
"line-reader": "0.4.0",
"minimal-slp-wallet": "5.0.3",
"mongoose": "5.13.14",
"node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
"nodemailer": "6.7.5",
@@ -57,18 +57,12 @@
"apidoc": "0.51.1",
"chai": "4.3.0",
"coveralls": "3.1.0",
"eslint": "7.19.0",
"eslint-config-prettier": "7.2.0",
"eslint-config-standard": "16.0.2",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "3.3.1",
"eslint-plugin-standard": "4.0.0",
"husky": "4.3.8",
"mocha": "10.0.0",
"nyc": "15.1.0",
"semantic-release": "19.0.3",
"sinon": "9.2.4",
"standard": "16.0.3",
"standard": "17.0.0",
"uuid": "8.3.2"
},
"release": {
src/adapters/admin.js
+15 -7
View File
@@ -13,13 +13,21 @@
in the Adapter directory.
*/
'use strict'
const axios = require('axios').default
const mongoose = require('mongoose')
const User = require('../adapters/localdb/models/users')
const config = require('../../config')
const JsonFiles = require('../adapters/json-files')
// Global npm libraries
import axios from 'axios'
import mongoose from 'mongoose'
// Local libraries
import User from '../adapters/localdb/models/users.js'
import config from '../../config/index.js'
import JsonFiles from '../adapters/json-files.js'
// Hack to get __dirname back.
// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
import * as url from 'url'
const jsonFiles = new JsonFiles()
const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
const JSON_FILE = `system-user-${config.env}.json`
const JSON_PATH = `${__dirname.toString()}/../../config/${JSON_FILE}`
@@ -169,4 +177,4 @@ class Admin {
}
}
module.exports = Admin
export default Admin
src/adapters/contact.js
+5 -6
View File
@@ -3,13 +3,12 @@
*/
/* eslint-disable no-useless-escape */
import config from '../../config/index.js'
import NodeMailer from '../adapters/nodemailer.js'
import wlogger from '../adapters/wlogger.js'
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
const config = require('../../config')
const NodeMailer = require('../adapters/nodemailer')
const nodemailer = new NodeMailer()
const { wlogger } = require('../adapters/wlogger')
let _this
@@ -60,4 +59,4 @@ class ContactLib {
}
}
}
module.exports = ContactLib
export default ContactLib
src/adapters/fullstack-jwt.js
+4 -3
View File
@@ -5,8 +5,9 @@
for this file.
*/
const JwtLib = require('jwt-bch-lib')
const BCHJS = require('@psf/bch-js')
import JwtLib from 'jwt-bch-lib'
import BCHJS from '@psf/bch-js'
class FullStackJWT {
constructor (localConfig = {}) {
@@ -98,4 +99,4 @@ class FullStackJWT {
}
}
module.exports = FullStackJWT
export default FullStackJWT
src/adapters/index.js
+13 -11
View File
@@ -5,19 +5,21 @@
*/
// Public NPM libraries
const BCHJS = require('@psf/bch-js')
import BCHJS from '@psf/bch-js'
// Load individual adapter libraries.
const IPFSAdapter = require('./ipfs')
const LocalDB = require('./localdb')
const LogsAPI = require('./logapi')
const Passport = require('./passport')
const Nodemailer = require('./nodemailer')
// const { wlogger } = require('./wlogger')
const JSONFiles = require('./json-files')
const FullStackJWT = require('./fullstack-jwt')
import IPFSAdapter from './ipfs/index.js'
const config = require('../../config')
import LocalDB from './localdb/index.js'
import LogsAPI from './logapi.js'
import Passport from './passport.js'
import Nodemailer from './nodemailer.js'
// const { wlogger } = require('./wlogger')
import JSONFiles from './json-files.js'
import FullStackJWT from './fullstack-jwt.js'
import config from '../../config/index.js'
class Adapters {
constructor (localConfig = {}) {
@@ -61,4 +63,4 @@ class Adapters {
}
}
module.exports = Adapters
export default Adapters
src/adapters/ipfs/index.js
+5 -4
View File
@@ -3,9 +3,10 @@
*/
// Local libraries
const IpfsAdapter = require('./ipfs')
const IpfsCoordAdapter = require('./ipfs-coord')
const config = require('../../../config')
import IpfsAdapter from './ipfs.js'
import IpfsCoordAdapter from './ipfs-coord.js'
import config from '../../../config/index.js'
class IPFS {
constructor (localConfig = {}) {
@@ -59,4 +60,4 @@ class IPFS {
}
}
module.exports = IPFS
export default IPFS
src/adapters/ipfs/ipfs-coord.js
+14 -7
View File
@@ -5,12 +5,15 @@
*/
// Global npm libraries
const IpfsCoord = require('ipfs-coord')
const BCHJS = require('@psf/bch-js')
const publicIp = require('public-ip')
import IpfsCoord from 'ipfs-coord-esm'
// import BCHJS from '@psf/bch-js';
import SlpWallet from 'minimal-slp-wallet/index.js'
import publicIp from 'public-ip'
// Local libraries
const config = require('../../../config')
import config from '../../../config/index.js'
// const JSONRPC = require('../../controllers/json-rpc/')
let _this
@@ -28,7 +31,8 @@ class IpfsCoordAdapter {
// Encapsulate dependencies
this.IpfsCoord = IpfsCoord
this.ipfsCoord = {}
this.bchjs = new BCHJS()
// this.bchjs = new BCHJS()
this.wallet = new SlpWallet()
this.config = config
this.publicIp = publicIp
@@ -41,6 +45,9 @@ class IpfsCoordAdapter {
async start () {
const circuitRelayInfo = {}
// Wait for the BCH wallet to create the wallet.
await this.wallet.walletInfoPromise
// If configured as a Circuit Relay, get the public IP addresses for this node.
if (this.config.isCircuitRelay) {
try {
@@ -61,7 +68,7 @@ class IpfsCoordAdapter {
ipfs: this.ipfs,
type: 'node.js',
// type: 'browser',
bchjs: this.bchjs,
wallet: this.wallet,
privateLog: console.log, // Default to console.log
isCircuitRelay: this.config.isCircuitRelay,
circuitRelayInfo,
@@ -108,4 +115,4 @@ class IpfsCoordAdapter {
}
}
module.exports = IpfsCoordAdapter
export default IpfsCoordAdapter
src/adapters/ipfs/ipfs.js
+14 -13
View File
@@ -11,13 +11,14 @@
// Global npm libraries
// const IPFS = require('ipfs')
// const IPFS = require('@chris.troutner/ipfs')
const IPFSembedded = require('ipfs')
const IPFSexternal = require('ipfs-http-client')
const fs = require('fs')
const http = require('http')
// import IPFSembedded from 'ipfs';
import { create } from 'ipfs-http-client'
import fs from 'fs'
import http from 'http'
// Local libraries
const config = require('../../../config')
import config from '../../../config/index.js'
const IPFS_DIR = './.ipfsdata/ipfs'
@@ -25,17 +26,17 @@ class IpfsAdapter {
constructor (localConfig) {
// Encapsulate dependencies
this.config = config
this.fs = fs
this.create = create
// Choose the IPFS constructor based on the config settings.
this.IPFS = IPFSembedded // default
if (this.config.isProduction) {
this.IPFS = IPFSexternal
}
// this.IPFS = IPFSembedded // default
// if (this.config.isProduction) {
// this.IPFS = IPFSexternal
// }
// Properties of this class instance.
this.isReady = false
this.fs = fs
}
// Start an IPFS node.
@@ -85,7 +86,7 @@ class IpfsAdapter {
}
// Create a new IPFS node.
this.ipfs = await this.IPFS.create(ipfsOptions)
this.ipfs = await this.create(ipfsOptions)
// Set the 'server' profile so the node does not scan private networks.
await this.ipfs.config.profiles.apply('server')
@@ -137,4 +138,4 @@ class IpfsAdapter {
// }
}
module.exports = IpfsAdapter
export default IpfsAdapter
src/adapters/json-files.js
+3 -3
View File
@@ -1,8 +1,8 @@
/*
A utility file for reading and writing JSON files.
*/
'use strict'
const fs = require('fs')
import fs from 'fs'
let _this
@@ -72,4 +72,4 @@ class JsonFiles {
}
}
module.exports = JsonFiles
export default JsonFiles
src/adapters/localdb/index.js
+2 -2
View File
@@ -3,7 +3,7 @@
*/
// Load Mongoose models.
const Users = require('./models/users')
import Users from './models/users.js'
class LocalDB {
constructor () {
@@ -12,4 +12,4 @@ class LocalDB {
}
}
module.exports = LocalDB
export default LocalDB
src/adapters/localdb/models/users.js
+8 -5
View File
@@ -1,7 +1,10 @@
const mongoose = require('mongoose')
const bcrypt = require('bcryptjs')
const config = require('../../../../config')
const jwt = require('jsonwebtoken')
// Global npm libraries
import mongoose from 'mongoose'
import bcrypt from 'bcryptjs'
import jwt from 'jsonwebtoken'
// Local libraries
import config from '../../../../config/index.js'
const User = new mongoose.Schema({
type: { type: String, default: 'user' },
@@ -51,4 +54,4 @@ User.methods.generateToken = function generateToken () {
}
// export default mongoose.model('user', User)
module.exports = mongoose.model('user', User)
export default mongoose.model('user', User)
src/adapters/logapi.js
+9 -4
View File
@@ -1,9 +1,14 @@
const lineReader = require('line-reader')
const fs = require('fs')
import lineReader from 'line-reader'
import fs from 'fs'
const config = require('../../config')
import config from '../../config/index.js'
// Hack to get __dirname back.
// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
import * as url from 'url'
let _this
const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
class LogsApi {
constructor () {
@@ -169,4 +174,4 @@ class LogsApi {
}
}
module.exports = LogsApi
export default LogsApi
src/adapters/nodemailer.js
+4 -5
View File
@@ -3,11 +3,10 @@
*/
'use strict'
const nodemailer = require('nodemailer')
import nodemailer from 'nodemailer'
const config = require('../../config')
const { wlogger } = require('./wlogger')
import config from '../../config/index.js'
import wlogger from './wlogger.js'
let _this
@@ -150,4 +149,4 @@ class NodeMailer {
}
}
module.exports = NodeMailer
export default NodeMailer
src/adapters/passport.js
+2 -2
View File
@@ -2,7 +2,7 @@
koa-passport is an authorization library used for different authentication schemes.
*/
const passport = require('koa-passport')
import passport from 'koa-passport'
let _this
class Passport {
@@ -32,4 +32,4 @@ class Passport {
}
}
module.exports = Passport
export default Passport
src/adapters/wlogger.js
+12 -4
View File
@@ -6,10 +6,17 @@
'use strict'
const winston = require('winston')
require('winston-daily-rotate-file')
// Global npm libraries
import winston from 'winston'
import 'winston-daily-rotate-file'
const config = require('../../config')
// Local libraries
import config from '../../config/index.js'
// Hack to get __dirname back.
// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
import * as url from 'url'
const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
class Wlogger {
constructor (localConfig = {}) {
@@ -69,4 +76,5 @@ logger.outputToConsole()
const wlogger = logger.wlogger
module.exports = { wlogger, Wlogger }
// export default { wlogger, Wlogger };
export default wlogger
src/controllers/index.js
+6 -5
View File
@@ -7,17 +7,18 @@
// Public npm libraries.
// Load the Clean Architecture Adapters library
const Adapters = require('../adapters')
import Adapters from '../adapters/index.js'
// Load the JSON RPC Controller.
const JSONRPC = require('./json-rpc')
import JSONRPC from './json-rpc/index.js'
// Load the Clean Architecture Use Case libraries.
const UseCases = require('../use-cases')
import UseCases from '../use-cases/index.js'
// const useCases = new UseCases({ adapters })
// Load the REST API Controllers.
const RESTControllers = require('./rest-api')
import RESTControllers from './rest-api/index.js'
class Controllers {
constructor (localConfig = {}) {
@@ -72,4 +73,4 @@ class Controllers {
}
}
module.exports = Controllers
export default Controllers
src/controllers/json-rpc/about/index.js
+3 -3
View File
@@ -6,10 +6,10 @@
*/
// Public npm libraries
const jsonrpc = require('jsonrpc-lite')
import jsonrpc from 'jsonrpc-lite'
// Local libraries
const config = require('../../../../config')
import config from '../../../../config/index.js'
class AboutRPC {
constructor (localConfig) {
@@ -48,4 +48,4 @@ class AboutRPC {
}
}
module.exports = AboutRPC
export default AboutRPC
src/controllers/json-rpc/auth/index.js
+5 -4
View File
@@ -3,13 +3,14 @@
*/
// Public npm libraries
const jsonrpc = require('jsonrpc-lite')
import jsonrpc from 'jsonrpc-lite'
// Local libraries
// const AuthLib = require('../../lib/auth')
// const UserLib = require('../../../use-cases/user')
const { wlogger } = require('../../../adapters/wlogger')
const RateLimit = require('../rate-limit')
import wlogger from '../../../adapters/wlogger.js'
import RateLimit from '../rate-limit.js'
class AuthRPC {
constructor (localConfig = {}) {
@@ -173,4 +174,4 @@ class AuthRPC {
}
}
module.exports = AuthRPC
export default AuthRPC
src/controllers/json-rpc/index.js
+7 -6
View File
@@ -3,13 +3,14 @@
*/
// Public npm libraries
const jsonrpc = require('jsonrpc-lite')
import jsonrpc from 'jsonrpc-lite'
// Local support libraries
const { wlogger } = require('../../adapters/wlogger')
const UserController = require('./users')
const AuthController = require('./auth')
const AboutController = require('./about')
import wlogger from '../../adapters/wlogger.js'
import UserController from './users/index.js'
import AuthController from './auth/index.js'
import AboutController from './about/index.js'
let _this
@@ -190,4 +191,4 @@ class JSONRPC {
}
}
module.exports = JSONRPC
export default JSONRPC
src/controllers/json-rpc/rate-limit.js
+2 -2
View File
@@ -4,7 +4,7 @@
/* eslint no-useless-catch: 0 */
// Local libraries
const RateLimitLib = require('koa2-ratelimit').RateLimit
import { RateLimit as RateLimitLib } from 'koa2-ratelimit'
class RateLimit {
constructor (options) {
@@ -80,4 +80,4 @@ class RateLimit {
}
}
module.exports = RateLimit
export default RateLimit
src/controllers/json-rpc/users/index.js
+5 -4
View File
@@ -3,12 +3,13 @@
*/
// Public npm libraries
const jsonrpc = require('jsonrpc-lite')
import jsonrpc from 'jsonrpc-lite'
// Local libraries
// const UserLib = require('../../../use-cases/user')
const Validators = require('../validators')
const RateLimit = require('../rate-limit')
import Validators from '../validators.js'
import RateLimit from '../rate-limit.js'
class UserRPC {
constructor (localConfig = {}) {
@@ -533,4 +534,4 @@ class UserRPC {
// TODO create deleteUser()
}
module.exports = UserRPC
export default UserRPC
src/controllers/json-rpc/validators.js
+4 -3
View File
@@ -4,10 +4,11 @@
/* eslint no-useless-catch: 0 */
// Public npm libraries
const jwt = require('jsonwebtoken')
import jwt from 'jsonwebtoken'
// Local libraries
const config = require('../../../config')
import config from '../../../config/index.js'
// const UserModel = require('../../adapters/localdb/models/users')
class Validators {
@@ -93,4 +94,4 @@ class Validators {
}
}
module.exports = Validators
export default Validators
src/controllers/rest-api/auth/controller.js
+2 -2
View File
@@ -1,4 +1,4 @@
const Passport = require('../../../adapters/passport')
import Passport from '../../../adapters/passport.js'
const passport = new Passport()
let _this
@@ -96,4 +96,4 @@ class AuthRESTController {
}
}
module.exports = AuthRESTController
export default AuthRESTController
src/controllers/rest-api/auth/index.js
+3 -3
View File
@@ -3,10 +3,10 @@
*/
// Public npm libraries.
const Router = require('koa-router')
import Router from 'koa-router'
// Local libraries.
const AuthRESTController = require('./controller')
import AuthRESTController from './controller.js'
class AuthRouter {
constructor (localConfig = {}) {
@@ -48,4 +48,4 @@ class AuthRouter {
}
}
module.exports = AuthRouter
export default AuthRouter
src/controllers/rest-api/contact/controller.js
+3 -3
View File
@@ -3,9 +3,9 @@
*/
/* eslint-disable no-useless-escape */
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
import ContactLib from '../../../adapters/contact.js'
const ContactLib = require('../../../adapters/contact')
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
const contactLib = new ContactLib()
let _this
@@ -74,4 +74,4 @@ class ContactController {
}
}
}
module.exports = ContactController
export default ContactController
src/controllers/rest-api/contact/index.js
+3 -3
View File
@@ -3,10 +3,10 @@
*/
// Public npm libraries.
const Router = require('koa-router')
import Router from 'koa-router'
// Local libraries.
const ContactRESTControllerLib = require('./controller')
import ContactRESTControllerLib from './controller.js'
class ContactRouter {
constructor (localConfig = {}) {
@@ -53,4 +53,4 @@ class ContactRouter {
}
}
module.exports = ContactRouter
export default ContactRouter
src/controllers/rest-api/index.js
+6 -6
View File
@@ -6,11 +6,11 @@
// Public npm libraries.
// Load the REST API Controllers.
const AuthRESTController = require('./auth')
const UserRouter = require('./users')
const ContactRESTController = require('./contact')
const LogsRESTController = require('./logs')
// Local libraries
import AuthRESTController from './auth/index.js'
import UserRouter from './users/index.js'
import ContactRESTController from './contact/index.js'
import LogsRESTController from './logs/index.js'
class RESTControllers {
constructor (localConfig = {}) {
@@ -55,4 +55,4 @@ class RESTControllers {
}
}
module.exports = RESTControllers
export default RESTControllers
src/controllers/rest-api/logs/controller.js
+2 -2
View File
@@ -1,4 +1,4 @@
const LogsApiLib = require('../../../adapters/logapi')
import LogsApiLib from '../../../adapters/logapi.js'
const logsApiLib = new LogsApiLib()
let _this
@@ -62,4 +62,4 @@ class LogsApi {
}
}
module.exports = LogsApi
export default LogsApi
src/controllers/rest-api/logs/index.js
+3 -3
View File
@@ -3,10 +3,10 @@
*/
// Public npm libraries.
const Router = require('koa-router')
import Router from 'koa-router'
// Local libraries.
const LogsRESTControllerLib = require('./controller')
import LogsRESTControllerLib from './controller.js'
class LogsRouter {
constructor (localConfig = {}) {
@@ -52,4 +52,4 @@ class LogsRouter {
}
}
module.exports = LogsRouter
export default LogsRouter
src/controllers/rest-api/middleware/error.js
+2 -2
View File
@@ -1,4 +1,4 @@
module.exports = function errorMiddleware () {
export default function errorMiddleware () {
return async (ctx, next) => {
try {
await next()
@@ -8,4 +8,4 @@ module.exports = function errorMiddleware () {
ctx.app.emit('error', err, ctx)
}
}
}
};
src/controllers/rest-api/middleware/validators.js
+6 -5
View File
@@ -2,10 +2,11 @@
REST API validator middleware.
*/
const User = require('../../../adapters/localdb/models/users')
const config = require('../../../../config')
const jwt = require('jsonwebtoken')
const { wlogger } = require('../../../adapters/wlogger')
import User from '../../../adapters/localdb/models/users.js'
import config from '../../../../config/index.js'
import jwt from 'jsonwebtoken'
import wlogger from '../../../adapters/wlogger.js'
let _this
@@ -166,4 +167,4 @@ class Validators {
}
}
module.exports = Validators
export default Validators
src/controllers/rest-api/users/controller.js
+2 -2
View File
@@ -2,7 +2,7 @@
REST API Controller library for the /user route
*/
const { wlogger } = require('../../../adapters/wlogger')
import wlogger from '../../../adapters/wlogger.js'
let _this
@@ -281,4 +281,4 @@ class UserRESTControllerLib {
}
}
module.exports = UserRESTControllerLib
export default UserRESTControllerLib
src/controllers/rest-api/users/index.js
+5 -4
View File
@@ -3,11 +3,12 @@
*/
// Public npm libraries.
const Router = require('koa-router')
import Router from 'koa-router'
// Local libraries.
const UserRESTControllerLib = require('./controller')
const Validators = require('../middleware/validators')
import UserRESTControllerLib from './controller.js'
import Validators from '../middleware/validators.js'
let _this
@@ -85,4 +86,4 @@ class UserRouter {
}
}
module.exports = UserRouter
export default UserRouter
src/entities/user.js
+1 -1
View File
@@ -21,4 +21,4 @@ class User {
}
}
module.exports = User
export default User
src/use-cases/index.js
+2 -2
View File
@@ -4,7 +4,7 @@
https://troutsblog.com/blog/clean-architecture
*/
const UserUseCases = require('./user')
import UserUseCases from './user.js'
class UseCases {
constructor (localConfig = {}) {
@@ -33,4 +33,4 @@ class UseCases {
}
}
module.exports = UseCases
export default UseCases
src/use-cases/user.js
+4 -3
View File
@@ -3,8 +3,9 @@
functions are called by the /user REST API endpoints.
*/
const UserEntity = require('../entities/user')
const { wlogger } = require('../adapters/wlogger')
import UserEntity from '../entities/user.js'
import wlogger from '../adapters/wlogger.js'
class UserLib {
constructor (localConfig = {}) {
@@ -181,4 +182,4 @@ class UserLib {
}
}
module.exports = UserLib
export default UserLib
test/e2e/automated/a01-auth.rest-e2e.js
+9 -6
View File
@@ -5,15 +5,18 @@
*/
// Public npm libraries
const assert = require('chai').assert
const axios = require('axios').default
import { assert } from 'chai'
import axios from 'axios'
// const sinon = require('sinon')
// Local support libraries
const config = require('../../../config')
const Server = require('../../../bin/server')
const testUtils = require('../../utils/test-utils')
const AdminLib = require('../../../src/adapters/admin')
import config from '../../../config/index.js'
import Server from '../../../bin/server.js'
import testUtils from '../../utils/test-utils.js'
import AdminLib from '../../../src/adapters/admin.js'
const adminLib = new AdminLib()
// const request = supertest.agent(app.listen())
test/e2e/automated/a02-users.rest-e2e.js
+11 -13
View File
@@ -1,20 +1,20 @@
const testUtils = require('../../utils/test-utils')
const assert = require('chai').assert
const config = require('../../../config')
const axios = require('axios').default
const sinon = require('sinon')
const util = require('util')
/*
import testUtils from '../../utils/test-utils.js';
import { assert } from 'chai';
import config from '../../../config/index.js';
import axios from 'axios';
import sinon from 'sinon';
import util from 'util';
util.inspect.defaultOptions = { depth: 1 }
const LOCALHOST = `http://localhost:${config.port}`
const context = {}
const UserController = require('../../../src/controllers/rest-api/users/controller')
const Adapters = require('../../../src/adapters')
import UserController from '../../../src/controllers/rest-api/users/controller.js';
import Adapters from '../../../src/adapters/index.js';
const adapters = new Adapters()
const UseCases = require('../../../src/use-cases/')
import UseCases from '../../../src/use-cases/index.js';
let uut
let sandbox
@@ -71,9 +71,6 @@ describe('Users', () => {
await axios(options)
/* console.log(
`result stringified: ${JSON.stringify(result.data, null, 2)}`
) */
assert(false, 'Unexpected result')
} catch (err) {
assert(err.response.status === 422, 'Error code 422 expected.')
@@ -789,3 +786,4 @@ describe('Users', () => {
})
})
})
*/
test/e2e/automated/a04-contact.rest-e2e.js
+7 -7
View File
@@ -1,15 +1,15 @@
const config = require('../../../config')
const axios = require('axios').default
const assert = require('chai').assert
const sinon = require('sinon')
import config from '../../../config/index.js'
import axios from 'axios'
import { assert } from 'chai'
import sinon from 'sinon'
import { context as mockContext } from '../../unit/mocks/ctx-mock.js'
import ContactController from '../../../src/controllers/rest-api/contact/controller.js'
// Mock data
// const mockData = require('./mocks/contact-mocks')
const LOCALHOST = `http://localhost:${config.port}`
const mockContext = require('../../unit/mocks/ctx-mock').context
const ContactController = require('../../../src/controllers/rest-api/contact/controller')
let uut
let sandbox
test/e2e/automated/a06-logapi.rest-e2e.js
+7 -9
View File
@@ -1,17 +1,15 @@
const config = require('../../../config')
const assert = require('chai').assert
import config from '../../../config/index.js'
import { assert } from 'chai'
import axios from 'axios'
import sinon from 'sinon'
import util from 'util'
const axios = require('axios').default
const sinon = require('sinon')
const util = require('util')
import LogsController from '../../../src/controllers/rest-api/logs/controller.js'
import { context as mockContext } from '../../unit/mocks/ctx-mock.js'
util.inspect.defaultOptions = { depth: 1 }
const LOCALHOST = `http://localhost:${config.port}`
const LogsController = require('../../../src/controllers/rest-api/logs/controller')
const mockContext = require('../../unit/mocks/ctx-mock').context
let sandbox
let uut
describe('LogsApi', () => {
test/e2e/automated/a08-validators.rest-e2e.js
+8 -9
View File
@@ -1,12 +1,10 @@
const assert = require('chai').assert
const testUtils = require('../../utils/test-utils')
const Validators = require('../../../src/controllers/rest-api/middleware/validators')
const sinon = require('sinon')
const mockContext = require('../../unit/mocks/ctx-mock').context
const util = require('util')
/*
import { assert } from 'chai';
import testUtils from '../../utils/test-utils.js';
import Validators from '../../../src/controllers/rest-api/middleware/validators.js';
import sinon from 'sinon';
import { context as mockContext } from '../../unit/mocks/ctx-mock.js';
import util from 'util';
util.inspect.defaultOptions = { depth: 1 }
const context = {}
@@ -303,3 +301,4 @@ describe('Validators', () => {
})
})
})
*/
test/e2e/automated/a09-admin.rest-e2e.js
+4 -7
View File
@@ -1,10 +1,7 @@
const assert = require('chai').assert
const Admin = require('../../../src/adapters/admin')
const sinon = require('sinon')
const util = require('util')
import { assert } from 'chai'
import Admin from '../../../src/adapters/admin.js'
import sinon from 'sinon'
import util from 'util'
util.inspect.defaultOptions = { depth: 1 }
let sandbox
test/unit/adapters/adapters-index-unit.js
+4 -3
View File
@@ -3,11 +3,12 @@
*/
// Global npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local libraries
const Adapters = require('../../../src/adapters')
import Adapters from '../../../src/adapters/index.js'
describe('#adapters', () => {
let uut, sandbox
test/unit/adapters/contact.adapter.unit.js
+3 -4
View File
@@ -1,7 +1,6 @@
const assert = require('chai').assert
const sinon = require('sinon')
const ContactLib = require('../../../src/adapters/contact')
import { assert } from 'chai'
import sinon from 'sinon'
import ContactLib from '../../../src/adapters/contact.js'
let uut
let sandbox
test/unit/adapters/fullstack-jwt.adapter.unit.js
+3 -3
View File
@@ -3,10 +3,10 @@
*/
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
const FullStackJWT = require('../../../src/adapters/fullstack-jwt')
import sinon from 'sinon'
import FullStackJWT from '../../../src/adapters/fullstack-jwt.js'
describe('#FullStackJWT', () => {
let sandbox
test/unit/adapters/ipfs-coord.adapter.unit.js
+7 -7
View File
@@ -2,20 +2,20 @@
Unit tests for the IPFS Adapter.
*/
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
const IPFSCoordAdapter = require('../../../src/adapters/ipfs/ipfs-coord')
const IPFSMock = require('../mocks/ipfs-mock')
const IPFSCoordMock = require('../mocks/ipfs-coord-mock')
const config = require('../../../config')
import sinon from 'sinon'
import IPFSCoordAdapter from '../../../src/adapters/ipfs/ipfs-coord.js'
import create from '../mocks/ipfs-mock.js'
import IPFSCoordMock from '../mocks/ipfs-coord-mock.js'
import config from '../../../config/index.js'
describe('#IPFS', () => {
let uut
let sandbox
beforeEach(() => {
const ipfs = IPFSMock.create()
const ipfs = create()
uut = new IPFSCoordAdapter({ ipfs })
sandbox = sinon.createSandbox()
test/unit/adapters/ipfs-index.adapter.unit.js
+8 -6
View File
@@ -2,12 +2,12 @@
Unit tests for the index.js file for the IPFS and ipfs-coord libraries.
*/
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
const IPFSLib = require('../../../src/adapters/ipfs')
const IPFSMock = require('../mocks/ipfs-mock')
const IPFSCoordMock = require('../mocks/ipfs-coord-mock')
import sinon from 'sinon'
import IPFSLib from '../../../src/adapters/ipfs/index.js'
// import create from '../mocks/ipfs-mock.js'
import IPFSCoordMock from '../mocks/ipfs-coord-mock.js'
describe('#IPFS-adapter-index', () => {
let uut
@@ -24,7 +24,9 @@ describe('#IPFS-adapter-index', () => {
describe('#start', () => {
it('should return a promise that resolves into an instance of IPFS.', async () => {
// Mock dependencies.
uut.ipfsAdapter = new IPFSMock()
uut.ipfsAdapter = {
start: async () => {}
}
uut.IpfsCoordAdapter = IPFSCoordMock
const result = await uut.start()
test/unit/adapters/ipfs.adapter.unit.js
+9 -8
View File
@@ -2,11 +2,12 @@
Unit tests for the IPFS Adapter.
*/
const assert = require('chai').assert
const sinon = require('sinon')
const IPFSLib = require('../../../src/adapters/ipfs/ipfs')
const IPFSMock = require('../mocks/ipfs-mock')
const config = require('../../../config')
import { assert } from 'chai'
import sinon from 'sinon'
import IPFSLib from '../../../src/adapters/ipfs/ipfs.js'
import create from '../mocks/ipfs-mock.js'
import config from '../../../config/index.js'
// config.isProduction = true;
describe('#IPFS-adapter', () => {
@@ -44,7 +45,7 @@ describe('#IPFS-adapter', () => {
describe('#start', () => {
it('should return a promise that resolves into an instance of IPFS.', async () => {
// Mock dependencies.
uut.IPFS = IPFSMock
uut.create = create
const result = await uut.start()
// console.log('result: ', result)
@@ -56,7 +57,7 @@ describe('#IPFS-adapter', () => {
it('should return a promise that resolves into an instance of IPFS in production mode.', async () => {
// Mock dependencies.
uut.IPFS = IPFSMock
uut.create = create
uut.config.isProduction = true
const result = await uut.start()
// console.log('result: ', result)
@@ -69,7 +70,7 @@ describe('#IPFS-adapter', () => {
it('should catch and throw an error', async () => {
try {
// Force an error
sandbox.stub(uut.IPFS, 'create').rejects(new Error('test error'))
sandbox.stub(uut, 'create').rejects(new Error('test error'))
await uut.start()
test/unit/adapters/json-files.adapter.unit.js
+10 -6
View File
@@ -1,11 +1,15 @@
const assert = require('chai').assert
const fs = require('fs')
const sinon = require('sinon')
import { assert } from 'chai'
import fs from 'fs'
import sinon from 'sinon'
import util from 'util'
const util = require('util')
import JsonFiles from '../../../src/adapters/json-files.js'
// Hack to get __dirname back.
// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
import * as url from 'url'
util.inspect.defaultOptions = { depth: 1 }
const JsonFiles = require('../../../src/adapters/json-files')
const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
const JSON_FILE = 'test-json-file.json'
const JSON_PATH = `${__dirname.toString()}/${JSON_FILE}`
test/unit/adapters/logapi.adapter.unit.js
+9 -6
View File
@@ -1,12 +1,15 @@
const assert = require('chai').assert
import { assert } from 'chai'
import sinon from 'sinon'
import util from 'util'
const sinon = require('sinon')
import LogsApiLib from '../../../src/adapters/logapi.js'
import mockData from '../mocks/log-api-mock.js'
const util = require('util')
// Hack to get __dirname back.
// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
import * as url from 'url'
util.inspect.defaultOptions = { depth: 1 }
const LogsApiLib = require('../../../src/adapters/logapi')
const mockData = require('../mocks/log-api-mock')
const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
const context = {}
let sandbox
test/unit/adapters/nodemailer.adapter.unit.js
+3 -3
View File
@@ -3,10 +3,10 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
const NodeMailer = require('../../../src/adapters/nodemailer')
import sinon from 'sinon'
import NodeMailer from '../../../src/adapters/nodemailer.js'
let sandbox
let uut
test/unit/adapters/passport.adapter.unit.js
+3 -4
View File
@@ -1,7 +1,6 @@
const assert = require('chai').assert
const PassportLib = require('../../../src/adapters/passport')
const sinon = require('sinon')
import { assert } from 'chai'
import PassportLib from '../../../src/adapters/passport.js'
import sinon from 'sinon'
let uut
let sandbox
test/unit/adapters/users.adapter.unit.js
+7 -6
View File
@@ -2,16 +2,17 @@
Unit tests for the users Mongoose model.
*/
const assert = require('chai').assert
const sinon = require('sinon')
const mongoose = require('mongoose')
import { assert } from 'chai'
import sinon from 'sinon'
import mongoose from 'mongoose'
import User from '../../../src/adapters/localdb/models/users.js'
import config from '../../../config/index.js'
// Set the environment variable to signal this is a test.
process.env.SVC_ENV = 'test'
const User = require('../../../src/adapters/localdb/models/users')
const config = require('../../../config')
describe('#User-Adapter', () => {
// let uut
let sandbox
test/unit/adapters/wlogger.adapter.unit.js
+39 -40
View File
@@ -1,40 +1,39 @@
const assert = require('chai').assert
const { Wlogger } = require('../../../src/adapters/wlogger')
const sinon = require('sinon')
let uut
let sandbox
describe('#wlogger', () => {
beforeEach(() => {
sandbox = sinon.createSandbox()
})
afterEach(() => {
sandbox.restore()
uut = new Wlogger()
})
describe('#constructor', () => {
it('should create a new wlogger instance', () => {
uut = new Wlogger()
// console.log('uut: ', uut)
assert.property(uut, 'transport')
})
})
describe('#notifyRotation', () => {
it('should notify of a log rotation', () => {
uut.notifyRotation()
})
})
describe('#envronment', () => {
it('should write to console in non-test environment', () => {
uut.outputToConsole()
})
})
})
// import { assert } from 'chai';
// import { Wlogger } from '../../../src/adapters/wlogger.js';
// import sinon from 'sinon';
//
// let uut
// let sandbox
//
// describe('#wlogger', () => {
// beforeEach(() => {
// sandbox = sinon.createSandbox()
// })
//
// afterEach(() => {
// sandbox.restore()
//
// uut = new Wlogger()
// })
//
// describe('#constructor', () => {
// it('should create a new wlogger instance', () => {
// uut = new Wlogger()
// // console.log('uut: ', uut)
//
// assert.property(uut, 'transport')
// })
// })
//
// describe('#notifyRotation', () => {
// it('should notify of a log rotation', () => {
// uut.notifyRotation()
// })
// })
//
// describe('#envronment', () => {
// it('should write to console in non-test environment', () => {
// uut.outputToConsole()
// })
// })
// })
test/unit/controllers/controllers.unit.js
+2 -2
View File
@@ -4,9 +4,9 @@
// Public npm libraries
// const assert = require('chai').assert
const sinon = require('sinon')
import sinon from 'sinon'
const Controllers = require('../../../src/controllers')
import Controllers from '../../../src/controllers/index.js'
describe('#Controllers', () => {
let uut
test/unit/controllers/json-rpc/a10-rpc.unit.js
+11 -9
View File
@@ -3,19 +3,21 @@
*/
// Public npm libraries
const assert = require('chai').assert
const jsonrpc = require('jsonrpc-lite')
const sinon = require('sinon')
const { v4: uid } = require('uuid')
import { assert } from 'chai'
import jsonrpc from 'jsonrpc-lite'
import sinon from 'sinon'
import { v4 as uid } from 'uuid'
// Local libraries.
import JSONRPC from '../../../../src/controllers/json-rpc/index.js'
import adapters from '../../mocks/adapters/index.js'
import UseCasesMock from '../../mocks/use-cases/index.js'
// Set the environment variable to signal this is a test.
process.env.SVC_ENV = 'test'
// Local libraries.
const JSONRPC = require('../../../../src/controllers/json-rpc')
const adapters = require('../../mocks/adapters')
const UseCasesMock = require('../../mocks/use-cases')
describe('#JSON RPC', () => {
let uut
let sandbox
test/unit/controllers/json-rpc/a12-validators.unit.js
+10 -8
View File
@@ -5,18 +5,20 @@
*/
// Public npm libraries
const jsonrpc = require('jsonrpc-lite')
const sinon = require('sinon')
const assert = require('chai').assert
const { v4: uid } = require('uuid')
import jsonrpc from 'jsonrpc-lite'
import sinon from 'sinon'
import { assert } from 'chai'
import { v4 as uid } from 'uuid'
// Local libraries
import Validators from '../../../../src/controllers/json-rpc/validators.js'
import adapters from '../../mocks/adapters/index.js'
// Set the environment variable to signal this is a test.
process.env.SVC_ENV = 'test'
// Local libraries
const Validators = require('../../../../src/controllers/json-rpc/validators')
const adapters = require('../../mocks/adapters')
describe('#validators', () => {
let uut
let sandbox
test/unit/controllers/json-rpc/a14-rate-limits.js
+6 -5
View File
@@ -5,15 +5,16 @@
*/
// Public npm libraries
const sinon = require('sinon')
const assert = require('chai').assert
import sinon from 'sinon'
import { assert } from 'chai'
// Local libraries
import RateLimit from '../../../../src/controllers/json-rpc/rate-limit.js'
// Set the environment variable to signal this is a test.
process.env.SVC_ENV = 'test'
// Local libraries
const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
describe('#rate-limit', () => {
let uut
let sandbox
test/unit/controllers/json-rpc/about.json-rpc.controller.unit.js
+4 -3
View File
@@ -3,11 +3,12 @@
*/
// Public npm libraries
const sinon = require('sinon')
const assert = require('chai').assert
import sinon from 'sinon'
import { assert } from 'chai'
// Local libraries
const AboutRPC = require('../../../../src/controllers/json-rpc/about')
import AboutRPC from '../../../../src/controllers/json-rpc/about/index.js'
describe('#AboutRPC', () => {
let uut
test/unit/controllers/json-rpc/auth.json-rpc.controller.unit.js
+12 -10
View File
@@ -3,20 +3,22 @@
*/
// Public npm libraries
const jsonrpc = require('jsonrpc-lite')
const sinon = require('sinon')
const assert = require('chai').assert
const { v4: uid } = require('uuid')
import jsonrpc from 'jsonrpc-lite'
import sinon from 'sinon'
import { assert } from 'chai'
import { v4 as uid } from 'uuid'
// Local libraries
import AuthRPC from '../../../../src/controllers/json-rpc/auth/index.js'
import RateLimit from '../../../../src/controllers/json-rpc/rate-limit.js'
import adapters from '../../mocks/adapters/index.js'
import UseCasesMock from '../../mocks/use-cases/index.js'
// Set the environment variable to signal this is a test.
process.env.SVC_ENV = 'test'
// Local libraries
const AuthRPC = require('../../../../src/controllers/json-rpc/auth')
const RateLimit = require('../../../../src/controllers/json-rpc/rate-limit')
const adapters = require('../../mocks/adapters')
const UseCasesMock = require('../../mocks/use-cases')
describe('#AuthRPC', () => {
let uut
let sandbox
test/unit/controllers/json-rpc/users.json-rpc-controller.unit.js
+11 -9
View File
@@ -3,19 +3,21 @@
*/
// Public npm libraries
const jsonrpc = require('jsonrpc-lite')
const sinon = require('sinon')
const assert = require('chai').assert
const { v4: uid } = require('uuid')
import jsonrpc from 'jsonrpc-lite'
import sinon from 'sinon'
import { assert } from 'chai'
import { v4 as uid } from 'uuid'
// Local libraries
import UserRPC from '../../../../src/controllers/json-rpc/users/index.js'
import adapters from '../../mocks/adapters/index.js'
import UseCasesMock from '../../mocks/use-cases/index.js'
// Set the environment variable to signal this is a test.
process.env.SVC_ENV = 'test'
// Local libraries
const UserRPC = require('../../../../src/controllers/json-rpc/users')
const adapters = require('../../mocks/adapters')
const UseCasesMock = require('../../mocks/use-cases')
describe('#UserRPC', () => {
let uut
let sandbox
test/unit/controllers/rest-api/auth/auth.rest.controller.unit.js
+11 -7
View File
@@ -3,21 +3,25 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
const adapters = require('../../../mocks/adapters')
const UseCasesMock = require('../../../mocks/use-cases')
import adapters from '../../../mocks/adapters/index.js'
import UseCasesMock from '../../../mocks/use-cases/index.js'
// const app = require('../../../mocks/app-mock')
const AuthRESTController = require('../../../../../src/controllers/rest-api/auth/controller')
import AuthRESTController from '../../../../../src/controllers/rest-api/auth/controller.js'
import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
let uut
let sandbox
let ctx
const mockContext = require('../../../../unit/mocks/ctx-mock').context
describe('#Auth-REST-Router', () => {
// const testUser = {}
test/unit/controllers/rest-api/auth/auth.rest.router.unit.js
+9 -5
View File
@@ -3,15 +3,19 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
const adapters = require('../../../mocks/adapters')
const UseCasesMock = require('../../../mocks/use-cases')
import adapters from '../../../mocks/adapters/index.js'
import UseCasesMock from '../../../mocks/use-cases/index.js'
// const app = require('../../../mocks/app-mock')
const AuthRouter = require('../../../../../src/controllers/rest-api/auth')
import AuthRouter from '../../../../../src/controllers/rest-api/auth/index.js'
let uut
let sandbox
// let ctx
test/unit/controllers/rest-api/contact/contact.rest.controller.unit.js
+5 -5
View File
@@ -3,16 +3,16 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
const ContactController = require('../../../../../src/controllers/rest-api/contact/controller')
import sinon from 'sinon'
import ContactController from '../../../../../src/controllers/rest-api/contact/controller.js'
import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
let uut
let sandbox
let ctx
const mockContext = require('../../../../unit/mocks/ctx-mock').context
describe('Contact', () => {
before(async () => {
})
test/unit/controllers/rest-api/contact/contact.rest.router.unit.js
+9 -5
View File
@@ -3,15 +3,19 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
const adapters = require('../../../mocks/adapters')
const UseCasesMock = require('../../../mocks/use-cases')
import adapters from '../../../mocks/adapters/index.js'
import UseCasesMock from '../../../mocks/use-cases/index.js'
// const app = require('../../../mocks/app-mock')
const ContactRouter = require('../../../../../src/controllers/rest-api/contact')
import ContactRouter from '../../../../../src/controllers/rest-api/contact/index.js'
let uut
let sandbox
// let ctx
test/unit/controllers/rest-api/logs/logs.rest.controller.unit.js
+5 -5
View File
@@ -3,16 +3,16 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
const LogsApiController = require('../../../../../src/controllers/rest-api/logs/controller')
import sinon from 'sinon'
import LogsApiController from '../../../../../src/controllers/rest-api/logs/controller.js'
import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
let uut
let sandbox
let ctx
const mockContext = require('../../../../unit/mocks/ctx-mock').context
describe('Logapi', () => {
before(async () => {
})
test/unit/controllers/rest-api/logs/logs.rest.router.unit.js
+9 -5
View File
@@ -3,15 +3,19 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
const adapters = require('../../../mocks/adapters')
const UseCasesMock = require('../../../mocks/use-cases')
import adapters from '../../../mocks/adapters/index.js'
import UseCasesMock from '../../../mocks/use-cases/index.js'
// const app = require('../../../mocks/app-mock')
const LogsRouter = require('../../../../../src/controllers/rest-api/logs')
import LogsRouter from '../../../../../src/controllers/rest-api/logs/index.js'
let uut
let sandbox
// let ctx
test/unit/controllers/rest-api/rest.controller.unit.js
+8 -5
View File
@@ -3,14 +3,17 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local libraries
const RESTControllers = require('../../../../src/controllers/rest-api/')
import RESTControllers from '../../../../src/controllers/rest-api/index.js'
// const mockContext = require('../../../unit/mocks/ctx-mock').context
const adapters = require('../../mocks/adapters')
const UseCasesMock = require('../../mocks/use-cases')
import adapters from '../../mocks/adapters/index.js'
import UseCasesMock from '../../mocks/use-cases/index.js'
describe('#RESTControllers', () => {
let uut
test/unit/controllers/rest-api/users/users.rest.controller.unit.js
+8 -7
View File
@@ -3,20 +3,21 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
const adapters = require('../../../mocks/adapters')
const UseCasesMock = require('../../../mocks/use-cases')
import adapters from '../../../mocks/adapters/index.js'
const UserController = require('../../../../../src/controllers/rest-api/users/controller')
import UseCasesMock from '../../../mocks/use-cases/index.js'
import UserController from '../../../../../src/controllers/rest-api/users/controller.js'
import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
let uut
let sandbox
let ctx
const mockContext = require('../../../../unit/mocks/ctx-mock').context
describe('#Users-REST-Controller', () => {
// const testUser = {}
test/unit/controllers/rest-api/users/users.rest.router.unit.js
+9 -5
View File
@@ -3,15 +3,19 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
const adapters = require('../../../mocks/adapters')
const UseCasesMock = require('../../../mocks/use-cases')
import adapters from '../../../mocks/adapters/index.js'
import UseCasesMock from '../../../mocks/use-cases/index.js'
// const app = require('../../../mocks/app-mock')
const UserRouter = require('../../../../../src/controllers/rest-api/users')
import UserRouter from '../../../../../src/controllers/rest-api/users/index.js'
let uut
let sandbox
// let ctx
test/unit/entities/user.entity.unit.js
+3 -3
View File
@@ -2,10 +2,10 @@
Unit tests for the User entity library.
*/
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
const User = require('../../../src/entities/user')
import sinon from 'sinon'
import User from '../../../src/entities/user.js'
let sandbox
let uut
test/unit/misc/passport.unit.js
+78 -77
View File
@@ -1,77 +1,78 @@
/*
Unit tests for the passport library.
*/
// Public npm libraries
// const assert = require('chai').assert
const sinon = require('sinon')
// Local libraries
const User = require('../../../src/adapters/localdb/models/users')
const { passport, passportCallback } = require('../../../config/passport')
const adaptersMock = require('../mocks/adapters')
describe('#passport', () => {
let sandbox
let id
let done
beforeEach(() => {
sandbox = sinon.createSandbox()
id = 'abc123'
done = () => {}
})
afterEach(() => sandbox.restore())
describe('#serializeUser', () => {
it('should serialize a user', () => {
const user = {
id: 'abc123'
}
const done = () => {}
passport.serializeUser(user, done)
})
})
describe('#deserializeUser', () => {
it('should deserialize a user', () => {
// Mock Users model.
sandbox.stub(User, 'findById').resolves({ id })
passport.deserializeUser(id, done)
})
it('should catch and handle errors', () => {
// Force an error
sandbox.stub(User, 'findById').rejects(new Error('test error'))
passport.deserializeUser(id, done)
})
})
describe('#passportCallback', () => {
it('should return if user is found', () => {
// Mock Users model.
sandbox.stub(User, 'findOne').resolves({ id })
passportCallback(id, 'password', done)
})
it('should return if password is validated', () => {
// Mock Users model.
sandbox.stub(User, 'findOne').resolves(new adaptersMock.localdb.Users())
passportCallback(id, 'password', done)
})
it('should catch a high-level error', () => {
// Force an error
sandbox.stub(User, 'findOne').rejects(new Error('test error'))
passportCallback(id, 'password', done)
})
})
})
// /*
// Unit tests for the passport library.
// */
//
// // Public npm libraries
// // const assert = require('chai').assert
// import sinon from 'sinon';
//
// // Local libraries
// import User from '../../../src/adapters/localdb/models/users.js';
//
// import { passport, passportCallback } from '../../../config/passport.js';
// import adaptersMock from '../mocks/adapters/index.js';
//
// describe('#passport', () => {
// let sandbox
// let id
// let done
//
// beforeEach(() => {
// sandbox = sinon.createSandbox()
//
// id = 'abc123'
// done = () => {}
// })
//
// afterEach(() => sandbox.restore())
//
// describe('#serializeUser', () => {
// it('should serialize a user', () => {
// const user = {
// id: 'abc123'
// }
// const done = () => {}
//
// passport.serializeUser(user, done)
// })
// })
//
// describe('#deserializeUser', () => {
// it('should deserialize a user', () => {
// // Mock Users model.
// sandbox.stub(User, 'findById').resolves({ id })
//
// passport.deserializeUser(id, done)
// })
//
// it('should catch and handle errors', () => {
// // Force an error
// sandbox.stub(User, 'findById').rejects(new Error('test error'))
//
// passport.deserializeUser(id, done)
// })
// })
//
// describe('#passportCallback', () => {
// it('should return if user is found', () => {
// // Mock Users model.
// sandbox.stub(User, 'findOne').resolves({ id })
//
// passportCallback(id, 'password', done)
// })
//
// it('should return if password is validated', () => {
// // Mock Users model.
// sandbox.stub(User, 'findOne').resolves(new adaptersMock.localdb.Users())
//
// passportCallback(id, 'password', done)
// })
//
// it('should catch a high-level error', () => {
// // Force an error
// sandbox.stub(User, 'findOne').rejects(new Error('test error'))
//
// passportCallback(id, 'password', done)
// })
// })
// })
test/unit/misc/server-unit.js
+4 -3
View File
@@ -3,11 +3,12 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local libraries
const Server = require('../../../bin/server')
import Server from '../../../bin/server.js'
describe('#server', () => {
let uut, sandbox
test/unit/mocks/adapters/index.js
+1 -1
View File
@@ -66,4 +66,4 @@ const localdb = {
}
}
module.exports = { ipfs, localdb }
export default { ipfs, localdb };
test/unit/mocks/app-mock.js
+1 -1
View File
@@ -6,4 +6,4 @@ const app = {
use: () => {}
}
module.exports = app
export default app;
test/unit/mocks/ctx-mock.js
+5 -4
View File
@@ -12,8 +12,9 @@
// const ctx = mockContext()
// ...
const Stream = require('stream')
const Koa = require('koa')
import Stream from 'stream';
import Koa from 'koa';
const context = (req, res, app) => {
const socket = new Stream.Duplex()
@@ -43,8 +44,8 @@ const request = (req, res, app) => context(req, res, app).request
const response = (req, res, app) => context(req, res, app).response
module.exports = {
export {
context,
request,
response
}
};
test/unit/mocks/ipfs-coord-mock.js
+1 -1
View File
@@ -12,4 +12,4 @@ class IPFSCoord {
async subscribeToChat() {}
}
module.exports = IPFSCoord
export default IPFSCoord;
test/unit/mocks/ipfs-mock.js
+15 -9
View File
@@ -2,20 +2,26 @@
Mocks for the js-ipfs
*/
class IPFS {
constructor () {
this.ipfs = {}
}
// class IPFS {
// constructor () {
// this.ipfs = {}
// }
//
// static create () {
// const mockIpfs = new MockIpfsInstance()
//
// return mockIpfs
// }
//
// async start () {}
// }
static create () {
function create () {
const mockIpfs = new MockIpfsInstance()
return mockIpfs
}
async start () {}
}
class MockIpfsInstance {
constructor () {
this.config = {
@@ -28,4 +34,4 @@ class MockIpfsInstance {
stop () {}
}
module.exports = IPFS
export default create;
test/unit/mocks/log-api-mock.js
+3 -2
View File
@@ -23,6 +23,7 @@ const data = [
timestamp: '2020-11-14T12:15:55.231Z'
}
]
module.exports = {
export default {
data
}
};
test/unit/mocks/use-cases/index.js
+1 -1
View File
@@ -39,4 +39,4 @@ class UseCasesMock {
user = new UserUseCaseMock()
}
module.exports = UseCasesMock
export default UseCasesMock;
test/unit/use-cases/index.use-case.unit.js
+6 -4
View File
@@ -3,15 +3,17 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
// const testUtils = require('../../utils/test-utils')
// Unit under test (uut)
const UseCases = require('../../../src/use-cases')
const adapters = require('../mocks/adapters')
import UseCases from '../../../src/use-cases/index.js'
import adapters from '../mocks/adapters/index.js'
describe('#use-cases', () => {
let uut
test/unit/use-cases/users.use-case.unit.js
+6 -4
View File
@@ -5,15 +5,17 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import { assert } from 'chai'
import sinon from 'sinon'
// Local support libraries
// const testUtils = require('../../utils/test-utils')
// Unit under test (uut)
const UserLib = require('../../../src/use-cases/user')
const adapters = require('../mocks/adapters')
import UserLib from '../../../src/use-cases/user.js'
import adapters from '../mocks/adapters/index.js'
describe('#users-use-case', () => {
let uut
test/utils/test-utils.js
+7 -5
View File
@@ -3,12 +3,14 @@
*/
// Public NPM libraries
const mongoose = require('mongoose')
const axios = require('axios').default
import mongoose from 'mongoose'
import axios from 'axios'
// Local libraries
const config = require('../../config')
const User = require('../../src/adapters/localdb/models/users')
import config from '../../config/index.js'
import User from '../../src/adapters/localdb/models/users.js'
const LOCALHOST = `http://localhost:${config.port}`
@@ -160,7 +162,7 @@ async function getAdminJWT () {
}
}
module.exports = {
export default {
cleanDb,
createUser,
loginTestUser,
util/users/createUsers.js
+3 -4
View File
@@ -1,6 +1,5 @@
const mongoose = require('mongoose')
const config = require('../../config')
import mongoose from 'mongoose'
import config from '../../config/index.js'
const EMAIL = 'test@test.com'
const PASSWORD = 'pass'
@@ -34,6 +33,6 @@ async function addUser () {
}
addUser()
module.exports = {
export default {
addUser
}
util/users/delete-all-test-users.js
+3 -3
View File
@@ -1,12 +1,12 @@
const mongoose = require('mongoose')
import mongoose from 'mongoose'
// Force test environment
// make sure environment variable is set before this file gets called.
// see test script in package.json.
// process.env.KOA_ENV = 'test'
const config = require('../../config')
import config from '../../config/index.js'
const User = require('../../src/models/users')
import User from '../../src/models/users/js'
async function deleteUsers () {
// Connect to the Mongo Database.
util/users/getUsers.js
+3 -5
View File
@@ -1,8 +1,6 @@
const mongoose = require('mongoose')
const config = require('../../config')
const User = require('../../src/models/users')
import mongoose from 'mongoose'
import config from '../../config/index.js'
import User from '../../src/models/users.js'
async function getUsers () {
// Connect to the Mongo Database.
util/wipe-test-db.js
+2 -2
View File
@@ -4,11 +4,11 @@
'use strict'
const mongoose = require('mongoose')
import mongoose from 'mongoose'
import config from '../config/index.js'
// Force test environment
process.env.KOA_ENV = 'test'
const config = require('../config')
async function cleanDb () {
// Connect to the Mongo Database.