ソースを参照

Add network ID in all log flag API calls

pull/32/head
コミット
451a58e6fc
3個のファイルの変更18行の追加16行の削除
  1. +6
    -6
      src/_services/network.service.js
  2. +8
    -7
      src/_store/networks.module.js
  3. +4
    -3
      src/account/NetworkPage.vue

+ 6
- 6
src/_services/network.service.js ファイルの表示

@@ -94,16 +94,16 @@ function getNetworkBackups(userId, networkId, messages, errors) {
.then(util.handleCrudResponse(messages, errors));
}

function getLogFlag(messages, errors) {
return fetch(`${config.apiUrl}/me/networks/logs/status`, util.getWithAuth())
function getLogFlag(networkId, messages, errors) {
return fetch(`${config.apiUrl}/me/networks/${networkId}/logs/status`, util.getWithAuth())
.then(util.handleCrudResponse(messages, errors));
}
function disableLog(messages, errors) {
return fetch(`${config.apiUrl}/me/networks/logs/stop`, util.postWithAuth())
function disableLog(networkId, messages, errors) {
return fetch(`${config.apiUrl}/me/networks/${networkId}/logs/stop`, util.postWithAuth())
.then(util.handlePlaintextResponse(messages, errors));
}
function enableLog(disableInDays, messages, errors) {
function enableLog(disableInDays, networkId, messages, errors) {
const ttlDaysParam = disableInDays ? '?ttlDays=' + disableInDays : '';
return fetch(`${config.apiUrl}/me/networks/logs/start` + ttlDaysParam, util.postWithAuth())
return fetch(`${config.apiUrl}/me/networks/${networkId}/logs/start` + ttlDaysParam, util.postWithAuth())
.then(util.handlePlaintextResponse(messages, errors));
}

+ 8
- 7
src/_store/networks.module.js ファイルの表示

@@ -155,22 +155,23 @@ const actions = {
error => commit('retrieveNetworkKeysFailure', error));
},

getLogFlag({ commit }, { messages, errors }) {
getLogFlag({ commit }, { networkId, messages, errors }) {
commit('getLogFlagRequest');
networkService.getLogFlag(messages, errors)
networkService.getLogFlag(networkId, messages, errors)
.then(logFlag => commit('getLogFlagSuccess', logFlag),
error => commit('getLogFlagFailure', error));
},
disableLog({ commit }, { messages, errors }) {
disableLog({ commit }, { networkId, messages, errors }) {
commit('disableLogRequest');
networkService.disableLog(messages, errors)
networkService.disableLog(networkId, messages, errors)
.then((ok) => commit('disableLogSuccess'), (error) => commit('disableLogFailure', error));
},
enableLog({ commit, dispatch }, { disableInDays, messages, errors }) {
enableLog({ commit, dispatch }, { disableInDays, networkId, messages, errors }) {
commit('enableLogRequest');
networkService.enableLog(disableInDays, messages, errors)
networkService.enableLog(disableInDays, networkId, messages, errors)
.then((ok) => commit('enableLogSuccess'), (error) => commit('enableLogFailure', error))
.then((r) => dispatch('getLogFlag', { messages: messages, errors: errors }));
.then((r) => dispatch('getLogFlag',
{ networkId: networkId, messages: messages, errors: errors }));
},

resetRestoreKey({ commit }) { commit('resetRestoreKey'); }


+ 4
- 3
src/account/NetworkPage.vue ファイルの表示

@@ -301,7 +301,7 @@
});

if (this.logFlag === null || this.refresher === null) {
this.getLogFlag({ userId: userId, messages: this.messages, errors: this.errors });
this.getLogFlag({ networkId: this.networkId, messages: this.messages, errors: this.errors });
}
if (this.backups === null || this.refresher === null) {
// note about the second part of the condition above: if refreshes is turned on, then fetch backups
@@ -391,11 +391,12 @@
},
disableLogs () {
this.errors.clear();
this.disableLog({messages: this.messages, errors: this.errors});
this.disableLog({ networkId: this.networkId, messages: this.messages, errors: this.errors });
},
enableLogs (expirationDays) {
this.errors.clear();
this.enableLog({disableInDays: expirationDays, messages: this.messages, errors: this.errors});
this.enableLog({ disableInDays: expirationDays, networkId: this.networkId,
messages: this.messages, errors: this.errors });
},
doUpgrade () {
this.upgrade();


読み込み中…
キャンセル
保存