Moved all services to its own service-directory

Author: megoth

lib/create-app.js

@@ -12,8 +12,8 @@ const authProxy = require('./handlers/auth-proxy')
 const SolidHost = require('./models/solid-host')
 const AccountManager = require('./models/account-manager')
 const vhost = require('vhost')
-const EmailService = require('./models/email-service')
-const TokenService = require('./models/token-service')
+const EmailService = require('./services/email-service')
+const TokenService = require('./services/token-service')
 const capabilityDiscovery = require('./capability-discovery')
 const API = require('./api')
 const errorPages = require('./handlers/error-pages')

lib/requests/create-account-request.js

@@ -3,7 +3,7 @@
 const AuthRequest = require('./auth-request')
 const WebIdTlsCertificate = require('../models/webid-tls-certificate')
 const debug = require('../debug').accounts
-const blacklistService = require('../common/blacklist-service')
+const blacklistService = require('../services/blacklist-service')
 
 /**
  * Represents a 'create new user account' http request (either a POST to the

lib/common/blacklist-service.js renamed to lib/services/blacklist-service.js

@@ -2,7 +2,7 @@
 
 const nodemailer = require('nodemailer')
 const path = require('path')
-const debug = require('./../debug').email
+const debug = require('../debug').email
 
 /**
  * Models a Nodemailer-based email sending service.

lib/models/email-service.js renamed to lib/services/email-service.js

@@ -15,7 +15,7 @@ const LDP = require('../../lib/ldp')
 const SolidHost = require('../../lib/models/solid-host')
 const AccountManager = require('../../lib/models/account-manager')
 const UserAccount = require('../../lib/models/user-account')
-const TokenService = require('../../lib/models/token-service')
+const TokenService = require('../../lib/services/token-service')
 const WebIdTlsCertificate = require('../../lib/models/webid-tls-certificate')
 
 const testAccountsDir = path.join(__dirname, '../resources/accounts')

lib/models/token-service.js renamed to lib/services/token-service.js

@@ -4,7 +4,7 @@ const chai = require('chai')
 const expect = chai.expect
 
 const blacklist = require('the-big-username-blacklist').list
-const blacklistService = require('../../lib/common/blacklist-service')
+const blacklistService = require('../../lib/services/blacklist-service')
 
 describe('BlacklistService', () => {
   afterEach(() => blacklistService.reset())

test/unit/account-manager-test.js

@@ -14,7 +14,7 @@ const AccountManager = require('../../lib/models/account-manager')
 const SolidHost = require('../../lib/models/solid-host')
 const defaults = require('../../config/defaults')
 const { CreateAccountRequest } = require('../../lib/requests/create-account-request')
-const blacklistService = require('../../lib/common/blacklist-service')
+const blacklistService = require('../../lib/services/blacklist-service')
 
 describe('CreateAccountRequest', () => {
   let host, store, accountManager

test/unit/blacklist-service-test.js

@@ -1,4 +1,4 @@
-const EmailService = require('../../lib/models/email-service')
+const EmailService = require('../../lib/services/email-service')
 const path = require('path')
 const sinon = require('sinon')
 const chai = require('chai')

test/unit/create-account-request-test.js

@@ -10,7 +10,7 @@ chai.should()
 
 const SolidHost = require('../../lib/models/solid-host')
 const AccountManager = require('../../lib/models/account-manager')
-const EmailService = require('../../lib/models/email-service')
+const EmailService = require('../../lib/services/email-service')
 
 const templatePath = path.join(__dirname, '../../default-templates/emails')