From 89cb174b2f1998efa56d9604d14131415ae65d6f Mon Sep 17 00:00:00 2001 From: Chelsea Shaw Date: Thu, 12 Nov 2020 13:41:52 -0600 Subject: [PATCH] Fix auth tests (x-vault-token) --- ui/app/services/auth.js | 10 +++++----- ui/tests/integration/services/auth-test.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/app/services/auth.js b/ui/app/services/auth.js index 8f2ddd72f7a8..e881da220a5f 100644 --- a/ui/app/services/auth.js +++ b/ui/app/services/auth.js @@ -69,7 +69,7 @@ export default Service.extend({ }, setCluster(clusterId) { - this.set('activeCluster', clusterId); + this.activeCluster = clusterId; }, ajax(url, method, options) { @@ -118,7 +118,7 @@ export default Service.extend({ let now = this.now(); const ttl = resp.ttl || resp.lease_duration; const tokenExpirationEpoch = now + ttl * 1e3; - this.set('expirationCalcTS', now); + this.expirationCalcTS = now; return { ttl, tokenExpirationEpoch, @@ -194,8 +194,8 @@ export default Service.extend({ data.displayName = get(this.getTokenData(tokenName) || {}, 'displayName'); } tokens.addObject(tokenName); - this.set('tokens', tokens); - this.set('allowExpiration', false); + this.tokens = tokens; + this.allowExpiration = false; this.setTokenData(tokenName, data); return resolve({ namespace: currentNamespace || data.userRootNamespace, @@ -346,7 +346,7 @@ export default Service.extend({ deleteToken(tokenName) { const tokenNames = this.tokens.without(tokenName); this.removeTokenData(tokenName); - this.set('tokens', tokenNames); + this.tokens = tokenNames; }, // returns the key for the token to use diff --git a/ui/tests/integration/services/auth-test.js b/ui/tests/integration/services/auth-test.js index fbd20a2c73c0..179ff10ebef4 100644 --- a/ui/tests/integration/services/auth-test.js +++ b/ui/tests/integration/services/auth-test.js @@ -129,8 +129,8 @@ module('Integration | Service | auth', function(hooks) { this.server = new Pretender(function() { this.get('/v1/auth/token/lookup-self', function(request) { let resp = copy(ROOT_TOKEN_RESPONSE, true); - resp.id = request.requestHeaders['x-vault-token']; - resp.data.id = request.requestHeaders['x-vault-token']; + resp.id = request.requestHeaders['X-Vault-Token']; + resp.data.id = request.requestHeaders['X-Vault-Token']; return [200, {}, resp]; }); this.post('/v1/auth/userpass/login/:username', function(request) { @@ -308,8 +308,8 @@ module('Integration | Service | auth', function(hooks) { this.server.map(function() { this.get('/v1/auth/token/lookup-self', function(request) { let resp = copy(tokenResp, true); - resp.id = request.requestHeaders['x-vault-token']; - resp.data.id = request.requestHeaders['x-vault-token']; + resp.id = request.requestHeaders['X-Vault-Token']; + resp.data.id = request.requestHeaders['X-Vault-Token']; return [200, {}, resp]; }); });