Skip to content

Don't check traffic policy for native tunnels #734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wojcik91 wants to merge 1 commit into from
Closed

Don't check traffic policy for native tunnels #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions ...tInstancePage/components/LocationsList/components/LocationCardRoute/LocationCardRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Toggle } from '../../../../../../../../shared/defguard-ui/components/La
import type { ToggleOption } from '../../../../../../../../shared/defguard-ui/components/Layout/Toggle/types';
import { clientApi } from '../../../../../../clientAPI/clientApi';
import {
ClientConnectionType,
ClientTrafficPolicy,
type CommonWireguardFields,
type DefguardInstance,
Expand Down Expand Up @@ -57,16 +58,23 @@ export const LocationCardRoute = ({ location, selectedDefguardInstance }: Props)
}, [LL.pages, selectedDefguardInstance?.client_traffic_policy]);

let selected: number;
if (selectedDefguardInstance?.client_traffic_policy === ClientTrafficPolicy.NONE) {
selected = Number(location?.route_all_traffic);
} else if (
selectedDefguardInstance?.client_traffic_policy ===
ClientTrafficPolicy.DISABLE_ALL_TRAFFIC
) {
selected = 0;
// check traffic policy for Defguard locations
if (location?.connection_type === ClientConnectionType.LOCATION) {
if (selectedDefguardInstance?.client_traffic_policy === ClientTrafficPolicy.NONE) {
selected = Number(location?.route_all_traffic);
} else if (
selectedDefguardInstance?.client_traffic_policy ===
ClientTrafficPolicy.DISABLE_ALL_TRAFFIC
) {
selected = 0;
} else {
selected = 1;
}
} else {
selected = 1;
// fall back to selected value for basic WireGuard tunnels
selected = Number(location?.route_all_traffic);
}

return (
<Toggle
className="location-traffic-toggle"
Expand Down
2 changes: 1 addition & 1 deletion ...components/LocationsList/modals/MFAModal/components/MfaMobileApprove/MfaMobileApprove.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const MfaMobileApprove = ({
socket?.close();
// go back to previous step
onCancel();
}
};

return (
<div id="mobile-approve-mfa">
Expand Down