diff --git a/ui/tests/acceptance/auth-test.js b/ui/tests/acceptance/auth-test.js
index 49fb75cf9ffc..5606832e1a5e 100644
--- a/ui/tests/acceptance/auth-test.js
+++ b/ui/tests/acceptance/auth-test.js
@@ -21,7 +21,7 @@ test('auth query params', function(assert) {
const backends = supportedAuthBackends();
visit('/vault/auth');
andThen(() => {
- assert.equal(currentURL(), '/vault/auth');
+ assert.equal(currentURL(), '/vault/auth?with=token');
});
backends.reverse().forEach(backend => {
click(`[data-test-auth-method-link="${backend.type}"]`);
@@ -38,7 +38,7 @@ test('auth query params', function(assert) {
test('it clears token when changing selected auth method', function(assert) {
visit('/vault/auth');
andThen(() => {
- assert.equal(currentURL(), '/vault/auth');
+ assert.equal(currentURL(), '/vault/auth?with=token');
});
component.token('token').tabs.filterBy('name', 'GitHub')[0].link();
component.tabs.filterBy('name', 'Token')[0].link();
diff --git a/ui/tests/integration/components/auth-form-test.js b/ui/tests/integration/components/auth-form-test.js
index 8bf7acc02ce9..111787da335f 100644
--- a/ui/tests/integration/components/auth-form-test.js
+++ b/ui/tests/integration/components/auth-form-test.js
@@ -1,13 +1,15 @@
import { moduleForComponent, test } from 'ember-qunit';
+import { supportedAuthBackends } from 'vault/helpers/supported-auth-backends';
import Ember from 'ember';
import wait from 'ember-test-helpers/wait';
import hbs from 'htmlbars-inline-precompile';
-
+import sinon from 'sinon';
import Pretender from 'pretender';
import { create } from 'ember-cli-page-object';
import authForm from '../../pages/components/auth-form';
const component = create(authForm);
+const BACKENDS = supportedAuthBackends();
const authService = Ember.Service.extend({
authenticate() {
@@ -15,11 +17,28 @@ const authService = Ember.Service.extend({
},
});
+const workingAuthService = Ember.Service.extend({
+ authenticate() {
+ return Ember.RSVP.resolve({});
+ },
+ setLastFetch() {},
+});
+
+const routerService = Ember.Service.extend({
+ transitionTo() {
+ return Ember.RSVP.resolve();
+ },
+ replaceWith() {
+ return Ember.RSVP.resolve();
+ },
+});
moduleForComponent('auth-form', 'Integration | Component | auth form', {
integration: true,
beforeEach() {
Ember.getOwner(this).lookup('service:csp-event').attach();
component.setContext(this);
+ this.register('service:router', routerService);
+ this.inject.service('router');
},
afterEach() {
@@ -33,7 +52,8 @@ test('it renders error on CSP violation', function(assert) {
this.register('service:auth', authService);
this.inject.service('auth');
this.set('cluster', Ember.Object.create({ standby: true }));
- this.render(hbs`{{auth-form cluster=cluster}}`);
+ this.set('selectedAuth', 'token');
+ this.render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
assert.equal(component.errorText, '');
component.login();
// because this is an ember-concurrency backed service,
@@ -58,7 +78,8 @@ test('it renders with vault style errors', function(assert) {
});
this.set('cluster', Ember.Object.create({}));
- this.render(hbs`{{auth-form cluster=cluster}}`);
+ this.set('selectedAuth', 'token');
+ this.render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
return component.login().then(() => {
assert.equal(component.errorText, 'Error Authentication failed: Not allowed');
server.shutdown();
@@ -73,9 +94,113 @@ test('it renders AdapterError style errors', function(assert) {
});
this.set('cluster', Ember.Object.create({}));
- this.render(hbs`{{auth-form cluster=cluster}}`);
+ this.set('selectedAuth', 'token');
+ this.render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
return component.login().then(() => {
assert.equal(component.errorText, 'Error Authentication failed: Bad Request');
server.shutdown();
});
});
+
+test('it renders all the supported tabs when no methods are passed', function(assert) {
+ this.render(hbs`{{auth-form cluster=cluster}}`);
+ assert.equal(component.tabs.length, BACKENDS.length, 'renders a tab for every backend');
+});
+
+test('it renders all the supported methods and Other tab when methods are present', function(assert) {
+ let methods = [
+ {
+ type: 'userpass',
+ id: 'foo',
+ path: 'foo/',
+ },
+ {
+ type: 'approle',
+ id: 'approle',
+ path: 'approle/',
+ },
+ ];
+ this.set('methods', methods);
+
+ this.render(hbs`{{auth-form cluster=cluster methods=methods}}`);
+ assert.equal(component.tabs.length, 2, 'renders a tab for userpass and Other');
+ assert.equal(component.tabs.objectAt(0).name, 'foo', 'uses the path in the label');
+ assert.equal(component.tabs.objectAt(1).name, 'Other', 'second tab is the Other tab');
+});
+
+test('it renders all the supported methods when no supported methods are present in passed methods', function(
+ assert
+) {
+ let methods = [
+ {
+ type: 'approle',
+ id: 'approle',
+ path: 'approle/',
+ },
+ ];
+ this.set('methods', methods);
+ this.render(hbs`{{auth-form cluster=cluster methods=methods}}`);
+ assert.equal(component.tabs.length, BACKENDS.length, 'renders a tab for every backend');
+});
+
+test('it makes a request to unwrap if passed a wrappedToken and logs in', function(assert) {
+ this.register('service:auth', workingAuthService);
+ this.inject.service('auth');
+ let authSpy = sinon.spy(this.get('auth'), 'authenticate');
+ let server = new Pretender(function() {
+ this.post('/v1/sys/wrapping/unwrap', () => {
+ return [
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({
+ auth: {
+ client_token: '12345',
+ },
+ }),
+ ];
+ });
+ });
+
+ let wrappedToken = '54321';
+ this.set('wrappedToken', wrappedToken);
+ this.render(hbs`{{auth-form cluster=cluster wrappedToken=wrappedToken}}`);
+ Ember.run.later(() => Ember.run.cancelTimers(), 50);
+ return wait().then(() => {
+ assert.equal(server.handledRequests[0].url, '/v1/sys/wrapping/unwrap', 'makes call to unwrap the token');
+ assert.equal(
+ server.handledRequests[0].requestHeaders['X-Vault-Token'],
+ wrappedToken,
+ 'uses passed wrapped token for the unwrap'
+ );
+ assert.ok(authSpy.calledOnce, 'a call to authenticate was made');
+ server.shutdown();
+ authSpy.restore();
+ });
+});
+
+test('it shows an error if unwrap errors', function(assert) {
+ let server = new Pretender(function() {
+ this.post('/v1/sys/wrapping/unwrap', () => {
+ return [
+ 400,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({
+ errors: ['There was an error unwrapping!'],
+ }),
+ ];
+ });
+ });
+
+ this.set('wrappedToken', '54321');
+ this.render(hbs`{{auth-form cluster=cluster wrappedToken=wrappedToken}}`);
+ Ember.run.later(() => Ember.run.cancelTimers(), 50);
+
+ return wait().then(() => {
+ assert.equal(
+ component.errorText,
+ 'Error Token unwrap failed: There was an error unwrapping!',
+ 'shows the error'
+ );
+ server.shutdown();
+ });
+});
diff --git a/ui/tests/unit/adapters/tools-test.js b/ui/tests/unit/adapters/tools-test.js
index 115a1b487fe4..2d5f1277f66d 100644
--- a/ui/tests/unit/adapters/tools-test.js
+++ b/ui/tests/unit/adapters/tools-test.js
@@ -14,27 +14,28 @@ test('wrapping api urls', function(assert) {
},
});
+ let clientToken;
let data = { foo: 'bar' };
adapter.toolAction('wrap', data, { wrapTTL: '30m' });
assert.equal('/v1/sys/wrapping/wrap', url, 'wrapping:wrap url OK');
assert.equal('POST', method, 'wrapping:wrap method OK');
- assert.deepEqual({ data: data, wrapTTL: '30m' }, options, 'wrapping:wrap options OK');
+ assert.deepEqual({ data: data, wrapTTL: '30m', clientToken }, options, 'wrapping:wrap options OK');
data = { token: 'token' };
adapter.toolAction('lookup', data);
assert.equal('/v1/sys/wrapping/lookup', url, 'wrapping:lookup url OK');
assert.equal('POST', method, 'wrapping:lookup method OK');
- assert.deepEqual({ data }, options, 'wrapping:lookup options OK');
+ assert.deepEqual({ data, clientToken }, options, 'wrapping:lookup options OK');
adapter.toolAction('unwrap', data);
assert.equal('/v1/sys/wrapping/unwrap', url, 'wrapping:unwrap url OK');
assert.equal('POST', method, 'wrapping:unwrap method OK');
- assert.deepEqual({ data }, options, 'wrapping:unwrap options OK');
+ assert.deepEqual({ data, clientToken }, options, 'wrapping:unwrap options OK');
adapter.toolAction('rewrap', data);
assert.equal('/v1/sys/wrapping/rewrap', url, 'wrapping:rewrap url OK');
assert.equal('POST', method, 'wrapping:rewrap method OK');
- assert.deepEqual({ data }, options, 'wrapping:rewrap options OK');
+ assert.deepEqual({ data, clientToken }, options, 'wrapping:rewrap options OK');
});
test('tools api urls', function(assert) {