From 225588f3e7593f5a5bbc597be0fa4b3fbe8ae568 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Wed, 6 Nov 2024 13:50:47 +0100
Subject: [PATCH] Update changelog and API

---
 .../V1/Controllers/System/AboutController.php |  2 +-
 .../Models/Transaction/StoreRequest.php       |  2 +-
 .../Model/Transaction/StoreRequest.php        |  2 +-
 app/Support/Binder/EitherConfigKey.php        |  1 -
 changelog.md                                  | 21 ++-----------------
 config/firefly.php                            |  2 +-
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/app/Api/V1/Controllers/System/AboutController.php b/app/Api/V1/Controllers/System/AboutController.php
index 0b1bb117a9..cb82d4fe1b 100644
--- a/app/Api/V1/Controllers/System/AboutController.php
+++ b/app/Api/V1/Controllers/System/AboutController.php
@@ -52,7 +52,7 @@ class AboutController extends Controller
         $data
                        = [
                            'version'     => config('firefly.version'),
-                           'api_version' => config('firefly.api_version'),
+                           'api_version' => config('firefly.version'),
                            'php_version' => $phpVersion,
                            'os'          => $phpOs,
                            'driver'      => $currentDriver,
diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
index 74ff54ff12..320629f598 100644
--- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
@@ -138,7 +138,7 @@ class StoreRequest extends FormRequest
                 // all custom fields:
                 'internal_reference'    => $this->clearString((string)$object['internal_reference']),
                 'external_id'           => $this->clearString((string)$object['external_id']),
-                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'original_source'       => sprintf('ff3-v%s', config('firefly.version')),
                 'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
                 'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
                 'external_url'          => $this->clearString((string)$object['external_url']),
diff --git a/app/Api/V2/Request/Model/Transaction/StoreRequest.php b/app/Api/V2/Request/Model/Transaction/StoreRequest.php
index 872edca91e..aa6cf38490 100644
--- a/app/Api/V2/Request/Model/Transaction/StoreRequest.php
+++ b/app/Api/V2/Request/Model/Transaction/StoreRequest.php
@@ -147,7 +147,7 @@ class StoreRequest extends FormRequest
                 // all custom fields:
                 'internal_reference'    => $this->clearString((string)$object['internal_reference']),
                 'external_id'           => $this->clearString((string)$object['external_id']),
-                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'original_source'       => sprintf('ff3-v%s', config('firefly.version')),
                 'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
                 'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id']),
                 'external_url'          => $this->clearString((string)$object['external_url']),
diff --git a/app/Support/Binder/EitherConfigKey.php b/app/Support/Binder/EitherConfigKey.php
index a5a8494c76..17394866a8 100644
--- a/app/Support/Binder/EitherConfigKey.php
+++ b/app/Support/Binder/EitherConfigKey.php
@@ -39,7 +39,6 @@ class EitherConfigKey
 
             // firefly iii settings
             'firefly.version',
-            'firefly.api_version',
             'firefly.default_location',
             'firefly.account_to_transaction',
             'firefly.allowed_opposing_types',
diff --git a/changelog.md b/changelog.md
index ae4e7ed9f2..8a32209631 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,19 +9,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - #8092
 - #9183
-- Initial release.
-
-### Changed
-
-- Initial release.
-
-### Deprecated
-
-- Initial release.
-
-### Removed
-
-- Initial release.
 
 ### Fixed
 
@@ -41,16 +28,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - #9294
 - #9427
 
-### Security
-
-- Initial release.
-
 ### API
 
+- API version is no longer distinguished from Firefly III version. API jumps from v2.1.0 to v6.1.22
+- API v2 is cleaned up and misses a few previously available endpoints. They will be added in the future.
 - #9271
 
-- Initial release.
-
 ## 6.1.21 - 2024-09-30
 
 ### Added
diff --git a/config/firefly.php b/config/firefly.php
index 7ba69a7a45..586b4eca03 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -111,7 +111,7 @@ return [
         // see cer.php for exchange rates feature flag.
     ],
     'version'                      => 'develop/2024-11-04',
-    'api_version'                  => '2.1.0',
+    'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 
     // generic settings