@websanova/vue-auth
Advanced tools
Comparing version 2.16.1-beta to 2.16.2-beta
{ | ||
"dependencies": { | ||
"@websanova/vue-auth": "2.16.1-beta" | ||
"@websanova/vue-auth": "2.16.2-beta" | ||
}, | ||
@@ -5,0 +5,0 @@ |
{ | ||
"dependencies": { | ||
"@websanova/vue-auth": "2.16.1-beta", | ||
"@websanova/vue-auth": "2.16.2-beta", | ||
"axios": "0.16.2", | ||
@@ -5,0 +5,0 @@ "vue-axios": "2.0.2" |
{ | ||
"dependencies": { | ||
"nuxt": "1.0.0-rc3", | ||
"@websanova/vue-auth": "2.16.1-beta", | ||
"@websanova/vue-auth": "2.16.2-beta", | ||
"vue-resource": "1.3.4", | ||
@@ -6,0 +6,0 @@ "axios": "0.16.2", |
@@ -47,3 +47,3 @@ { | ||
"dependencies": { | ||
"@websanova/vue-auth": "2.16.1-beta", | ||
"@websanova/vue-auth": "2.16.2-beta", | ||
"axios": "^0.16.2", | ||
@@ -50,0 +50,0 @@ "compression": "^1.6.2", |
@@ -5,2 +5,3 @@ # Change Log | ||
* Update so that tokens can be fully named in options. Without additional appended parameters. | ||
* Add `tokenStore` array for setting storage preferences `(['localStorage', 'cookie'])`. | ||
@@ -7,0 +8,0 @@ * Fix removing `rememberMe` cookie on logout. |
@@ -10,6 +10,10 @@ # Options | ||
### tokenName: `'auth_token'` | ||
### tokenOtherName: `'other_auth_token'` | ||
* The name of the token stored in local storage. | ||
* The name of the impersonating token stored in local storage. | ||
### tokenDefaultName: `'default_auth_token'` | ||
* The name of the default token stored in local storage. | ||
### tokenStore: `['localStorage', 'cookie']` | ||
@@ -16,0 +20,0 @@ |
@@ -17,3 +17,3 @@ { | ||
"version": "2.16.1-beta", | ||
"version": "2.16.2-beta", | ||
@@ -20,0 +20,0 @@ "repository": { |
@@ -268,4 +268,4 @@ var __utils = require('./lib/utils.js'), | ||
__token.remove.call(this, 'other'); | ||
__token.remove.call(this, 'default'); | ||
__token.remove.call(this, this.options.tokenOtherName); | ||
__token.remove.call(this, this.options.tokenDefaultName); | ||
@@ -293,4 +293,4 @@ this.watch.authenticated = false; | ||
// Reshuffle tokens here... | ||
__token.set.call(this, 'other', this.token.call(this)); | ||
__token.set.call(this, 'default', token); | ||
__token.set.call(this, this.options.tokenOtherName, this.token.call(this)); | ||
__token.set.call(this, this.options.tokenDefaultName, token); | ||
@@ -330,3 +330,3 @@ if (success) { success.call(this); } | ||
function _logoutOtherProcess(res, data) { | ||
__token.remove.call(this, 'other'); | ||
__token.remove.call(this, this.options.tokenOtherName); | ||
@@ -386,3 +386,4 @@ this.options.fetchPerform.call(this, { | ||
rolesVar: 'roles', | ||
tokenName: 'auth_token', | ||
tokenOtherName: 'other_auth_token', | ||
tokenDefaultName: 'default_auth_token', | ||
tokenStore: ['localStorage', 'cookie'], | ||
@@ -535,3 +536,3 @@ | ||
return __token.get.call(this, 'other') ? true : false; | ||
return __token.get.call(this, this.options.tokenOtherName) ? true : false; | ||
}; | ||
@@ -547,3 +548,3 @@ | ||
if (this.other()) { | ||
this.currentToken = 'default'; | ||
this.currentToken = this.options.tokenDefaultName; | ||
} | ||
@@ -550,0 +551,0 @@ }; |
@@ -8,6 +8,11 @@ var __cookie = require('./cookie.js'); | ||
if ( ! name && this.other.call(this)) { name = 'other'; } | ||
else if ( ! name || name === 'default') { name = 'default'; } | ||
if (name) { | ||
return name; | ||
} | ||
return name + '_' + this.options.tokenName; | ||
if (this.other.call(this)) { | ||
return this.options.tokenOtherName; | ||
} | ||
return this.options.tokenDefaultName; | ||
} | ||
@@ -14,0 +19,0 @@ |
755424
146
2396