diff --git a/.env.dev b/.env.dev index a2a585c4..86a8333b 100644 --- a/.env.dev +++ b/.env.dev @@ -8,5 +8,5 @@ OIDC_ISSUER=http://127.0.0.1:8080/realms/dev MAP_MAPLIBRE_URL=assets/maps/gruene_map.json MAP_ADDRESSSEARCH_URL=https://maps.gruene.verdigado.net/nominatim -IP_SERVICE_V4_URL=https://ipv4.api.gruene.verdigado.net/v1/client-info -IP_SERVICE_V6_URL=https://ipv6.api.gruene.verdigado.net/v1/client-info +IP_V4_SERVICE_URL=https://ipv4.api.gruene.verdigado.net/v1/client-info +IP_V6_SERVICE_URL=https://ipv6.api.gruene.verdigado.net/v1/client-info diff --git a/.env.prod b/.env.prod index a50869d6..9b7f05ce 100644 --- a/.env.prod +++ b/.env.prod @@ -7,5 +7,5 @@ OIDC_ISSUER=https://saml.gruene.de/realms/gruenes-netz MAP_MAPLIBRE_URL=assets/maps/gruene_map.json MAP_ADDRESSSEARCH_URL=https://maps.gruene.verdigado.net/nominatim -IP_SERVICE_V4_URL=https://ipv4.api.gruene.verdigado.net/v1/client-info -IP_SERVICE_V6_URL=https://ipv6.api.gruene.verdigado.net/v1/client-info +IP_V4_SERVICE_URL=https://ipv4.api.gruene.verdigado.net/v1/client-info +IP_V6_SERVICE_URL=https://ipv6.api.gruene.verdigado.net/v1/client-info diff --git a/.env.staging b/.env.staging index fc037ce2..04eb7d00 100644 --- a/.env.staging +++ b/.env.staging @@ -7,5 +7,5 @@ OIDC_ISSUER=https://saml.gruene.de/realms/gruene-app-test MAP_MAPLIBRE_URL=https://maps.gruene.verdigado.net/styles/wkapp/style.json MAP_ADDRESSSEARCH_URL=https://nominatim.maps.tuerantuer.org/nominatim -IP_SERVICE_V4_URL=https://ipv4.api.gruene.verdigado.net/v1/client-info -IP_SERVICE_V6_URL=https://ipv6.api.gruene.verdigado.net/v1/client-info +IP_V4_SERVICE_URL=https://ipv4.api.gruene.verdigado.net/v1/client-info +IP_V6_SERVICE_URL=https://ipv6.api.gruene.verdigado.net/v1/client-info diff --git a/lib/app/auth/repository/auth_repository.dart b/lib/app/auth/repository/auth_repository.dart index bbe22ab1..45fdf34c 100644 --- a/lib/app/auth/repository/auth_repository.dart +++ b/lib/app/auth/repository/auth_repository.dart @@ -114,7 +114,7 @@ class AuthRepository { } final challenge = await authenticator.fetchChallenge(); - if (challenge != null && await _ipService.isOwnIP(challenge.ipAddress)) { + if (challenge != null && await _ipService.isOwnIp(challenge.ipAddress)) { stopPolling(timer); await authenticator.reply( challenge: challenge, diff --git a/lib/app/constants/config.dart b/lib/app/constants/config.dart index 1a8ca440..4f6cd072 100644 --- a/lib/app/constants/config.dart +++ b/lib/app/constants/config.dart @@ -17,8 +17,8 @@ class Config { static String get maplibreUrl => dotenv.env['MAP_MAPLIBRE_URL']!; static String get addressSearchUrl => dotenv.env['MAP_ADDRESSSEARCH_URL']!; - static String get ipServiceV4Url => dotenv.env['IP_SERVICE_V4_URL']!; - static String get ipServiceV6Url => dotenv.env['IP_SERVICE_V6_URL']!; + static String get ipV4ServiceUrl => dotenv.env['IP_V4_SERVICE_URL']!; + static String get ipV6ServiceUrl => dotenv.env['IP_V6_SERVICE_URL']!; static bool get androidFloss { // may be needed when building for f-droid store diff --git a/lib/app/services/ip_service.dart b/lib/app/services/ip_service.dart index de2affca..929c1157 100644 --- a/lib/app/services/ip_service.dart +++ b/lib/app/services/ip_service.dart @@ -4,15 +4,15 @@ import 'package:gruene_app/app/constants/config.dart'; import 'package:http/http.dart' as http; class IpService { - Future isOwnIP(String ip) async { - final isInputIPv6 = isIPv6(ip); - final publicIp = await getPublicIp(useIPv6: isInputIPv6); + Future isOwnIp(String ip) async { + final isInputIpV6 = isIpV6(ip); + final publicIp = await getPublicIp(useIpV6: isInputIpV6); return ip == publicIp; } - Future getPublicIp({bool useIPv6 = false}) async { + Future getPublicIp({bool useIpV6 = false}) async { try { - final url = useIPv6 ? Config.ipServiceV6Url : Config.ipServiceV4Url; + final url = useIpV6 ? Config.ipV6ServiceUrl : Config.ipV4ServiceUrl; final response = await http.get( Uri.parse(url), @@ -30,7 +30,7 @@ class IpService { } } - bool isIPv6(String ip) { + bool isIpV6(String ip) { try { final address = InternetAddress(ip); return address.type == InternetAddressType.IPv6;