refactorized verbosity with the correct array schema

This commit is contained in:
srgooglo 2020-10-12 15:59:37 +02:00
parent 71328b8704
commit 605550c124
2 changed files with 16 additions and 42 deletions

View File

@ -30,12 +30,6 @@ export default {
session_data: null, session_data: null,
session_uuid: null, session_uuid: null,
contextMenu: {
visible: false,
fragment: null,
yPos: 0,
xPos: 0
},
sidebar_collapsed: store.get("sidebar_collapse"), sidebar_collapsed: store.get("sidebar_collapse"),
overlayActive: false, overlayActive: false,
overlayElement: null, overlayElement: null,
@ -58,7 +52,7 @@ export default {
// nothing // nothing
} }
uri_resolver().then(res => { uri_resolver().then(res => {
dispatch({ type: 'handleUpdateResolvers', payload: res }) dispatch({ type: 'updateState', payload: { resolvers: res } })
}) })
dispatch({ type: 'updateFrames' }) dispatch({ type: 'updateFrames' })
dispatch({ type: 'handleValidate' }) dispatch({ type: 'handleValidate' })
@ -122,21 +116,17 @@ export default {
} }
if (!sessionDataframe && session ) { if (!sessionDataframe && session ) {
yield put({ type: 'handleUpdateData' }) yield put({ type: 'handleGetUserData' })
} }
}, },
*getStateConnector({payload}, { select }){
const state = yield select(state => state.app)
payload(state)
},
*logout({ payload }, { call, put, select }) { *logout({ payload }, { call, put, select }) {
const uuid = yield select(state => state.app.session_uuid) const uuid = yield select(state => state.app.session_uuid)
const token = yield select(state => state.app.session_token) const token = yield select(state => state.app.session_token)
const sk = yield select(state => state.app.server_key) const sk = yield select(state => state.app.server_key)
session.deauth({ id: uuid, userToken: token, server_key: sk }, (err, res) =>{ session.deauth({ id: uuid, userToken: token, server_key: sk }, (err, res) =>{
verbosity(res) verbosity([res])
}) })
yield put({ type: 'sessionErase' }) yield put({ type: 'sessionErase' })
@ -146,10 +136,6 @@ export default {
const { user_id, access_token } = payload.authFrame const { user_id, access_token } = payload.authFrame
yield put({ type: 'handleLogin', payload: { user_id, access_token, user_data: payload.dataFrame } }) yield put({ type: 'handleLogin', payload: { user_id, access_token, user_data: payload.dataFrame } })
}, },
*initializeInternal({payload}, {select, put}){
if(!payload) return false
yield put({ type: "handleInternal", payload })
},
*initializeSocket({payload}, {select, put}){ *initializeSocket({payload}, {select, put}){
if(!payload) return false if(!payload) return false
const { type, address } = payload const { type, address } = payload
@ -165,7 +151,7 @@ export default {
try { try {
usePlugins([payload.array], (err, results) => { usePlugins([payload.array], (err, results) => {
if (err) { if (err) {
verbosity("Init error!", err) verbosity(["Init error!", err])
appInterface.notify.error("Plugin initialize error!", err) appInterface.notify.error("Plugin initialize error!", err)
return false return false
} }
@ -277,7 +263,7 @@ export default {
} }
} catch (error) { } catch (error) {
verbosity(error) verbosity([error])
} }
} }
@ -289,17 +275,7 @@ export default {
...payload, ...payload,
}; };
}, },
handleInternal(state, { payload }){
verbosity(payload)
if (Array.isArray(payload)) {
payload.forEach((e) => {
window.Internal[e.id] = e.payload
})
}
},
handleUpdateResolvers(state, { payload }) {
state.resolvers = payload
},
handleSocket(state, { payload }) { handleSocket(state, { payload }) {
state.socket_conn = payload state.socket_conn = payload
state.socket_opt = payload.opts state.socket_opt = payload.opts
@ -359,7 +335,7 @@ export default {
jwt.sign(frame, state.server_key, (err, token) => { jwt.sign(frame, state.server_key, (err, token) => {
if (err) { if (err) {
verbosity(err) verbosity([err])
return false return false
} }
cookie.set(app_config.session_token_storage, token) cookie.set(app_config.session_token_storage, token)
@ -370,7 +346,7 @@ export default {
state.session_valid = true state.session_valid = true
location.reload() location.reload()
}, },
handleUpdateData(state){ handleGetUserData(state){
const frame = { const frame = {
id: state.session_uuid, id: state.session_uuid,
access_token: state.session_token, access_token: state.session_token,
@ -378,15 +354,14 @@ export default {
} }
user.get.data(frame, (err, res) => { user.get.data(frame, (err, res) => {
if(err) { if(err) {
verbosity(err) verbosity([err])
} }
if (res) { if (res) {
try { try {
const session_data = JSON.stringify(res.user_data) const session_data = JSON.stringify(res.user_data)
sessionStorage.setItem(app_config.session_data_storage, btoa(session_data)) sessionStorage.setItem(app_config.session_data_storage, btoa(session_data))
location.reload()
} catch (error) { } catch (error) {
verbosity(error) verbosity([error])
} }
} }
}) })
@ -395,11 +370,11 @@ export default {
state.sidebar_collapsed = payload state.sidebar_collapsed = payload
}, },
handleUpdateTheme(state, { payload }) { handleUpdateTheme(state, { payload }) {
verbosity(payload) verbosity([payload])
store.set(app_config.appTheme_container, payload); store.set(app_config.appTheme_container, payload);
state.app_theme = payload state.app_theme = payload
}, },
isUser(state, { payload, callback }){ requireQuery(state, { payload, callback }){
if(!payload || !callback) return false if(!payload || !callback) return false
switch (payload) { switch (payload) {
case 'login':{ case 'login':{
@ -430,7 +405,6 @@ export default {
return false return false
} }
const ipc = state.electron.ipcRenderer const ipc = state.electron.ipcRenderer
ipc.invoke(payload.key, payload.payload) ipc.invoke(payload.key, payload.payload)
}, },
ipcSend(state, {payload}){ ipcSend(state, {payload}){
@ -451,4 +425,4 @@ export default {
location.reload() location.reload()
}, },
}, },
}; }

View File

@ -101,14 +101,14 @@ export class NormalLoginForm extends React.PureComponent {
} }
if (res) { if (res) {
verbosity(res) verbosity([res])
switch (res.api_status.toString()) { switch (res.api_status.toString()) {
case "200": { case "200": {
try { try {
return resolve(res) return resolve(res)
} catch (error) { } catch (error) {
verbosity(error) verbosity([error])
} }
break; break;
} }
@ -144,7 +144,7 @@ export class NormalLoginForm extends React.PureComponent {
try { try {
return resolve(JSON.stringify(res.user_data)) return resolve(JSON.stringify(res.user_data))
} catch (error) { } catch (error) {
verbosity(error) verbosity([error])
} }
} }
}) })