fix(oauth-provider): accept query-only granular scopes#175
Merged
Conversation
`parseScope` only looked for `:` to find the resource prefix, so valid canonical scopes using the `prefix?query` form (e.g. a multi-collection `repo?collection=a&collection=b` produced by expanding a permission set) were rejected as `Unknown scope resource`. Use the earlier of `:` and `?` as the delimiter, matching `@atproto/oauth-scopes` syntax.
Deploying with
|
| Status | Name | Latest Commit | Updated (UTC) |
|---|---|---|---|
| ✅ Deployment successful! View logs |
atproto-pds | e5d3468 | May 24 2026, 03:23 PM |
commit: |
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.
Summary
parseScoperejected canonical granular scopes that use the query-only form (prefix?query), e.g.repo?collection=a&collection=b, withUnknown scope resource. It only looked for:to find the resource prefix.:and?as the prefix delimiter, matching@atproto/oauth-scopessyntax. Nowrepo?collection=…&collection=…is recognised as arepopermission.include:site.standard.authFull(a permission set with multiple collections in onerepopermission) serialises to a single query-form token, which then failed to parse.Test plan
packages/oauth-provider/test/scopes.test.tscovering the barerepo?collection=…form and the multi-collection case from thestandard.sitefailure.pnpm vitest run test/scopes.test.ts— 28 passing.