revert the api version upgrade, it wasn't forward-compatible enough

NorfairKing · Dec 8, 2021 · 489f5b5 · 489f5b5
1 parent 0d4e0b4
commit 489f5b5
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git 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"
+"0.2.1"
diff --git a/...st_resources/backup-get/input/v0.2.2.json → ...st_resources/backup-get/input/v0.3.0.json b/...st_resources/backup-get/input/v0.2.2.json → ...st_resources/backup-get/input/v0.3.0.json
diff --git a/...test_resources/file-put/input/v0.2.2.json → ...test_resources/file-put/input/v0.3.0.json b/...test_resources/file-put/input/v0.2.2.json → ...test_resources/file-put/input/v0.3.0.json
diff --git a/...en/test_resources/login/input/v0.2.2.json → ...en/test_resources/login/input/v0.3.0.json b/...en/test_resources/login/input/v0.2.2.json → ...en/test_resources/login/input/v0.3.0.json
diff --git a/...test_resources/register/input/v0.2.2.json → ...test_resources/register/input/v0.3.0.json b/...test_resources/register/input/v0.2.2.json → ...test_resources/register/input/v0.3.0.json
diff --git a/...gen/test_resources/sync/input/v0.2.2.json → ...gen/test_resources/sync/input/v0.3.0.json b/...gen/test_resources/sync/input/v0.2.2.json → ...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
@@ -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
@@ -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