Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into reply-qp-moderation
Browse files Browse the repository at this point in the history
* origin/main:
  Provide a ponyfill for CustomEvent (#2710)
  Ensure presence of DPoP related response headers (#2711)
  prettier ignore changelogs, as changesets not resolving prettier config properly
  Version packages (#2709)
  Export `AtpAgentOptions` type from @atproto/api (#2708)
  tidy
  Version packages (#2706)
  Update changeset to better reflect changes (#2707)
  Client SDK rework (#2483)
  Allow aud of pds or entryway for service auth tokens on pds (#2694)
  Version packages (#2692)
  Lex-cli prettier changes changeset (#2691)
  Version packages (#2689)
  PDS - inspect bearer tokens (#2688)
  Version packages (#2685)
  Service auth method binding - PDS (#2668)
  minor typos in descriptions and comments (#2681)
  Fix run-dev-env-logged command (#2682)
  Version packages (#2677)
  Tweak some wording in `oauth-client-browser` readme (#2678)
  • Loading branch information
estrattonbailey committed Aug 15, 2024
2 parents 56f77f0 + 0411278 commit 2c0e730
Show file tree
Hide file tree
Showing 436 changed files with 9,193 additions and 5,839 deletions.
5 changes: 5 additions & 0 deletions .changeset/giant-starfishes-fry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@atproto/xrpc-server": patch
---

Expose the request context for AuthVerifier and StreamAuthVerifier as distinct types
5 changes: 5 additions & 0 deletions .changeset/happy-eggs-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@atproto/pds": patch
---

Properly authenticate OAuth requests in catch all handler.
5 changes: 5 additions & 0 deletions .changeset/hot-cows-scream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@atproto/oauth-client": patch
---

Add CustomEvent ponyfill for enviroments that don't provide it
8 changes: 0 additions & 8 deletions .changeset/smart-ways-trade.md

This file was deleted.

3 changes: 3 additions & 0 deletions .github/workflows/repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
run_install: false
Expand All @@ -42,6 +43,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
run_install: false
Expand All @@ -62,6 +64,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
run_install: false
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ pnpm-lock.yaml
.pnpm*
.changeset
*.d.ts
packages/bsky/src/data-plane/gen
packages/bsky/src/data-plane/gen
CHANGELOG.md
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ run-dev-env: ## Run a "development environment" shell

.PHONY: run-dev-env-logged
run-dev-env-logged: ## Run a "development environment" shell (with logging)
LOG_ENABLED=true cd packages/dev-env; NODE_ENV=development pnpm run start | pnpm exec pino-pretty
cd packages/dev-env; LOG_ENABLED=true NODE_ENV=development pnpm run start | pnpm exec pino-pretty

.PHONY: codegen
codegen: ## Re-generate packages from lexicon/ files
Expand Down
2 changes: 1 addition & 1 deletion lexicons/app/bsky/feed/defs.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
},
"feedContext": {
"type": "string",
"description": "Context on a feed item that was orginally supplied by the feed generator on getFeedSkeleton.",
"description": "Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton.",
"maxLength": 2000
}
}
Expand Down
2 changes: 1 addition & 1 deletion lexicons/com/atproto/label/defs.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
"labelValueDefinition": {
"type": "object",
"description": "Declares a label value and its expected interpertations and behaviors.",
"description": "Declares a label value and its expected interpretations and behaviors.",
"required": ["identifier", "severity", "blurs", "locales"],
"properties": {
"identifier": {
Expand Down
17 changes: 16 additions & 1 deletion lexicons/com/atproto/server/getServiceAuth.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
"type": "string",
"format": "did",
"description": "The DID of the service that the token will be used to authenticate with"
},
"exp": {
"type": "integer",
"description": "The time in Unix Epoch seconds that the JWT expires. Defaults to 60 seconds in the future. The service may enforce certain time bounds on tokens depending on the requested scope."
},
"lxm": {
"type": "string",
"format": "nsid",
"description": "Lexicon (XRPC) method to bind the requested token to"
}
}
},
Expand All @@ -27,7 +36,13 @@
}
}
}
}
},
"errors": [
{
"name": "BadExpiration",
"description": "Indicates that the requested expiration date is not a valid. May be in the past or may be reliant on the requested scopes."
}
]
}
}
}
Loading

0 comments on commit 2c0e730

Please sign in to comment.