Fix registry auth

lib/docker.js

@@ -40,7 +40,7 @@ class DockerClient {
 
     options = options || {};
 
-    return self._validate(options, schemas.auth.options).then((params) => {
+    return self._validate(options, schemas.auth).then((params) => {
       return self.modem.post({
         url: '/auth',
         body: params,

lib/endpoints/containers.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const schemas = require('../schemas/containers');
-const auth    = require('../helpers/auth');
 
 class ContainersClient {
 
@@ -29,7 +28,7 @@ class ContainersClient {
     });
   }
 
-  create(model, options, auth) {
+  create(model, options) {
     const self = this;
 
     options = options || {};
@@ -52,12 +51,6 @@ class ContainersClient {
         }
       };
 
-      if(auth) {
-        requestOptions.headers = {
-          'X-Registry-Auth': auth.generate(auth)
-        };
-      }
-
       return this.docker.modem.post(requestOptions);
     });
   }
@@ -320,12 +313,6 @@ class ContainersClient {
         }
       };
 
-      if(auth) {
-        requestOptions.headers = {
-          'X-Registry-Auth': auth.generate(auth)
-        };
-      }
-
       return self.docker.modem.post(requestOptions);
     });
   }

lib/endpoints/images.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const schemas = require('../schemas/images');
+const auth    = require('../helpers/auth');
 
 class ImagesClient {
 
@@ -41,7 +42,7 @@ class ImagesClient {
         qs: params,
         headers: {
           'Content-type': 'application/tar',
-          'X-Registry-Auth': JSON.stringify(registryAuth)
+          'X-Registry-Auth': auth.generate(registryAuth)
         },
         successCodes: {
           200: 'No Error'
@@ -65,7 +66,7 @@ class ImagesClient {
         url: '/images/create',
         qs: params,
         headers: {
-          'X-Registry-Auth': JSON.stringify(registryAuth)
+          'X-Registry-Auth': auth.generate(registryAuth)
         },
         successCodes: {
           200: 'No Error'
@@ -129,7 +130,7 @@ class ImagesClient {
         url: `/images/${name}/push`,
         qs: params,
         headers: {
-          'X-Registry-Auth': JSON.stringify(registryAuth)
+          'X-Registry-Auth': auth.generate(registryAuth)
         },
         successCodes: {
           200: 'No Error'

lib/schemas/system.js

@@ -2,15 +2,13 @@
 
 const Joi = require('joi');
 
-module.exports.auth = {
-  options: Joi.object().keys({
-    username: Joi.string().optional(),
-    password: Joi.string().optional(),
-    email: Joi.string().email().optional(),
-    serveraddress: Joi.string().uri().optional(),
-    identitytoken: Joi.string().optional()
-  })
-};
+module.exports.auth = Joi.object().keys({
+  username: Joi.string().optional(),
+  password: Joi.string().optional(),
+  email: Joi.string().email().optional(),
+  serveraddress: Joi.string().uri({ allowRelative: true }).optional(),
+  identitytoken: Joi.string().optional()
+});
 
 module.exports.events = {
   options: Joi.object().keys({

test/images/inspect.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const Code    = require('code');
 const Lab     = require('lab');
 const harness = require('../harness');
 
@@ -13,9 +14,14 @@ lab.experiment('images - inspect', () => {
       .get('/images/hello-world/json')
       .reply(200, {});
 
-    const req = harness.client.images().inspect('hello-world');
-
-    harness.handleSuccess(scope, 200, req, done);
+    harness.client.images().inspect('hello-world').then(() => {
+      Code.expect(scope.isDone()).to.equal(true);
+    }, () => {
+      Code.fail('should be a 200 response');
+    }).finally(() => {
+      harness.clean();
+      done();
+    });
 
   });
 

test/images/list.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const Code    = require('code');
 const Lab     = require('lab');
 const harness = require('../harness');
 
@@ -11,11 +12,17 @@ lab.experiment('images - list', () => {
 
     const scope = harness.mock()
       .get('/images/json')
+      .query({all: false, digest: false})
       .reply(200, {});
 
-    const req = harness.client.images().list();
-
-    harness.handleSuccess(scope, 200, req, done);
+    harness.client.images().list().then(() => {
+      Code.expect(scope.isDone()).to.equal(true);
+    }, () => {
+      Code.fail('should be a 200 response');
+    }).finally(() => {
+      harness.clean();
+      done();
+    });
 
   });
 

test/images/search.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const Code    = require('code');
 const Lab     = require('lab');
 const harness = require('../harness');
 
@@ -11,15 +12,18 @@ lab.experiment('images - search', () => {
 
     const scope = harness.mock()
       .get('/images/search')
-      .query({ term: 'hello-world' })
+      .query({term: 'hello-world'})
       .reply(200, {});
 
-    const req = harness.client.images().search({
-      term: 'hello-world'
+    harness.client.images().search({term: 'hello-world'}).then(() => {
+      Code.expect(scope.isDone()).to.equal(true);
+    }, () => {
+      Code.fail('should be a 200 response');
+    }).finally(() => {
+      harness.clean();
+      done();
     });
 
-    harness.handleSuccess(scope, 200, req, done);
-
   });
 
 });