Skip to content

Commit 2a167c7

Browse files
GeekInTheNorthGeekInTheNorth
committed
Remove Axios from the UI solution.
1 parent 0108d60 commit 2a167c7

26 files changed

Lines changed: 747 additions & 814 deletions

‎src/Stott.Security.Optimizely/Static/index-CFctIyW6.js‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Stott.Security.Optimizely/Static/index-dw7OcqWa.js‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Stott.Security.Ui/package-lock.json‎

Lines changed: 614 additions & 735 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Stott.Security.Ui/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"build-dotnet": "npm run clean-dotnet && npm run build && npm run copy-to-dotnet"
1414
},
1515
"dependencies": {
16-
"axios": "^1.13.2",
1716
"bootstrap": "^5.3.8",
1817
"date-fns": "^4.1.0",
1918
"prop-types": "^15.8.1",

‎src/Stott.Security.Ui/src/Audit/AuditHistory.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useState, useEffect } from 'react';
22
import PropTypes from 'prop-types';
3-
import axios from 'axios';
3+
import { httpGet } from '../Common/httpClient';
44
import { Container, Form, Button, Card } from 'react-bootstrap';
55
import DatePicker from "react-datepicker";
66
import "react-datepicker/dist/react-datepicker.css";
@@ -69,7 +69,7 @@ function AuditHistory(props) {
6969
};
7070

7171
const getAuditHistory = async () => {
72-
await axios.get(import.meta.env.VITE_AUDIT_LIST_URL, {params: {
72+
await httpGet(import.meta.env.VITE_AUDIT_LIST_URL, {
7373
dateFrom: startDate,
7474
dateTo: endDate,
7575
actionedBy: selectedUser,
@@ -78,7 +78,7 @@ function AuditHistory(props) {
7878
from: selectedFrom,
7979
take: selectedPageSize,
8080
searchTerm: debouncedSearchTerm
81-
}})
81+
})
8282
.then((response) => {
8383
if (selectedFrom === 0){
8484
setAuditHistory(response.data);
@@ -96,7 +96,7 @@ function AuditHistory(props) {
9696
const handleShowFailureToast = (title, description) => props.showToastNotificationEvent && props.showToastNotificationEvent(false, title, description);
9797

9898
const getAuditUsers = async () => {
99-
await axios.get(import.meta.env.VITE_AUDIT_USER_URL)
99+
await httpGet(import.meta.env.VITE_AUDIT_USER_URL)
100100
.then((response) => {
101101
setAuditUsers(response.data);
102102
},

‎src/Stott.Security.Ui/src/CSP/ConvertCspViolation.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useState } from 'react';
22
import PropTypes from 'prop-types';
33
import { Modal, Button } from "react-bootstrap";
4-
import axios from 'axios';
4+
import { httpPost } from '../Common/httpClient';
55

66
const ConvertCspViolation = (props) => {
77

@@ -31,7 +31,7 @@ const ConvertCspViolation = (props) => {
3131
params.append('directive', selectedDirective);
3232
if (props.appId) params.append('appId', props.appId);
3333
if (props.hostName) params.append('hostName', props.hostName);
34-
axios.post(import.meta.env.VITE_PERMISSION_APPEND_URL, params)
34+
httpPost(import.meta.env.VITE_PERMISSION_APPEND_URL, params)
3535
.then(() => {
3636
handleShowSuccessToast('Source Saved', 'Successfully saved the source: ' + selectedSource);
3737
handleCloseConvertModal();

‎src/Stott.Security.Ui/src/CSP/EditPermission.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useState } from 'react';
22
import PropTypes from 'prop-types';
3-
import axios from 'axios';
3+
import { httpDelete } from '../Common/httpClient';
44
import { Button } from 'react-bootstrap';
55
import PermissionModal from './PermissionModal';
66
import ConfirmationModal from '../Common/ConfirmationModal';
@@ -25,7 +25,7 @@ function EditPermission({ sourceData, reloadSourceEvent, showToastNotificationEv
2525

2626
const handleCommitDelete = () => {
2727
setShowDeleteModal(false);
28-
axios.delete(import.meta.env.VITE_PERMISSION_DELETE_URL + cspOriginalId)
28+
httpDelete(import.meta.env.VITE_PERMISSION_DELETE_URL + cspOriginalId)
2929
.then(() => {
3030
handleShowSuccessToast('Source Deleted', `Successfully deleted the source: ${cspOriginalSource}`);
3131
handleReloadSources();

‎src/Stott.Security.Ui/src/CSP/EditSettings.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useState, useEffect } from 'react';
22
import PropTypes from 'prop-types';
33
import { Button, Container, Form } from 'react-bootstrap';
4-
import axios from 'axios';
4+
import { httpGet, httpPost, httpDelete } from '../Common/httpClient';
55
import FormUrl from '../Common/FormUrl';
66

77
function EditSettings(props) {
@@ -31,7 +31,7 @@ function EditSettings(props) {
3131
}, [props.appId, props.hostName])
3232

3333
const getCspSettings = async () => {
34-
await axios.get(import.meta.env.VITE_SETTINGS_GET_URL, { params: { appId: props.appId, hostName: props.hostName } })
34+
await httpGet(import.meta.env.VITE_SETTINGS_GET_URL, { appId: props.appId, hostName: props.hostName })
3535
.then((response) => {
3636
let newAllowListVisbility = response.data.isAllowListEnabled ? 'my-3' : 'my-3 d-none';
3737
let newExternalUrlVisibility = response.data.useExternalReporting ? 'my-3' : 'my-3 d-none';
@@ -120,7 +120,7 @@ function EditSettings(props) {
120120

121121
const handleRevertToInherited = async () => {
122122
try {
123-
await axios.delete(import.meta.env.VITE_SETTINGS_DELETE_URL, { params: { appId: props.appId, hostName: props.hostName } });
123+
await httpDelete(import.meta.env.VITE_SETTINGS_DELETE_URL, { appId: props.appId, hostName: props.hostName });
124124
handleShowSuccessToast('Success', 'Settings reverted to inherited.');
125125
getCspSettings();
126126
} catch {
@@ -144,7 +144,7 @@ function EditSettings(props) {
144144
params.append('isUpgradeInsecureRequestsEnabled', isUpgradeInSecureRequestsEnabled);
145145
if (props.appId) params.append('appId', props.appId);
146146
if (props.hostName) params.append('hostName', props.hostName);
147-
axios.post(import.meta.env.VITE_SETTINGS_SAVE_URL, params)
147+
httpPost(import.meta.env.VITE_SETTINGS_SAVE_URL, params)
148148
.then(() => {
149149
handleShowSuccessToast('Success', 'CSP Settings have been successfully saved.');
150150
}, (error) => {

‎src/Stott.Security.Ui/src/CSP/PermissionList.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useState, useEffect } from 'react';
22
import PropTypes from 'prop-types';
3-
import axios from 'axios';
3+
import { httpGet } from '../Common/httpClient';
44
import EditPermission from './EditPermission'
55
import InheritedPermission from './InheritedPermission';
66
import AddPermission from './AddPermission';
@@ -12,7 +12,7 @@ const PermissionList = (props) => {
1212
const [cspSources, setSources] = useState([])
1313

1414
const getCspSources = async (sourceQuery, directiveQuery) => {
15-
await axios.get(import.meta.env.VITE_PERMISSION_LIST_URL, { params: { source: sourceQuery, directive: directiveQuery, appId: props.appId, hostName: props.hostName } })
15+
await httpGet(import.meta.env.VITE_PERMISSION_LIST_URL, { source: sourceQuery, directive: directiveQuery, appId: props.appId, hostName: props.hostName })
1616
.then((response) => {
1717
if (response.data && Array.isArray(response.data)){
1818
setSources(response.data);

‎src/Stott.Security.Ui/src/CSP/PermissionModal.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useState, useEffect, useCallback } from "react";
22
import PropTypes from 'prop-types';
33
import { Modal, Form, Button } from "react-bootstrap";
4-
import axios from 'axios';
4+
import { httpGet, httpPost } from '../Common/httpClient';
55

66
function PermissionModal(props){
77

@@ -114,7 +114,7 @@ function PermissionModal(props){
114114
}
115115
if (props.appId) params.append('appId', props.appId);
116116
if (props.hostName) params.append('hostName', props.hostName);
117-
axios.post(import.meta.env.VITE_PERMISSION_SAVE_URL, params)
117+
httpPost(import.meta.env.VITE_PERMISSION_SAVE_URL, params)
118118
.then(() => {
119119
// update visual state to match what has been saved.
120120
handleReloadSources();
@@ -155,7 +155,7 @@ function PermissionModal(props){
155155

156156
const getValidDirectives = useCallback(
157157
debounce(async (sourceName) => {
158-
axios.get(import.meta.env.VITE_PERMISSION_VALIDDIRECTIVES_URL, { params: { source: sourceName } })
158+
httpGet(import.meta.env.VITE_PERMISSION_VALIDDIRECTIVES_URL, { source: sourceName })
159159
.then((response) => {
160160
if (response.data && Array.isArray(response.data)){
161161
setValidDirectives(response.data);

0 commit comments

Comments
 (0)