gina 0.1.1-alpha.144 → 0.1.1-alpha.146

package/README.md

@@ -401,6 +401,8 @@ Do not panic, and follow the steps provided in the following section.
 This is __important__ and you will have to take additional steps to make your certificate fully valid __while developping on your `local/dev host`__.
 Since in most cases you will not have the `Root Certificate` included in your certificate, you need to generate a correct certificate including the Root Certificate. __For production, it will not be a problem__ since the Root certificate is provided by the client browser.
 
+__Attention:__ We are assuming that for the following example, you have a wildcard certificate. If this is not possible, you will have to generate a certificate for each bundle and treat each bundle like a subdomain.
+
 Let say that you have downloaded your certificates from __[Ssl For Free](https://sslforfree.com)__ which you have then placed under: `~/.gina/certificates/scopes/local/myproject.domain`.
 
 __Step 1__

package/framework/v0.1.1-alpha.146/VERSION

@@ -0,0 +1 @@
+0.1.1-alpha.146

package/framework/{v0.1.1-alpha.144 → v0.1.1-alpha.146}/core/controller/controller.js

@@ -2330,15 +2330,6 @@ function SuperController(options) {
         }
 
 
-
-        // if (arguments.length <3) {
-        //     if ( typeof(data) == 'function') {
-        //         var callback = data;
-        //         var data = undefined;
-        //     } else {
-        //         callback = undefined;
-        //     }
-        // }
         if ( typeof(data) != 'undefined' &&  data.count() > 0) {
 
             queryData = '?';
@@ -2423,6 +2414,10 @@ function SuperController(options) {
         protocol    = protocol.match(/[.a-z 0-9]+/ig)[0];
         scheme      = options.scheme || ctx.gina.config.envConf[ctx.bundle][ctx.env].server.scheme;// bundle servers's scheme by default
         scheme      = scheme.match(/[a-z 0-9]+/ig)[0];
+        // retrieve credentials
+        if ( typeof(options.ca) == 'undefined' || ! options.ca ) {
+            options.ca  = ctx.gina.config.envConf[ctx.bundle][ctx.env].server.credentials.ca;
+        }
 
         //retrieving dynamic host, hostname & port
         if ( /\@/.test(options.hostname) ) {
@@ -2436,6 +2431,12 @@ function SuperController(options) {
 
             options.protocol    = ctx.gina.config.envConf[bundle][ctx.env].server.protocol;
             options.scheme      = ctx.gina.config.envConf[bundle][ctx.env].server.scheme;
+
+            // retrieve credentials
+            if ( typeof(options.ca) == 'undefined' || ! options.ca ) {
+                options.ca = ctx.gina.config.envConf[bundle][ctx.env].server.credentials.ca;
+            }
+
             // might be != from the bundle requesting
             //options.protocol    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.protocol || ctx.gina.config.envConf[bundle][ctx.env].server.protocol;
             //options.scheme    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.scheme || ctx.gina.config.envConf[bundle][ctx.env].server.scheme;
@@ -2449,6 +2450,8 @@ function SuperController(options) {
         }
 
 
+
+
         // reformating scheme
         if( !/\:$/.test(options.scheme) )
             options.scheme += ':';

package/framework/{v0.1.1-alpha.144 → v0.1.1-alpha.146}/lib/cmd/helper.js

@@ -1083,7 +1083,7 @@ function CmdHelper(cmd, client, debug) {
                     let scheme = allProjectSchemes[s];
                     // skipping none `https` schemes for `http/2`
                     if ( /^http\/2/.test(protocol) && scheme != 'https' ) {
-                        console.debug('skipping none `https` schemes for `http/2`');
+                        // console.debug('skipping none `https` schemes for `http/2`');
                         continue;
                     }
                     if ( typeof(ports[protocol][scheme]) == 'undefined' ) {