From 83b99edc97af65386a14a11d1e1e514e5b917de3 Mon Sep 17 00:00:00 2001 From: njuelle Date: Mon, 12 Mar 2018 09:43:18 +0100 Subject: [PATCH 1/6] adding action logout when json web token error --- src/services/kuzzleWrapper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/kuzzleWrapper.js b/src/services/kuzzleWrapper.js index f094b2af6..f9eb2c7b3 100644 --- a/src/services/kuzzleWrapper.js +++ b/src/services/kuzzleWrapper.js @@ -1,6 +1,6 @@ import kuzzle from './kuzzle' import Promise from 'bluebird' -import * as types from '../vuex/modules/auth/mutation-types' +import * as actions from '../vuex/modules/auth/actions' import * as kuzzleTypes from '../vuex/modules/common/kuzzle/mutation-types' import {SET_TOAST} from '../vuex/modules/common/toaster/mutation-types' @@ -53,7 +53,7 @@ export const initStoreWithKuzzle = (store) => { case 'Token expired': case 'Invalid token': case 'Json Web Token Error': - store.commit(types.SET_TOKEN_VALID, false) + store.dispatch(actions.DO_LOGOUT) break } } From 405628beb2fa1bc765b3861ebbc6dfd86c01ee8a Mon Sep 17 00:00:00 2001 From: njuelle Date: Wed, 25 Apr 2018 13:31:51 +0200 Subject: [PATCH 2/6] add kuzzle.connect --- src/services/kuzzleWrapper.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/kuzzleWrapper.js b/src/services/kuzzleWrapper.js index f9eb2c7b3..5d74ed556 100644 --- a/src/services/kuzzleWrapper.js +++ b/src/services/kuzzleWrapper.js @@ -1,6 +1,7 @@ import kuzzle from './kuzzle' import Promise from 'bluebird' -import * as actions from '../vuex/modules/auth/actions' +// 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' @@ -53,7 +54,8 @@ export const initStoreWithKuzzle = (store) => { case 'Token expired': case 'Invalid token': case 'Json Web Token Error': - store.dispatch(actions.DO_LOGOUT) + store.commit(types.SET_TOKEN_VALID, false) + kuzzle.connect() break } } From 1cac19e365fa8294d6b706d3bd52833c7996a6e6 Mon Sep 17 00:00:00 2001 From: njuelle Date: Wed, 25 Apr 2018 13:49:47 +0200 Subject: [PATCH 3/6] fix install deps --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 39a1a0a9f..a49d180e6 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "e2e": "npm run e2e-chrome && npm run e2e-firefox", "test": "npm run unit && npm run e2e", "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs", - "install_deps": "npm i && bower install --allow-root --no-interactive", + "install_deps": "npm i --unsafe-perm && bower install --allow-root --no-interactive", "prepublishOnly": "npm run build", "start": "http-server dist" }, From 66222042e90079c58e6dc61ba57f888561b96e98 Mon Sep 17 00:00:00 2001 From: njuelle Date: Wed, 25 Apr 2018 16:42:10 +0200 Subject: [PATCH 4/6] dispatch LIST_INDEXES_AND_COLLECTION when prepare session --- src/vuex/modules/auth/actions.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vuex/modules/auth/actions.js b/src/vuex/modules/auth/actions.js index c8b4b3327..28940aeb2 100644 --- a/src/vuex/modules/auth/actions.js +++ b/src/vuex/modules/auth/actions.js @@ -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 { @@ -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 => { From f9a8d17766452bd35fb385362ba1c814d4135057 Mon Sep 17 00:00:00 2001 From: njuelle Date: Thu, 26 Apr 2018 11:30:07 +0200 Subject: [PATCH 5/6] remove cloudfront commands --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b35f7b05..77c69a75a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 "/*" From 4d6b565917abeb2eca6b17b2dd1f3175523ca2aa Mon Sep 17 00:00:00 2001 From: scottinet Date: Tue, 22 May 2018 11:10:36 +0200 Subject: [PATCH 6/6] Release 2.1.5 --- package-lock.json | 52 +++++++++++------------------------------------ package.json | 2 +- 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 200c42a4c..daa386729 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "kuzzle-backoffice", - "version": "2.1.4", + "version": "2.1.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -86,7 +86,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, "requires": { "kind-of": "3.2.2", "longest": "1.0.1", @@ -1468,7 +1467,6 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, "requires": { "align-text": "0.1.4", "lazy-cache": "1.0.4" @@ -1582,7 +1580,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, "requires": { "center-align": "0.1.3", "right-align": "0.1.3", @@ -1592,8 +1589,7 @@ "wordwrap": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" } } }, @@ -2227,8 +2223,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "deep-eql": { "version": "0.1.3", @@ -5183,8 +5178,7 @@ "is-buffer": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", - "dev": true + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=" }, "is-builtin-module": { "version": "1.0.0", @@ -5809,7 +5803,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "1.1.5" } @@ -5868,8 +5861,7 @@ "lazy-cache": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" }, "lcid": { "version": "1.0.0", @@ -6100,8 +6092,7 @@ "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, "loose-envify": { "version": "1.3.1", @@ -8399,8 +8390,7 @@ "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "repeating": { "version": "2.0.1", @@ -8520,7 +8510,6 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, "requires": { "align-text": "0.1.4" } @@ -9317,8 +9306,7 @@ "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -9340,10 +9328,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } + "dev": true } } }, @@ -9998,8 +9983,7 @@ "camelcase": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" }, "source-list-map": { "version": "1.1.2", @@ -10012,17 +9996,11 @@ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, - "requires": { - "source-map": "0.5.6", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, "dependencies": { "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, "requires": { "camelcase": "1.2.1", "cliui": "2.1.0", @@ -10073,12 +10051,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } + "dev": true } } }, @@ -10234,8 +10207,7 @@ "window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" }, "wordwrap": { "version": "0.0.3", diff --git a/package.json b/package.json index cb4445df1..801ff76a7 100644 --- a/package.json +++ b/package.json @@ -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 ", "private": false,