From 489f5b510c9a30a3c79fef0a0d1a796464705923 Mon Sep 17 00:00:00 2001
From: Tom Sydney Kerckhove <syd@cs-syd.eu>
Date: Thu, 9 Dec 2021 00:50:28 +0100
Subject: [PATCH] revert the api version upgrade, it wasn't forward-compatible
 enough

---
 smos-api-gen/test_resources/api-version/output.json    |  2 +-
 .../backup-get/input/{v0.2.2.json => v0.3.0.json}      |  0
 .../file-put/input/{v0.2.2.json => v0.3.0.json}        |  0
 .../login/input/{v0.2.2.json => v0.3.0.json}           |  0
 .../register/input/{v0.2.2.json => v0.3.0.json}        |  0
 .../sync/input/{v0.2.2.json => v0.3.0.json}            |  0
 smos-api/src/Smos/API.hs                               | 10 +++++-----
 smos-client/src/Smos/Client.hs                         |  2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename smos-api-gen/test_resources/backup-get/input/{v0.2.2.json => v0.3.0.json} (100%)
 rename smos-api-gen/test_resources/file-put/input/{v0.2.2.json => v0.3.0.json} (100%)
 rename smos-api-gen/test_resources/login/input/{v0.2.2.json => v0.3.0.json} (100%)
 rename smos-api-gen/test_resources/register/input/{v0.2.2.json => v0.3.0.json} (100%)
 rename smos-api-gen/test_resources/sync/input/{v0.2.2.json => v0.3.0.json} (100%)

diff --git a/smos-api-gen/test_resources/api-version/output.json b/smos-api-gen/test_resources/api-version/output.json
index fa85d2196..dc19bc2b2 100644
--- a/smos-api-gen/test_resources/api-version/output.json
+++ b/smos-api-gen/test_resources/api-version/output.json
@@ -1 +1 @@
-"0.2.2"
\ No newline at end of file
+"0.2.1"
\ No newline at end of file
diff --git a/smos-api-gen/test_resources/backup-get/input/v0.2.2.json b/smos-api-gen/test_resources/backup-get/input/v0.3.0.json
similarity index 100%
rename from smos-api-gen/test_resources/backup-get/input/v0.2.2.json
rename to smos-api-gen/test_resources/backup-get/input/v0.3.0.json
diff --git a/smos-api-gen/test_resources/file-put/input/v0.2.2.json b/smos-api-gen/test_resources/file-put/input/v0.3.0.json
similarity index 100%
rename from smos-api-gen/test_resources/file-put/input/v0.2.2.json
rename to smos-api-gen/test_resources/file-put/input/v0.3.0.json
diff --git a/smos-api-gen/test_resources/login/input/v0.2.2.json b/smos-api-gen/test_resources/login/input/v0.3.0.json
similarity index 100%
rename from smos-api-gen/test_resources/login/input/v0.2.2.json
rename to smos-api-gen/test_resources/login/input/v0.3.0.json
diff --git a/smos-api-gen/test_resources/register/input/v0.2.2.json b/smos-api-gen/test_resources/register/input/v0.3.0.json
similarity index 100%
rename from smos-api-gen/test_resources/register/input/v0.2.2.json
rename to smos-api-gen/test_resources/register/input/v0.3.0.json
diff --git a/smos-api-gen/test_resources/sync/input/v0.2.2.json b/smos-api-gen/test_resources/sync/input/v0.3.0.json
similarity index 100%
rename from smos-api-gen/test_resources/sync/input/v0.2.2.json
rename to smos-api-gen/test_resources/sync/input/v0.3.0.json
diff --git a/smos-api/src/Smos/API.hs b/smos-api/src/Smos/API.hs
index dcc97dcad..dcd756f74 100644
--- a/smos-api/src/Smos/API.hs
+++ b/smos-api/src/Smos/API.hs
@@ -56,7 +56,7 @@ import Smos.Report.Agenda
 import Smos.Report.Next
 
 apiVersion :: Version
-apiVersion = version 0 2 2 [] []
+apiVersion = version 0 2 1 [] []
 
 smosAPI :: Proxy SmosAPI
 smosAPI = Proxy
@@ -167,12 +167,12 @@ instance HasCodec Register where
     object "Register" $
       Register
         <$> parseAlternative
-          (requiredField "username" "username")
           (requiredField "registerUsername" "legacy key")
+          (requiredField "username" "username")
           .= registerUsername
         <*> parseAlternative
-          (requiredField "password" "password")
           (requiredField "registerPassword" "legacy key")
+          (requiredField "password" "password")
           .= registerPassword
 
 type PostLogin =
@@ -195,8 +195,8 @@ instance HasCodec Login where
   codec =
     object "Login" $
       Login
-        <$> parseAlternative (requiredField "username" "username") (requiredField "loginUsername" "legacy key") .= loginUsername
-        <*> parseAlternative (requiredField "password" "password") (requiredField "loginPassword" "legacy key") .= loginPassword
+        <$> parseAlternative (requiredField "loginUsername" "legacy key") (requiredField "username" "username") .= loginUsername
+        <*> parseAlternative (requiredField "loginPassword" "legacy key") (requiredField "password" "password") .= loginPassword
 
 type PostStripeHook = "stripe" :> ReqBody '[JSON] JSON.Value :> PostNoContent '[JSON] NoContent
 
diff --git a/smos-client/src/Smos/Client.hs b/smos-client/src/Smos/Client.hs
index b0de9d980..9ed80ba1c 100644
--- a/smos-client/src/Smos/Client.hs
+++ b/smos-client/src/Smos/Client.hs
@@ -72,7 +72,7 @@ oldestSupportedAPIVersion = version 0 0 0 [] []
 
 -- | Update this to a newer version than the current to build in forward-compatibility
 newestSupportedAPIVersion :: Version
-newestSupportedAPIVersion = apiVersion
+newestSupportedAPIVersion = version 0 3 0 [] []
 
 clientVersionCheck :: ClientM (Version, VersionCheck)
 clientVersionCheck = do