Skip to content

Commit 4b7523c

Browse files
authored
Merge pull request #44048 from github/repo-sync
Repo sync
2 parents a567735 + 337eca7 commit 4b7523c

8 files changed

Lines changed: 103 additions & 25 deletions

File tree

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
title: GitHub authentication discovery endpoints
3+
shortTitle: OAuth 2.0 and OIDC Discovery documents
4+
intro: '{% data variables.product.github %} publishes OAuth 2.0 and OpenID Connect metadata documents.'
5+
versions:
6+
fpt: '*'
7+
ghes: '*'
8+
ghec: '*'
9+
category:
10+
- Understand GitHub Apps
11+
---
12+
13+
> [!NOTE]
14+
> The {% data variables.product.github %} authentication metadata documents described in this article are in {% data variables.release-phases.public_preview %} and subject to change.
15+
> While the endpoints may be present on {% data variables.enterprise.data_residency %} and some versions of {% data variables.product.prodname_ghe_server %}, they contain incorrect information.
16+
17+
{% data variables.product.github %} publishes two metadata documents used in the OAuth 2.0 and OpenID Connect protocols:
18+
19+
* **OAuth 2.0 Authorization Server Metadata** ([RFC 8414](https://datatracker.ietf.org/doc/html/rfc8414)): `https://github.com/.well-known/oauth-authorization-server/login/oauth`
20+
* **OpenID Connect Discovery** ([OpenID Connect Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html)): `https://github.com/login/oauth/.well-known/openid-configuration`
21+
22+
These documents are used to validate tokens issued by {% data variables.product.github %} as well as programmatically determine how to sign in a user.
23+
24+
## Intended use
25+
26+
These documents are only published for MCP clients using [RFC 9728](https://datatracker.ietf.org/doc/html/rfc9728) to discover the OAuth 2.0 endpoints needed to get a token for the {% data variables.product.github %} MCP server.
27+
28+
{% data variables.product.github %} does not currently implement OpenID Connect in its OAuth flows and does not issue ID tokens for users or apps.
29+
30+
## Issuer
31+
32+
The issuer for {% data variables.product.prodname_dotcom_the_website %} is `https://github.com/login/oauth`.
33+
34+
This is the base URL used to find the other documents listed and an important parameter when configuring authentication libraries.
35+
36+
## Difference from GitHub Actions tokens
37+
38+
These metadata documents do not apply to the tokens issued for {% data variables.product.prodname_actions %} workflows. {% data variables.product.prodname_actions %} uses a separate dedicated issuer and token profile. For more information about Actions tokens, see [AUTOTITLE](/actions/concepts/security/openid-connect).

content/apps/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ children:
4141
- /maintaining-github-apps
4242
- /github-marketplace
4343
- /oauth-apps
44+
- /github-authentication-discovery-endpoints
4445
redirect_from:
4546
- /developers
4647
- /developers/apps/getting-started-with-apps

content/copilot/concepts/billing/usage-based-billing-for-individuals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ You will have the option to:
7575
* Cancel your plan and receive a prorated refund.
7676
* Wait to be downgraded to {% data variables.copilot.copilot_free_short %} at renewal time.
7777

78-
Note that, starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/models-and-pricing#model-multipliers-for-annual-copilot-pro-and-copilot-pro-subscribers).
78+
Note that, starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/model-multipliers-for-annual-plans).
7979

8080
## Next steps
8181

content/copilot/reference/copilot-billing/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ intro: Find billing information about {% data variables.product.prodname_copilot
55
versions:
66
feature: copilot
77
children:
8-
- /models-and-pricing
8+
- /models-and-pricing
9+
- /model-multipliers-for-annual-plans
910
- /billing-cycle
1011
- /seat-assignment
1112
- /license-changes
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
title: Model multipliers for annual plans staying on request-based billing
3+
intro: 'After June 1, 2026, model multipliers will change for {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers staying on annual plans under request-based billing.'
4+
shortTitle: Model multipliers for annual plans
5+
versions:
6+
feature: copilot
7+
category:
8+
- Learn about Copilot
9+
allowTitleToDifferFromFilename: true
10+
contentType: reference
11+
---
12+
13+
> [!IMPORTANT] The model multiplier changes outlined in this article apply only to {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers who stay on their **existing annual plan** after June 1, 2026 and remain on the **premium request-based billing** model.
14+
>
15+
> If you choose to switch to monthly usage-based billing (with a prorated refund), these multiplier changes **do not apply** to you.
16+
17+
## What is changing with {% data variables.product.prodname_copilot_short %} billing?
18+
19+
{% data variables.product.github %} is changing how {% data variables.product.prodname_copilot_short %} usage is measured and billed.
20+
21+
Today, each model interaction costs one premium request unit (PRU), and a multiplier is applied based on which model you use—more powerful models use more premium requests. Model multipliers are a concept specific to the current request-based billing system.
22+
23+
**Starting June 1, 2026**, {% data variables.product.github %} is replacing request-based billing with usage-based billing, where the cost of an interaction depends on two things: the model and the number of tokens consumed.
24+
25+
Under usage-based billing, each plan will come with an included allowance of {% data variables.product.prodname_ai_credits %}, with the option to set a budget for additional usage.
26+
27+
Model multipliers **do not apply** to usage-based billing.
28+
29+
## What are my options as a {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} user on an existing annual plan?
30+
31+
If you're on an existing **annual plan** for {% data variables.copilot.copilot_pro_short %} or {% data variables.copilot.copilot_pro_plus_short %}, you will have the option to:
32+
* **Stay** on your existing annual plan under premium request-based billing. When your annual plan ends, you'll be automatically downgraded to {% data variables.copilot.copilot_free_short %}.
33+
* **Cancel** your plan, receive a prorated refund, and optionally, re-subscribe to the equivalent monthly paid plan.
34+
* **Upgrade** to a monthly paid plan and receive prorated credits for the remaining value of the annual plan. For example, if you're on a {% data variables.copilot.copilot_pro_short %} annual plan, you can upgrade to a monthly {% data variables.copilot.copilot_pro_plus_short %} plan.
35+
36+
## What happens if I keep my annual plan?
37+
38+
Your existing annual plan will continue to track your {% data variables.product.prodname_copilot_short %} expenditure using premium requests, combined with the model multiplier, until the plan ends.
39+
40+
In addition, if you keep your annual plan under request-based billing, you will experience changes to model multipliers starting **June 1, 2026**. The table below shows how the multipliers for each model will adjust.
41+
42+
## Model multipliers for annual {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers
43+
44+
The table below shows how the multipliers for each model will change on June 1, 2026.
45+
46+
These new multipliers will **only apply** if you remain on an annual {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} under the premium request-based billing model _after_ June 1, 2026.
47+
48+
Model multipliers and costs are subject to change.
49+
50+
| Model | Current multiplier | New multiplier |
51+
| --- | ---: | ---: |
52+
| {% for entry in tables.copilot.annual-subscriber-model-multipliers %} |
53+
| {{ entry.model }} | {{ entry.current_multiplier }} | {{ entry.new_multiplier }} |
54+
| {% endfor %} |
55+
56+
## Next steps
57+
58+
* To understand more about how usage-based billing works, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals).
59+
* To learn more about model prices under usage-based billing, see [AUTOTITLE](/copilot/reference/copilot-billing/models-and-pricing).
60+
* To compare how your expenditure will look under usage-based billing compared to request-based billing, see [AUTOTITLE](/copilot/how-tos/manage-and-track-spending/prepare-for-your-move-to-usage-based-billing).

content/copilot/reference/copilot-billing/models-and-pricing.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@ You can view your current {% data variables.product.prodname_actions %} usage fo
112112

113113
<!-- expires 2026-06-01 -->
114114

115-
Starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. The table below shows how the multipliers for each model will adjust.
115+
Starting June 1, 2026, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers who choose to remain on **existing annual billing plans** and stay on the **request-based billing** model will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/model-multipliers-for-annual-plans).
116116

117117
<!-- end expires 2026-06-01 -->
118-
119-
Model multipliers and costs are subject to change.
120-
121-
For information about your options as an annual subscriber, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals#if-youre-on-an-annual-plan).
122-
123-
| Model | Current multiplier | New multiplier |
124-
| --- | ---: | ---: |
125-
| {% for entry in tables.copilot.annual-subscriber-model-multipliers %} |
126-
| {{ entry.model }} | {{ entry.current_multiplier }} | {{ entry.new_multiplier }} |
127-
| {% endfor %} |

data/reusables/copilot/copilot-edits/about-copilot-edits.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

data/reusables/copilot/signup-procedure-org.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)