Hyundai EU - Add support for EVs by Nachtlatscher · Pull Request #25 · schmidtwmark/BetterBlueKit

Nachtlatscher · 2026-04-28T14:37:03Z

Changes Login to use refresh token.
Implementation to fetch data for EV Cars
Fix: #8

gitguardian · 2026-04-28T14:37:40Z

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

Since your pull request originates from a forked repository, GitGuardian is not able to associate the secrets uncovered with secret incidents on your GitGuardian dashboard.
Skipping this check run and merging your pull request will create secret incidents on your GitGuardian dashboard.

🔎 Detected hardcoded secret in your pull request

GitGuardian id	GitGuardian status	Secret	Commit	Filename
-	-	Generic High Entropy Secret	`3e3ceca`	Sources/BetterBlueKit/API/HyundaiEurope/HyundaiEuropeAPIClient.swift	View secret

🛠 Guidelines to remediate hardcoded secrets

Understand the implications of revoking this secret by investigating where it is used in your code.
Replace and store your secret safely. Learn here the best practices.
Revoke and rotate this secret.
If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider

following these best practices for managing and storing secrets including API keys and other credentials
install secret detection on pre-commit to catch secret before it leaves your machine and ease remediation.

^{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.}

schmidtwmark · 2026-04-28T14:47:08Z

Hey, thanks for sending this over! I'll review it later today.

jeroenvisser101 · 2026-04-28T15:55:27Z

@schmidtwmark if there's any way to test a build with this in it, I can give it a try and give feedback.

schmidtwmark · 2026-04-28T15:58:44Z

You can use bbcli to test the API directly. swift run bbcli should show help information to get started

There may be some changes needed to bbcli to support these fixes

Nachtlatscher · 2026-04-28T16:53:40Z

It is only a first draft where mainly the information fetch is working at least for my mj25 ioniq5.
I pushed it to my iphone via xcode and all i did till now seem to work.

Thats the current status tested with CCS2 endpoints:

lock/unlock -> working
car status including location -> working
Climate Control -> stop = should work but not tested; start = work in progress
Widget is showing miles instead of kilometers on iphone but in simulator on mac it is working.
Client secret is hardcoded in ApiClient and maybe should be moved out from there (nothing wild as python api is sharing it anyways)

Did i forget something?
My plan is also to show some more informations like „remaining energy“ converted to kWh.
But thats when it comes to real swift stuff and i am not really familar with it.
My Business is java development ;-)

Feel free to merge it already to provide the first draft also to others that may own an older model car.

jeroenvisser101 · 2026-04-28T17:29:14Z

@Nachtlatscher so to get the refresh token, do I just inspect the network traffic of the stock Bluelink app and intercept the refresh token?

Nachtlatscher · 2026-04-28T19:23:34Z

@Nachtlatscher so to get the refresh token, do I just inspect the network traffic of the stock Bluelink app and intercept the refresh token?

You need to do the login workaround of homeassitant project / phyton api to get the token.
In one of the issues here there is a link to
https://github.com/Puma7/KiaHyundaiToken

Maybe there is also some information about the process.

schmidtwmark

Looks like a good start! Some general feedback:

I like the idea of having ResponseKey / ResponseKeyPath, but I think it could be much cleaner. Instead of having getKeyForPath(string, bool), you should get the correct ResponseKey -> String map once at the top of the response based on whether it needs CCS2 or not. Then, you can just do keyPathMap[.chargeTime] or whatever to get the full path.

The response keys should be moved into the API/HyundaiEurope directory at minimum, and named appropriately. They are not relevant to other brands/regions

My understanding here is that this requires the user to use a separate Python script to fetch their refresh token, which is then fed into the password field. Is there a reason that cannot be integrated into bbcli / the BetterBlue app directly? As the person who will have to respond to emails about this, I'm going to get a lot of confused and angry people if they have to run a Python script.

schmidtwmark · 2026-04-28T19:36:07Z

+        public func convert(_ temperature: Double, to targetUnits: Units) -> Double {
+            let convertedTemperature: Double
+
+            convertedTemperature = switch (self, targetUnits) {


Let's reuse code here -- if you're going to add a convert function, then the format function should call it directly

schmidtwmark · 2026-04-28T19:47:52Z

    public var regId: String, vin: String, model: String
    public var accountId: UUID, fuelType: FuelType
    public var generation: Int, odometer: Distance, vehicleKey: String?
+    public var ccs2Supported: Bool


I think we need a better approach for handling region / brand specific options. Can we add an enum like:

case hyundaiEurope(ccs2Supported: bool) }``` Then I could make a separate PR for moving vehicleKey into a `case kiaUS` enum value

i currently rework that to a version you hopefully more happy with

schmidtwmark · 2026-04-28T19:50:53Z

    public let accessToken: String
    public let refreshToken: String
    public let expiresAt: Date
+    public var deviceId: String


There's already a notion of DeviceID in the APIClientConfiguration. Why do we need it here as well?

Yes it is but Hyundai/Kia Europe requires to register the device against the API.
And the configuration value cant be updated.
I dont know if this registration has some kind of lifetime.

Currently i see two szenarios:

give the possibility to update the deviceId in configuration

on Account init i see the configuration and the client is created.
Maybe it would be possible to call a "registerDevice()" with the created Api that saves the deviceId in "Account"
-> each time a client is created the config would use this stable id then.
-> config parameter still has to be editable because you first need to create the API to call the endpoint or return nil if its not implemented for that Api?

I tryed solution 2 but its not working
If i put in the function to ApiProtocolClient and write a default to prevent implementation for each Brand
it allways calls the default instead of EU Impl.
I don´t know why...

If you can provide the information how it should work or an other idea i would be happy.

Update i got it working now.
Maybe look again at current commit and tell me what you think about it

schmidtwmark · 2026-04-28T19:52:04Z

-    func commandPathAndBody(for command: VehicleCommand) -> (String, [String: Any]) {
+    func commandPathAndBody(for command: VehicleCommand, ccs2: Bool = true, deviceId: String)
+    -> (String, [String: Any]) {
        switch command {


This would be easier to read if you split this into two functions -- one for ccs2, one for legacy. Or, switch on (command, ccs2)

schmidtwmark

Thanks for the improvements, looking better!

schmidtwmark · 2026-04-30T11:59:03Z

        self.expiresAt = expiresAt
    }

+    public mutating func setDeviceID(_ deviceId: String) -> Self {


Do we still need this?

no it is not i forgot to delete it.

schmidtwmark · 2026-04-30T12:01:29Z

    }
 }
+
+public enum VehicleMarketOptions: Codable, Equatable, Sendable {


Something I hadn't thought about when I suggested this: this is going to end up stored in SwiftData, which is notoriously bad at handling data structures more complicated than arrays. I think this is the right approach, and having Codable should make it work, but in my experience this could lead to to some weird crashes on startup. Just make sure to test the full app thoroughly by fully killing and and reopening it -- if you see crashes when it tries to read this value, then there's a problem.

no crashes so far but i will do some more testing for sure.

schmidtwmark · 2026-04-30T12:04:01Z

    }

+    // MARK: - default so set deviceId in configuration
+    public func registerDevice() async throws -> String? {


It looks like this is is still creating a new deviceID, which should be handled by the Account in BetterBlue?

I did not find a better solution.
EU Hyundai and Kia need that deviceId requested by api call -> done corresponding method in HyundaiEuropeApi

Account does following:

Create an APIClient with an configuration (no deviceId)

this Client is used then to call "registerDevice() -> String?"
->if an Api does not define this method then the UUID is returned and set in currend used configuration
(thats more or less what you did in Account Line 122 for commented for kia but done for all)

If you look into ApiClient.swift there is a default implementation too (Line:144).
But i cant do the configuration overwrite there.

And the FakeAPIClient is the reason why there is still a default in Line 144 of ApiClient.
The FakeAPIClient is not a SubClass of APIBaseClient

What do you think?
Is there a better way?

schmidtwmark · 2026-04-30T12:04:14Z

        try await fetchVehicleStatus(for: vehicle, authToken: authToken, cached: true)
    }
+
+    public func registerDevice() async throws -> String? {


It's unclear what this is meant to be doing

see on the other comment.
Its just needed because FakeAPIClient

+ login as with username and password to generate access and refresh token + refresh token is used for login with priority after first login + parsing of CCNC and non CCNC car data + get a command token for command execution + add functions to get values directly from deeper json path

Nachtlatscher · 2026-05-04T12:06:54Z

@schmidtwmark sry for the force pushes i had to resolve conflicts with your lates changes and changed commit informations to my private Information instead of business one.

With this state of the branch i got rid of only using a refresh token.
Workflow is as follows:

add Account
fill in Username, Password, PIN, (Optional) Refresh Token
Login will be done by provided Refresh Token or by User and Password
If User and Password was used we get an Refresh Token from API that is saved into Account for further use

Each additional Login (Access Token expired) will use the Refresh Token to get a new Access Token.
User is able to delete the current Refresh Token from Account (next Login will get a new one).
<-- Thats needed because they expire after about 6-8 month

I think thats a good start for an initial merge.
I will then create a new branches for the different enhancements that are still to do.

schmidtwmark

This is looking pretty good!

One other thing to add -- BetterBlueKit includes bbcli, a CLI swift program that lets you login and fetch status. It's really useful for testing without having to run the entire BetterBlue app. It can also be used to test a captured JSON response without pinging the server again.

Can you add an (optional) refreshToken parameter to bbcli and the plumbing to read it correctly?

schmidtwmark · 2026-05-05T01:56:46Z

+        return current
+    }
+
+    private func getAnyFromJson(from data: [String: Any], key keyString: String?) -> Any? {


These functions could probably be moved into a generic API parsing swift file -- would be nice to reuse this keystring setup for other APIs!

+ if refresh token runs into error and password is given try to get a new refresh token + error if login fails because of credentials

schmidtwmark

This is looking good! I’m going to merge this (and the BetterBlue changes) as is later tonight. I’ll need to test and make sure it doesn’t break existing stuff, but then I’ll roll it out later this week.

Nachtlatscher · 2026-05-17T21:39:28Z

This is looking good! I’m going to merge this (and the BetterBlue changes) as is later tonight. I’ll need to test and make sure it doesn’t break existing stuff, but then I’ll roll it out later this week.

Nice i will look at the encrypted password flow commented to the issue. So that will maybe be the next step then to switch from unencrypted to encrypted one for next pull request.

lordz-ei · 2026-05-18T07:11:50Z

This is looking good! I’m going to merge this (and the BetterBlue changes) as is later tonight. I’ll need to test and make sure it doesn’t break existing stuff, but then I’ll roll it out later this week.

Let us know so we can test

schmidtwmark requested changes Apr 28, 2026

View reviewed changes

schmidtwmark requested changes Apr 30, 2026

View reviewed changes

Nachtlatscher force-pushed the hyundai_eu branch from 425a3ac to be34c3c Compare May 4, 2026 10:18

Nachtlatscher force-pushed the hyundai_eu branch from be34c3c to 3e3ceca Compare May 4, 2026 11:05

schmidtwmark requested changes May 5, 2026

View reviewed changes

Nachtlatscher added 2 commits May 17, 2026 13:28

update login flow

1fc7fc0

+ if refresh token runs into error and password is given try to get a new refresh token + error if login fails because of credentials

improvements and update of bbcli

6f5f078

schmidtwmark approved these changes May 17, 2026

View reviewed changes

schmidtwmark merged commit 3260694 into schmidtwmark:main May 18, 2026
1 check failed

Nachtlatscher deleted the hyundai_eu branch May 19, 2026 07:19

Conversation

Nachtlatscher commented Apr 28, 2026

Uh oh!

gitguardian Bot commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Uh oh!

schmidtwmark commented Apr 28, 2026

Uh oh!

jeroenvisser101 commented Apr 28, 2026

Uh oh!

schmidtwmark commented Apr 28, 2026

Uh oh!

Nachtlatscher commented Apr 28, 2026

Uh oh!

jeroenvisser101 commented Apr 28, 2026

Uh oh!

Nachtlatscher commented Apr 28, 2026

Uh oh!

schmidtwmark left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

schmidtwmark left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Nachtlatscher Apr 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Nachtlatscher commented May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

schmidtwmark left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

schmidtwmark left a comment

Choose a reason for hiding this comment

Uh oh!

Nachtlatscher commented May 17, 2026

Uh oh!

Uh oh!

lordz-ei commented May 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

gitguardian Bot commented Apr 28, 2026 •

edited

Loading

schmidtwmark left a comment •

edited

Loading

Nachtlatscher Apr 30, 2026 •

edited

Loading

Nachtlatscher commented May 4, 2026 •

edited

Loading