Skip to content

Commit

Permalink
Merge pull request #406 from kuzzleio/2.1.5-proposal
Browse files Browse the repository at this point in the history
Release 2.1.5
  • Loading branch information
scottinet authored May 22, 2018
2 parents 16b9059 + 4d6b565 commit 70cbb51
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 44 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,3 @@ deploy:

after_deploy:
- aws s3 cp kuzzle-admin-console.tar.gz s3://$BUCKET_NAME/kuzzle-admin-console.tar.gz
- aws configure set preview.cloudfront true
- aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID
--paths "/*"
52 changes: 12 additions & 40 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kuzzle-backoffice",
"version": "2.1.4",
"version": "2.1.5",
"description": "A handy back-office for Kuzzle.io",
"author": "The Kuzzle team <[email protected]>",
"private": false,
Expand Down
2 changes: 2 additions & 0 deletions src/services/kuzzleWrapper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import kuzzle from './kuzzle'
import Promise from 'bluebird'
// import * as actions from '../vuex/modules/auth/actions'
import * as types from '../vuex/modules/auth/mutation-types'
import * as kuzzleTypes from '../vuex/modules/common/kuzzle/mutation-types'
import {SET_TOAST} from '../vuex/modules/common/toaster/mutation-types'
Expand Down Expand Up @@ -54,6 +55,7 @@ export const initStoreWithKuzzle = (store) => {
case 'Invalid token':
case 'Json Web Token Error':
store.commit(types.SET_TOKEN_VALID, false)
kuzzle.connect()
break
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/vuex/modules/auth/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import kuzzle from '../../../services/kuzzle'
import SessionUser from '../../../models/SessionUser'
import * as types from './mutation-types'
import * as kuzzleTypes from '../common/kuzzle/mutation-types'
import { LIST_INDEXES_AND_COLLECTION } from '../index/mutation-types'
import Promise from 'bluebird'

export default {
Expand All @@ -22,6 +23,7 @@ export default {
[types.PREPARE_SESSION] ({commit, dispatch}, token) {
const sessionUser = SessionUser()
dispatch(kuzzleTypes.UPDATE_TOKEN_CURRENT_ENVIRONMENT, token)
dispatch(LIST_INDEXES_AND_COLLECTION)
return kuzzle
.whoAmIPromise()
.then(user => {
Expand Down

0 comments on commit 70cbb51

Please sign in to comment.