Fix several issues with bunq import #1330

app/Services/IP/IPRetrievalInterface.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * IPRetrievalInterface.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\IP;
+
+/**
+ * Interface IPRetrievalInterface
+ *
+ * @package FireflyIII\Services\IP
+ */
+interface IPRetrievalInterface
+{
+
+    /**
+     * Returns the user's IP address.
+     *
+     * @return null|string
+     */
+    public function getIP(): ?string;
+}

app/Services/IP/IpifyOrg.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * IpifyOrg.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\IP;
+
+use Exception;
+use Log;
+use Requests;
+
+/**
+ * Class IpifyOrg
+ */
+class IpifyOrg implements IPRetrievalInterface
+{
+    /**
+     * Returns the user's IP address.
+     *
+     * @noinspection MultipleReturnStatementsInspection
+     * @return null|string
+     */
+    public function getIP(): ?string
+    {
+        $result = null;
+        try {
+            $response = Requests::get('https://api.ipify.org');
+        } catch (Exception $e) {
+            Log::warning(sprintf('The ipify.org service could not retrieve external IP: %s', $e->getMessage()));
+            Log::warning($e->getTraceAsString());
+
+            return null;
+        }
+        if (200 !== $response->status_code) {
+            Log::warning(sprintf('Could not retrieve external IP: %d %s', $response->status_code, $response->body));
+
+            return null;
+        }
+
+        return (string)$response->body;
+    }
+}