fix(oauth): rebase interoperable Basic token auth onto v1.6.8 - #22
Merged
Conversation
Rebase UsefulSoftwareCo#1448 onto v1.6.8 instead of dropping it. oauth4webapi form-encodes Basic credentials; Aikido compares them literally. Treat both "basic" and "basic_raw" as that interoperable encoding so existing rows and refresh keep working. Co-authored-by: Matt Hodgson <matthodgson@mac.com>
mhodgson
approved these changes
Sep 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The v1.6.8 sync skipped the fork's token-auth commits because upstream had already merged a different Basic implementation (UsefulSoftwareCo#1904 / UsefulSoftwareCo#1907). That was wrong: those commits were UsefulSoftwareCo/executor#1448 (still open), cherry-picked here for Aikido, and they were supposed to rebase onto the release.
UsefulSoftwareCo#1448's
"basic"is interoperable HTTP Basic: Base64 of the literal UTF-8client_id:client_secretpair. oauth4webapi's RFC-strict path form-encodes each component first, soAIK_CLIENT_…becomesAIK%5FCLIENT_…and Aikido rejects it.Upstream later split that into
"basic"(RFC-strict) and"basic_raw"(literal). Existing Aikido apps on this gateway are stored as"basic". This keeps UsefulSoftwareCo#1448's wire format for both"basic"and"basic_raw", so refresh and re-mint keep working. The Cloudflare D1token_endpoint_auth_methodALTER from UsefulSoftwareCo#1448 stays.Closes the mistaken removal in #21.
Verified
packages/core/sdkoauth-helpers+oauth-flowtests (120)apps/host-cloudflaredata-migrationstests (5)