Now all files are dependent upon config directory and not reading from .env file

Author: thetutlage

providers/EncryptionProvider.js

@@ -13,8 +13,8 @@ class EncryptionProvider extends ServiceProvider {
   * register () {
     this.app.singleton('Adonis/Src/Encryption', function (app) {
       const Encryption = require('../src/Encryption')
-      const Env = app.use('Adonis/Src/Env')
-      return new Encryption(Env)
+      const Config = app.use('Adonis/Src/Config')
+      return new Encryption(Config)
     })
   }
 }

providers/ResponseProvider.js

@@ -14,8 +14,9 @@ class ResponseProvider extends ServiceProvider {
     this.app.singleton('Adonis/Src/Response', function (app) {
       const View = app.use('Adonis/Src/View')
       const Route = app.use('Adonis/Src/Route')
+      const Config = app.use('Adonis/Src/Config')
       const Response = require('../src/Response')
-      return new Response(View, Route)
+      return new Response(View, Route, Config)
     })
   }
 }

providers/StaticProvider.js

@@ -13,8 +13,9 @@ class StaticProvider extends ServiceProvider {
   * register () {
     this.app.bind('Adonis/Src/Static', function (app) {
       const Helpers = app.use('Adonis/Src/Helpers')
+      const Config = app.use('Adonis/Src/Config')
       const Static = require('../src/Static')
-      return new Static(Helpers)
+      return new Static(Helpers, Config)
     })
   }
 }

providers/ViewProvider.js

@@ -13,10 +13,10 @@ class ViewProvider extends ServiceProvider {
   * register () {
     this.app.singleton('Adonis/Src/View', function (app) {
       const Helpers = app.use('Adonis/Src/Helpers')
-      const Env = app.use('Adonis/Src/Env')
+      const Config = app.use('Adonis/Src/Config')
       const Route = app.use('Adonis/Src/Route')
       const View = require('../src/View')
-      return new View(Helpers, Env, Route)
+      return new View(Helpers, Config, Route)
     })
   }
 }

src/Encryption/index.js

@@ -10,16 +10,16 @@ const crypto = require('crypto')
 
 class Encryption {
 
-  constructor (Env) {
-    this.appKey = Env.get('APP_KEY')
-    this.algorithm = Env.get('ENCRYPTION', 'aes-256-cbc')
+  constructor (Config) {
+    this.appKey = Config.get('app.appKey')
+    this.algorithm = Config.get('app.encryption.algorithm', 'aes-256-cbc')
 
     /**
      * throwing error when APP_KEY is not defined as encryption
      * does not make sense without a key
      */
     if (!this.appKey) {
-      throw new Error('Encryption cannot work without APP_KEY')
+      throw new Error('Encryption cannot work without application key. Define appKey inside app config')
     }
   }
 

src/Request/index.js

@@ -32,7 +32,7 @@ class Request {
      * secret to parse and decrypt cookies
      * @type {String}
      */
-    this.secret = process.env.APP_KEY
+    this.secret = this.config.get('app.appKey')
 
     /**
      * holding references to cookies once they
@@ -171,7 +171,7 @@ class Request {
    * @public
    */
   ip () {
-    return nodeReq.ip(this.request, this.config.get('http.trustProxy'))
+    return nodeReq.ip(this.request, this.config.get('app.http.trustProxy'))
   }
 
   /**
@@ -182,7 +182,7 @@ class Request {
    * @public
    */
   ips () {
-    return nodeReq.ips(this.request, this.config.get('http.trustProxy'))
+    return nodeReq.ips(this.request, this.config.get('app.http.trustProxy'))
   }
 
   /**
@@ -203,7 +203,7 @@ class Request {
    * @public
    */
   subdomains () {
-    return nodeReq.subdomains(this.request, this.config.get('http.trustProxy'), this.config.get('http.subdomainOffset'))
+    return nodeReq.subdomains(this.request, this.config.get('app.http.trustProxy'), this.config.get('app.http.subdomainOffset'))
   }
 
   /**
@@ -234,7 +234,7 @@ class Request {
    * @public
    */
   hostname () {
-    return nodeReq.hostname(this.request, this.config.get('http.trustProxy'))
+    return nodeReq.hostname(this.request, this.config.get('app.http.trustProxy'))
   }
 
   /**

src/Response/index.js

@@ -10,6 +10,7 @@ const nodeRes = require('node-res')
 const nodeCookie = require('node-cookie')
 let viewInstance = null
 let routeInstance = null
+let configInstance = null
 
 /**
  * @class  Response class to be passed on
@@ -20,6 +21,9 @@ class Response {
   constructor (request, response) {
     this.request = request
     this.response = response
+    if (configInstance.get('app.http.setPoweredBy', true)) {
+      nodeRes.header(this.response, 'x-powered-by', 'adonis')
+    }
   }
 
   /**
@@ -112,7 +116,7 @@ class Response {
    * @public
    */
   jsonp (body) {
-    const callback = this.request.input('callback')
+    const callback = this.request.input('callback') || configInstance.get('app.http.jsonpCallback')
     nodeRes.jsonp(this.request, this.response, body, callback)
   }
 
@@ -198,7 +202,7 @@ class Response {
    * @public
    */
   cookie (key, value, options) {
-    const secret = process.env.APP_KEY
+    const secret = configInstance.get('app.appKey')
     const encrypt = !!secret
     nodeCookie.create(this.request.request, this.response, key, value, options, secret, encrypt)
     return this
@@ -224,9 +228,10 @@ class Response {
  * view instance.
  */
 class ResponseBuilder {
-  constructor (View, Route) {
+  constructor (View, Route, Config) {
     viewInstance = View
     routeInstance = Route
+    configInstance = Config
     return Response
   }
 }

src/Server/index.js

@@ -69,6 +69,15 @@ class Server {
     const session = new this.Session(req, res)
     const requestUrl = request.url()
     request.session = session
+
+    /**
+     * making request verb/method based upon _method or falling
+     * back to original method
+     * @type {String}
+     */
+    const method = request.input('_method', request.method())
+    const resolvedRoute = this.Route.resolve(requestUrl, method, request.hostname())
+    request._params = resolvedRoute.params
     this.log.verbose('request on url %s ', req.url)
 
     /**
@@ -78,14 +87,6 @@ class Server {
      * @return {Function}
      */
     const finalHandler = function * () {
-      /**
-       * making request verb/method based upon _method or falling
-       * back to original method
-       * @type {String}
-       */
-      const method = request.input('_method', request.method())
-      const resolvedRoute = self.Route.resolve(requestUrl, method, request.hostname())
-      request._params = resolvedRoute.params
       self._finalHandler(resolvedRoute, request, response)
     }
     helpers.respondRequest(this.middleware, request, response, finalHandler)

src/Session/SessionManager/index.js

@@ -25,7 +25,7 @@ class SessionManager {
    * @private
    */
   _getSessionCookie () {
-    const secret = process.env.APP_KEY
+    const secret = this.constructor.config.get('app.appKey')
     const decrypt = !!secret
     return nodeCookie.parse(this.request, secret, decrypt)[this.constructor.options.cookie]
   }
@@ -37,7 +37,7 @@ class SessionManager {
    * @private
    */
   _setSessionCookie (session) {
-    const secret = process.env.APP_KEY
+    const secret = this.constructor.config.get('app.appKey')
     const encrypt = !!secret
 
     /**

src/Session/index.js

@@ -74,6 +74,7 @@ class Session {
     }
     SessionManager.driver = driverInstance
     SessionManager.options = sessionOptions
+    SessionManager.config = Config
     return SessionManager
   }