Merge pull request #185 from itchannel/1.32-beta

1.32 beta

.github/workflows/combined.yaml

@@ -23,8 +23,4 @@ jobs:
       - uses: hacs/action@main
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CATEGORY: integration
-      - uses: KTibow/ha-blueprint@stable
-        name: CI
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CATEGORY: integration

custom_components/fordpass/fordpass_new.py

@@ -82,11 +82,11 @@ def auth(self):
         if r.status_code == 200:
             _LOGGER.debug("Succesfully fetched token Stage1")
             result = r.json()
-            data = {"code": result["access_token"]}
+            data = {"ciToken": result["access_token"]}
             headers = {**apiHeaders, "Application-Id": self.region}
             # Fetch OAUTH token stage 2 and refresh token
-            r = session.put(
-                "https://api.mps.ford.com/api/oauth2/v1/token",
+            r = session.post(
+                "https://api.mps.ford.com/api/token/v2/cat-with-ci-access-token",
                 data=json.dumps(data),
                 headers=headers,
             )
@@ -107,8 +107,8 @@ def refreshToken(self, token):
         data = {"refresh_token": token["refresh_token"]}
         headers = {**apiHeaders, "Application-Id": self.region}
 
-        r = session.put(
-            "https://api.mps.ford.com/api/oauth2/v1/refresh",
+        r = session.post(
+            "https://api.mps.ford.com/api/token/v2/cat-with-refresh-token",
             data=json.dumps(data),
             headers=headers,
         )

custom_components/fordpass/manifest.json

@@ -4,12 +4,12 @@
     "config_flow": true,
     "documentation": "https://github.com/itchannel/fordpass-ha",
     "issue_tracker": "https://github.com/itchannel/fordpass-ha/issues",
-    "version": "0.1.31",
+    "version": "0.1.32",
     "requirements": ["dotted==0.1.8"],
     "ssdp": [],
     "zeroconf": [],
     "homekit": {},
     "dependencies": [],
     "iot_class": "cloud_polling",
     "codeowners": ["@itchannel"]
-  }
+  }

custom_components/fordpass/strings.json

@@ -1,4 +1,5 @@
 {
+  "title": "Fordpass",
   "config": {
     "step": {
       "user": {

custom_components/fordpass/translations/en.json

@@ -30,5 +30,6 @@
                 "description": "Configure fordpass options"
             }
         }
-    }
+    }, 
+    "title": "Fordpass"
 }

hacs.json

@@ -1,5 +1,4 @@
 {
 	"name": "fordpass",
-	"content_in_root": false,
-	"iot_class": "cloud_polling"
+	"content_in_root": false
 }

info.md

@@ -1,6 +1,8 @@
 
 # **Changelog**
-- Fix for elvDTE error
+## Version 1.32
+- Fix auth flow to comply with new endpoints
+**Warning - If you encounter auth errors please delete the token file located in the install directory or use the "delete_token" service**
 ## Version 1.31
 - Fix for multiple accounts
 ## Version 1.30