π A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!
Vue awesomedashboarddockerhomelabhomepagemitnodejsorganizationproductivitypwaself-hostedstartpagevue
π Replace instances of Axios with new request handlers across everywhere
Alicia Sykes63952fb030d6
diff --git a/services/cors-proxy.js b/services/cors-proxy.jsindex 9c51214c..afafb0a4 100644--- a/services/cors-proxy.js+++ b/services/cors-proxy.js@@ -4,7 +4,7 @@* makes request to endpoint, then responds to the frontend with the response*/-const axios = require('axios');+const request = require('./request');module.exports = (req, res) => {// Apply allow-all response headers@@ -33,12 +33,12 @@ module.exports = (req, res) => {const requestConfig = {method: req.method,url: targetURL,- json: req.body,+ data: req.body,headers,};// Make the request, and respond with result- axios.request(requestConfig)+ request(requestConfig).then((response) => {res.status(200).send(response.data);}).catch((error) => {diff --git a/services/serverless-functions/netlify-cors.js b/services/serverless-functions/netlify-cors.jsindex 3789238e..ed8e659d 100644--- a/services/serverless-functions/netlify-cors.js+++ b/services/serverless-functions/netlify-cors.js@@ -1,5 +1,5 @@/* A Netlify cloud function to handle requests to CORS-disabled services */-const axios = require('axios');+const request = require('../request');exports.handler = (event, context, callback) => {// Get input data@@ -34,12 +34,12 @@ exports.handler = (event, context, callback) => {const requestConfig = {method: 'GET',url: requestUrl,- json: body,+ data: body,headers: requestHeaders,};// Make request- axios.request(requestConfig)+ request(requestConfig).then((response) => {callback(null, { statusCode: 200, body: JSON.stringify(response.data) });}).catch((error) => {diff --git a/services/status-check.js b/services/status-check.jsindex dae37785..c7b76a5f 100644--- a/services/status-check.js+++ b/services/status-check.js@@ -3,8 +3,7 @@* It accepts a single url parameter, and will make an empty GET request to that* endpoint, and then resolve the response status code, time taken, and short message*/-const axios = require('axios').default;-const https = require('https');+const request = require('./request');/* Determines if successful from the HTTP response code */const getResponseType = (code, validCodes) => {@@ -34,21 +33,18 @@ const makeRequest = (url, options, render) => {} = options;const validCodes = acceptCodes && acceptCodes !== 'null' ? acceptCodes : null;const startTime = new Date();- const requestMaker = axios.create({- httpsAgent: new https.Agent({- rejectUnauthorized: !enableInsecure,- }),- });- requestMaker.request({+ request({url,headers,maxRedirects,+ httpsAgent: { rejectUnauthorized: !enableInsecure },}).then((response) => {const statusCode = response.status;const { statusText } = response;const successStatus = getResponseType(statusCode, validCodes);- const serverName = response.request.socket.servername;+ const serverName = response.request && response.request.socket+ ? response.request.socket.servername : undefined;const timeTaken = (new Date() - startTime);const results = {statusCode, statusText, serverName, successStatus, timeTaken,diff --git a/services/update-checker.js b/services/update-checker.jsindex 5160fa77..b0ab287d 100644--- a/services/update-checker.js+++ b/services/update-checker.js@@ -1,4 +1,4 @@-const axios = require('axios').default;+const request = require('./request');const currentVersion = require('../package.json').version;@@ -22,7 +22,7 @@ const makeMsg = (latestVersion) => {return msg;};-axios.get(packageUrl).then((response) => {+request.get(packageUrl).then((response) => {if (response && response.data && response.data.version) {logToConsole(`\nUsing Dashy V-${currentVersion}. Update Check Complete`);logToConsole(makeMsg(response.data.version));diff --git a/src/components/Configuration/AppVersion.vue b/src/components/Configuration/AppVersion.vueindex 10002570..ac48076e 100644--- a/src/components/Configuration/AppVersion.vue+++ b/src/components/Configuration/AppVersion.vue@@ -30,8 +30,8 @@</template><script>-import axios from 'axios';import { Progress } from 'rsup-progress';+import request from '@/utils/request';import ErrorHandler from '@/utils/ErrorHandler';export default {@@ -66,7 +66,7 @@ export default {checkVersion() {const packageUrl = 'https://raw.githubusercontent.com/Lissy93/dashy/master/package.json';this.progress.start();- axios.get(packageUrl).then((response) => {+ request.get(packageUrl).then((response) => {if (response && response.data && response.data.version) {this.latestVersion = response.data.version;this.isUpToDate = this.checkIfUpToDate(this.appVersion, this.latestVersion);diff --git a/src/components/Configuration/RebuildApp.vue b/src/components/Configuration/RebuildApp.vueindex e77eef53..d489b976 100644--- a/src/components/Configuration/RebuildApp.vue+++ b/src/components/Configuration/RebuildApp.vue@@ -45,8 +45,8 @@</template><script>-import axios from 'axios';import { Progress } from 'rsup-progress';+import request from '@/utils/request';import Button from '@/components/FormElements/Button';import RebuildIcon from '@/assets/interface-icons/application-rebuild.svg';import ReloadIcon from '@/assets/interface-icons/application-reload.svg';@@ -89,7 +89,7 @@ export default {const endpoint = `${baseUrl}${serviceEndpoints.rebuild}`;this.loading = true;this.progress.start();- axios.get(endpoint)+ request.get(endpoint).then((response) => {this.finished(response.data || false);this.progress.end();diff --git a/src/components/Widgets/Apod.vue b/src/components/Widgets/Apod.vueindex cbf68189..eb3529cb 100644--- a/src/components/Widgets/Apod.vue+++ b/src/components/Widgets/Apod.vue@@ -15,7 +15,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -39,7 +39,7 @@ export default {},methods: {fetchData() {- axios.get(widgetApiEndpoints.astronomyPictureOfTheDay)+ request.get(widgetApiEndpoints.astronomyPictureOfTheDay).then((response) => {this.processData(response.data);})diff --git a/src/components/Widgets/ChuckNorris.vue b/src/components/Widgets/ChuckNorris.vueindex b194d48e..69785739 100644--- a/src/components/Widgets/ChuckNorris.vue+++ b/src/components/Widgets/ChuckNorris.vue@@ -5,7 +5,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -36,7 +36,7 @@ export default {methods: {/* Make GET request to ChuckNorris API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {this.processData(response.data);})diff --git a/src/components/Widgets/CodeStats.vue b/src/components/Widgets/CodeStats.vueindex 29be3b19..3024adf9 100644--- a/src/components/Widgets/CodeStats.vue+++ b/src/components/Widgets/CodeStats.vue@@ -21,7 +21,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import ChartingMixin from '@/mixins/ChartingMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -79,7 +79,7 @@ export default {methods: {/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {this.processData(response.data);})diff --git a/src/components/Widgets/CryptoPriceChart.vue b/src/components/Widgets/CryptoPriceChart.vueindex 2f966c41..95967464 100644--- a/src/components/Widgets/CryptoPriceChart.vue+++ b/src/components/Widgets/CryptoPriceChart.vue@@ -4,7 +4,7 @@<script>import { Chart } from 'frappe-charts/dist/frappe-charts.min.esm';-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import ChartingMixin from '@/mixins/ChartingMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -82,7 +82,7 @@ export default {},/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {try {this.processData(response.data);diff --git a/src/components/Widgets/CryptoWatchList.vue b/src/components/Widgets/CryptoWatchList.vueindex 4230fc71..f7538009 100644--- a/src/components/Widgets/CryptoWatchList.vue+++ b/src/components/Widgets/CryptoWatchList.vue@@ -19,7 +19,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';import {@@ -84,7 +84,7 @@ export default {methods: {/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {this.processData(response.data);})diff --git a/src/components/Widgets/ExchangeRates.vue b/src/components/Widgets/ExchangeRates.vueindex 294747a3..984a6c3d 100644--- a/src/components/Widgets/ExchangeRates.vue+++ b/src/components/Widgets/ExchangeRates.vue@@ -27,7 +27,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';import { findCurrencySymbol, getCurrencyFlag, timestampToDate } from '@/utils/MiscHelpers';@@ -72,7 +72,7 @@ export default {methods: {/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then(response => {this.processData(response.data);}).catch(error => {diff --git a/src/components/Widgets/Flights.vue b/src/components/Widgets/Flights.vueindex ef3e3873..fe657d64 100644--- a/src/components/Widgets/Flights.vue+++ b/src/components/Widgets/Flights.vue@@ -30,7 +30,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -117,7 +117,7 @@ export default {'x-rapidapi-key': this.apiKey,},};- axios.request(requestConfig)+ request(requestConfig).then((response) => {this.processData(response.data);}).catch((error) => {diff --git a/src/components/Widgets/GitHubTrending.vue b/src/components/Widgets/GitHubTrending.vueindex c6376b6c..865654a0 100644--- a/src/components/Widgets/GitHubTrending.vue+++ b/src/components/Widgets/GitHubTrending.vue@@ -16,7 +16,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';import { capitalize, showNumAsThousand } from '@/utils/MiscHelpers';@@ -55,7 +55,7 @@ export default {},methods: {fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {if (response.data.items) {this.processData(response.data.items);diff --git a/src/components/Widgets/GlCompactMetrics.vue b/src/components/Widgets/GlCompactMetrics.vueindex f9e2c2f9..326a4360 100644--- a/src/components/Widgets/GlCompactMetrics.vue+++ b/src/components/Widgets/GlCompactMetrics.vue@@ -108,7 +108,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { convertBytes } from '@/utils/MiscHelpers';@@ -192,7 +192,7 @@ export default {async fetchSystemData(endpoint) {const config = this.requestConfig(endpoint);- const response = await axios.get(config.url, {+ const response = await request.get(config.url, {headers: config.headers,timeout: this.options.timeout || 8000,});diff --git a/src/components/Widgets/HackernewsTrending.vue b/src/components/Widgets/HackernewsTrending.vueindex 09680f2d..ee43d49b 100644--- a/src/components/Widgets/HackernewsTrending.vue+++ b/src/components/Widgets/HackernewsTrending.vue@@ -18,7 +18,7 @@</template><script>-// import axios from 'axios';+// import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';diff --git a/src/components/Widgets/Jokes.vue b/src/components/Widgets/Jokes.vueindex c68aca81..b9039fc2 100644--- a/src/components/Widgets/Jokes.vue+++ b/src/components/Widgets/Jokes.vue@@ -6,7 +6,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -52,7 +52,7 @@ export default {methods: {/* Make GET request to Jokes API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {if (response.data.error) {this.error('No matching jokes returned', response.data.additionalInfo);diff --git a/src/components/Widgets/NewsHeadlines.vue b/src/components/Widgets/NewsHeadlines.vueindex 9d6df019..4031ffd3 100644--- a/src/components/Widgets/NewsHeadlines.vue+++ b/src/components/Widgets/NewsHeadlines.vue@@ -13,7 +13,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';import { timestampToDate } from '@/utils/MiscHelpers';@@ -62,7 +62,7 @@ export default {methods: {/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {if (!response.data.news || response.data.news.length === 0) {this.error('API didn\'t return any results for your query');diff --git a/src/components/Widgets/PiHoleStats.vue b/src/components/Widgets/PiHoleStats.vueindex ef453b46..4961a0df 100644--- a/src/components/Widgets/PiHoleStats.vue+++ b/src/components/Widgets/PiHoleStats.vue@@ -18,7 +18,7 @@</template><script>-// import axios from 'axios';+// import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import ChartingMixin from '@/mixins/ChartingMixin';import { capitalize } from '@/utils/MiscHelpers';diff --git a/src/components/Widgets/PublicHolidays.vue b/src/components/Widgets/PublicHolidays.vueindex 805fc033..8212fc72 100644--- a/src/components/Widgets/PublicHolidays.vue+++ b/src/components/Widgets/PublicHolidays.vue@@ -13,7 +13,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';import { timestampToDate, capitalize } from '@/utils/MiscHelpers';@@ -70,7 +70,7 @@ export default {methods: {/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {this.processData(response.data);})diff --git a/src/components/Widgets/SportsScores.vue b/src/components/Widgets/SportsScores.vueindex 6eadc536..2b1215f7 100644--- a/src/components/Widgets/SportsScores.vue+++ b/src/components/Widgets/SportsScores.vue@@ -68,7 +68,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { timestampToDate, getPlaceUrl } from '@/utils/MiscHelpers';import { widgetApiEndpoints } from '@/utils/defaults';@@ -144,7 +144,7 @@ export default {}},fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {this.processData(response.data.results || response.data.events);})diff --git a/src/components/Widgets/StockPriceChart.vue b/src/components/Widgets/StockPriceChart.vueindex d8fb35bf..e271d46f 100644--- a/src/components/Widgets/StockPriceChart.vue+++ b/src/components/Widgets/StockPriceChart.vue@@ -4,7 +4,7 @@<script>import { Chart } from 'frappe-charts/dist/frappe-charts.min.esm';-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import ChartingMixin from '@/mixins/ChartingMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -87,7 +87,7 @@ export default {},/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {if (response.data.note) {this.error('API Error', response.data.Note);diff --git a/src/components/Widgets/SynologyDownload.vue b/src/components/Widgets/SynologyDownload.vueindex fe2fcaa9..c782790e 100644--- a/src/components/Widgets/SynologyDownload.vue+++ b/src/components/Widgets/SynologyDownload.vue@@ -25,7 +25,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import PercentageChart from '@/components/Charts/PercentageChart';import { getValueFromCss, convertBytes } from '@/utils/MiscHelpers';@@ -76,7 +76,7 @@ export default {},methods: {login() {- axios.request({+ request({method: 'GET',url: this.proxyReqEndpoint,headers: { 'Target-URL': this.endpointLogin },@@ -84,7 +84,7 @@ export default {.then(this.processLogin);},getTasks() {- axios.request({+ request({method: 'GET',url: this.proxyReqEndpoint,headers: { 'Target-URL': this.endpointTasks },@@ -92,7 +92,7 @@ export default {.then(this.processTask);},logout() {- axios.request({+ request({method: 'GET',url: this.proxyReqEndpoint,headers: { 'Target-URL': this.endpointLogout },diff --git a/src/components/Widgets/SystemInfo.vue b/src/components/Widgets/SystemInfo.vueindex 3d83b0b1..26e2f773 100644--- a/src/components/Widgets/SystemInfo.vue+++ b/src/components/Widgets/SystemInfo.vue@@ -17,7 +17,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import ChartingMixin from '@/mixins/ChartingMixin';import { serviceEndpoints } from '@/utils/defaults';@@ -55,7 +55,7 @@ export default {methods: {/* Make GET request to CoinGecko API endpoint */fetchData() {- axios.get(this.endpoint)+ request.get(this.endpoint).then((response) => {if (!response.data.success) this.error('Error generating backend data');this.processData(response.data);diff --git a/src/components/Widgets/TacticalRMM.vue b/src/components/Widgets/TacticalRMM.vueindex 82f5e643..3c04e58b 100644--- a/src/components/Widgets/TacticalRMM.vue+++ b/src/components/Widgets/TacticalRMM.vue@@ -61,7 +61,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { serviceEndpoints } from '@/utils/defaults';@@ -120,7 +120,7 @@ export default {const targetURL = url;const customHeaders = JSON.stringify(authHeaders);- axios.post(+ request.post(proxyReqEndpoint,{ auth: token },{diff --git a/src/components/Widgets/TflStatus.vue b/src/components/Widgets/TflStatus.vueindex 99660a79..19334d29 100644--- a/src/components/Widgets/TflStatus.vue+++ b/src/components/Widgets/TflStatus.vue@@ -23,7 +23,7 @@</template><script>-import axios from 'axios';+import request from '@/utils/request';import WidgetMixin from '@/mixins/WidgetMixin';import { widgetApiEndpoints } from '@/utils/defaults';@@ -51,7 +51,7 @@ export default {methods: {/* Makes GET request to the TFL API */fetchData() {- axios.get(widgetApiEndpoints.tflStatus)+ request.get(widgetApiEndpoints.tflStatus).then((response) => {this.lineStatuses = this.processData(response.data);})diff --git a/src/mixins/ConfigSaving.js b/src/mixins/ConfigSaving.jsindex caa269ef..bde363b7 100644--- a/src/mixins/ConfigSaving.js+++ b/src/mixins/ConfigSaving.js@@ -1,6 +1,6 @@-import axios from 'axios';import jsYaml from 'js-yaml';import { Progress } from 'rsup-progress';+import request from '@/utils/request';import ErrorHandler, { InfoHandler } from '@/utils/ErrorHandler';import { localStorageKeys, serviceEndpoints } from '@/utils/defaults';@@ -40,14 +40,13 @@ export default {// 3. Prepare the requestconst baseUrl = process.env.VUE_APP_DOMAIN || window.location.origin;const endpoint = `${baseUrl}${serviceEndpoints.save}`;- const headers = { 'Content-Type': 'text/plain' };const filename = isSubPag? (this.$store.state.currentConfigInfo.confPath || '') : '';const body = { config: yaml, timestamp: new Date(), filename };- const request = axios.post(endpoint, body, headers);+ const saveRequest = request.post(endpoint, body);// 4. Make the request, and handle responsethis.progress.start();- request.then((response) => {+ saveRequest.then((response) => {this.saveSuccess = response.data.success || false;this.responseText = response.data.message;if (this.saveSuccess) {diff --git a/src/mixins/ItemMixin.js b/src/mixins/ItemMixin.jsindex 69e6e6a5..08679870 100644--- a/src/mixins/ItemMixin.js+++ b/src/mixins/ItemMixin.js@@ -1,5 +1,5 @@/** Reusable mixin for items */-import axios from 'axios';+import request from '@/utils/request';import router from '@/router';import longPress from '@/directives/LongPress';import ErrorHandler from '@/utils/ErrorHandler';@@ -119,7 +119,7 @@ export default {/* Checks if a given service is currently online */checkWebsiteStatus() {const endpoint = this.statusCheckApiUrl;- axios.get(endpoint)+ request.get(endpoint).then((response) => {if (response.data) this.statusResponse = response.data;})diff --git a/src/mixins/WidgetMixin.js b/src/mixins/WidgetMixin.jsindex a497dafb..88251a67 100644--- a/src/mixins/WidgetMixin.js+++ b/src/mixins/WidgetMixin.js@@ -2,8 +2,8 @@* Mixin that all pre-built and custom widgets extend from.* Manages loading state, error handling, data updates and user options*/-import axios from 'axios';import { Progress } from 'rsup-progress';+import request from '@/utils/request';import ErrorHandler from '@/utils/ErrorHandler';import { serviceEndpoints } from '@/utils/defaults';@@ -115,7 +115,7 @@ const WidgetMixin = {};// Make requestreturn new Promise((resolve, reject) => {- axios.request(requestConfig)+ request(requestConfig).then((response) => {if (response.data.success === false) {this.error('Proxy returned error from target server', response.data.message);diff --git a/src/store.js b/src/store.jsindex 9130139c..eead0d86 100644--- a/src/store.js+++ b/src/store.js@@ -1,8 +1,8 @@/* eslint-disable no-param-reassign, prefer-destructuring */import Vue from 'vue';import Vuex from 'vuex';-import axios from 'axios';import yaml from 'js-yaml';+import request from '@/utils/request';import Keys from '@/utils/StoreMutations';import { makePageName, formatConfigPath, componentVisibility } from '@/utils/ConfigHelpers';import { applyItemId } from '@/utils/SectionHelpers';@@ -356,7 +356,7 @@ const store = new Vuex.Store({const configFilePath = process.env.VUE_APP_CONFIG_PATH || '/conf.yml';try {// Attempt to fetch the YAML file- const response = await axios.get(configFilePath, makeBasicAuthHeaders());+ const response = await request.get(configFilePath, makeBasicAuthHeaders());let data;try {data = yaml.load(response.data);@@ -426,7 +426,7 @@ const store = new Vuex.Store({commit(CRITICAL_ERROR_MSG, `Unable to find config for '${subConfigId}'`);return { ...emptyConfig };}- axios.get(subConfigPath, makeBasicAuthHeaders()).then((response) => {+ request.get(subConfigPath, makeBasicAuthHeaders()).then((response) => {// Parse the YAMLconst configContent = yaml.load(response.data) || {};// Certain values must be inherited from root configdiff --git a/src/utils/CloudBackup.js b/src/utils/CloudBackup.jsindex 66a8e8b5..7654a5e8 100644--- a/src/utils/CloudBackup.js+++ b/src/utils/CloudBackup.js@@ -1,7 +1,7 @@import sha256 from 'crypto-js/sha256';import aes from 'crypto-js/aes';import Utf8 from 'crypto-js/enc-utf8';-import axios from 'axios';+import request from '@/utils/request';import { backupEndpoint } from '@/utils/defaults';const ENDPOINT = backupEndpoint; // 'https://dashy-sync-service.as93.net';@@ -20,13 +20,13 @@ const decryptData = (data, password) => aes.decrypt(data, password).toString(Utfconst makeSubHash = (pass) => sha256(pass).toString().slice(0, 14);/* Makes the backup */-export const backup = (data, password) => axios.post(ENDPOINT, {+export const backup = (data, password) => request.post(ENDPOINT, {userData: encryptData(data, password),subHash: makeSubHash(password),});/* Updates and existing backup */-export const update = (data, password, backupId) => axios.put(ENDPOINT, {+export const update = (data, password, backupId) => request.put(ENDPOINT, {backupId,userData: encryptData(data, password),subHash: makeSubHash(password),@@ -39,7 +39,7 @@ export const restore = (backupId, password) => {const params = encodeGetParams({ backupId, subHash: makeSubHash(password) });const url = `${ENDPOINT}/?${params}`;return new Promise((resolve, reject) => {- axios.get(url).then((response) => {+ request.get(url).then((response) => {if (!response.data || response.data.errorMsg) {reject(response.data.errorMsg || 'Error');} else {diff --git a/src/utils/HeaderAuth.js b/src/utils/HeaderAuth.jsindex ff3369e2..b36f98b0 100644--- a/src/utils/HeaderAuth.js+++ b/src/utils/HeaderAuth.js@@ -1,5 +1,5 @@-import axios from 'axios';import sha256 from 'crypto-js/sha256';+import request from '@/utils/request';import ConfigAccumulator from '@/utils/ConfigAccumalator';import { cookieKeys, localStorageKeys, serviceEndpoints } from '@/utils/defaults';import { InfoHandler, ErrorHandler, InfoKeys } from '@/utils/ErrorHandler';@@ -25,7 +25,7 @@ class HeaderAuth {login() {return new Promise((resolve, reject) => {const baseUrl = process.env.VUE_APP_DOMAIN || window.location.origin;- axios.get(`${baseUrl}${serviceEndpoints.getUser}`).then((response) => {+ request.get(`${baseUrl}${serviceEndpoints.getUser}`).then((response) => {if (!response.data) {reject(Error('Error, expected data nout returned'));} else if (response.data.errorMsg) {diff --git a/src/utils/InitServiceWorker.js b/src/utils/InitServiceWorker.jsindex 7cc6b6c1..7bdb9995 100644--- a/src/utils/InitServiceWorker.js+++ b/src/utils/InitServiceWorker.js@@ -1,6 +1,6 @@-import axios from 'axios';import yaml from 'js-yaml';import { register } from 'register-service-worker';+import request from '@/utils/request';import { sessionStorageKeys } from '@/utils/defaults';import { statusMsg, statusErrorMsg } from '@/utils/CoolConsole';@@ -33,7 +33,7 @@ const setSwStatus = (swStateToSet) => {* Or disable if user specified to disable*/const shouldEnableServiceWorker = async () => {- const conf = yaml.load((await axios.get('/conf.yml')).data);+ const conf = yaml.load((await request.get('/conf.yml')).data);if (conf && conf.appConfig && conf.appConfig.enableServiceWorker) {setSwStatus({ disabledByUser: false });return true;diff --git a/tests/components/item.test.js b/tests/components/item.test.jsindex d168617b..d39f618b 100644--- a/tests/components/item.test.js+++ b/tests/components/item.test.js@@ -6,7 +6,13 @@ import Vuex from 'vuex';import Item from '@/components/LinkItems/Item.vue';import router from '@/router';-vi.mock('axios', () => ({ default: { get: vi.fn(() => Promise.resolve({ data: {} })) } }));+vi.mock('@/utils/request', () => {+ const fn = vi.fn(() => Promise.resolve({ data: {} }));+ fn.get = vi.fn(() => Promise.resolve({ data: {} }));+ fn.post = vi.fn(() => Promise.resolve({ data: {} }));+ fn.put = vi.fn(() => Promise.resolve({ data: {} }));+ return { default: fn };+});vi.mock('@/router', () => ({ default: { push: vi.fn() } }));vi.mock('@/utils/ErrorHandler', () => ({ default: vi.fn() }));vi.mock('@/assets/interface-icons/interactive-editor-edit-mode.svg', () => ({