Skip to content

Firefly III: a personal finances manager

Remove need for ip info token.

James Cole5cf0e90bb2db
diff --git a/.env.example b/.env.example
index d83e5434e5..3d64bd5380 100644
--- a/.env.example
+++ b/.env.example
@@ -282,7 +282,6 @@ BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
CACHE_PREFIX=firefly
PUSHER_KEY=
-IPINFO_TOKEN=
PUSHER_SECRET=
PUSHER_ID=
DEMO_USERNAME=
diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php
index ae269c25ec..d447b701ec 100644
--- a/app/Jobs/MailError.php
+++ b/app/Jobs/MailError.php
@@ -73,7 +73,6 @@ class MailError extends Job implements ShouldQueue
$args['loggedIn'] = $this->userData['id'] > 0;
$args['user'] = $this->userData;
$args['ip'] = $this->ipAddress;
- $args['token'] = config('firefly.ipinfo_token');
// limit number of error mails that can be sent.
if ($this->reachedLimit()) {
diff --git a/config/firefly.php b/config/firefly.php
index 7478b8bd17..a4770091f4 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -96,7 +96,6 @@ return [
// tokens and keys
'fixer_api_key' => env('FIXER_API_KEY', ''),
- 'ipinfo_token' => env('IPINFO_TOKEN', ''),
'static_cron_token' => env('STATIC_CRON_TOKEN'),
// flags
diff --git a/resources/views/emails/error/error-html.blade.php b/resources/views/emails/error/error-html.blade.php
index 7affd3d45b..4687d521d3 100644
--- a/resources/views/emails/error/error-html.blade.php
+++ b/resources/views/emails/error/error-html.blade.php
@@ -24,7 +24,7 @@
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-{{ trans('email.error_ip', ['ip' => $ip]) }} (<a href="https://ipinfo.io/{{ $ip }}/json?token={{ $token }}">info</a>)<br />
+{{ trans('email.error_ip', ['ip' => $ip]) }} (<a href="https://www.whatismyip.com/ip/{{ $ip }}/">info</a>)<br />
{{ $method }} {{ trans('email.error_url', ['url' => $url]) }}<br />
{{ trans('email.error_user_agent', ['userAgent' => $userAgent]) }}
</p>