Skip to content

Commit 4de2229

Browse files
authored
Merge pull request #39209 from github/repo-sync
Repo sync
2 parents a6e4407 + a93afaf commit 4de2229

19 files changed

+88
-79
lines changed

content/admin/managing-iam/understanding-iam-for-enterprises/about-enterprise-managed-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Organization memberships (and repository access) can be managed manually, or you
8484

8585
## Authentication for {% data variables.enterprise.prodname_managed_users %}
8686

87-
The locations where {% data variables.enterprise.prodname_managed_users %} can authenticate to {% data variables.product.prodname_dotcom %} depends on how you configure authentication (SAML or OIDC). See [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/authenticating-with-a-managed-user-account).
87+
The locations where {% data variables.enterprise.prodname_managed_users %} can authenticate to {% data variables.product.prodname_dotcom %} depends on how you configure authentication (SAML or OIDC). See [AUTOTITLE](/authentication/authenticating-with-single-sign-on/authenticating-with-a-managed-user-account).
8888

8989
By default, when an unauthenticated user attempts to access your enterprise, {% data variables.product.company_short %} displays a 404 error. You can optionally enable automatic redirects to single sign-on (SSO) instead. See [AUTOTITLE](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-sso-for-unauthenticated-users).
9090

content/admin/managing-iam/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You can also configure and manage team synchronization for an individual organiz
4444
* You must use an Entra ID commercial tenant, not Gov Cloud.
4545
* You or your Entra ID administrator must be a Global administrator or a Privileged Role administrator in Entra ID.
4646
* You must enforce SAML single sign-on for organizations in your enterprise account with your supported IdP. For more information, see [AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise).
47-
* You must authenticate to your enterprise account using SAML SSO and the supported IdP. For more information, see [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on).
47+
* You must authenticate to your enterprise account using SAML SSO and the supported IdP. For more information, see [AUTOTITLE](/authentication/authenticating-with-single-sign-on).
4848

4949
## Managing team synchronization for Entra ID
5050

content/authentication/authenticating-with-saml-single-sign-on/index.md

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

content/authentication/authenticating-with-saml-single-sign-on/viewing-and-managing-your-active-saml-sessions.md

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
---
2-
title: About authentication with SAML single sign-on
2+
title: About authentication with single sign-on
33
intro: 'You can access an organization that uses single sign-on (SSO) by authenticating through an identity provider (IdP).'
44
redirect_from:
55
- /articles/about-authentication-with-saml-single-sign-on
66
- /github/authenticating-to-github/about-authentication-with-saml-single-sign-on
77
- /github/authenticating-to-github/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on
8+
- /authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on
89
versions:
910
ghec: '*'
1011
topics:
1112
- SSO
12-
shortTitle: SAML single sign-on
13+
shortTitle: Single sign-on
1314
---
1415
## About authentication with SSO
1516

@@ -19,7 +20,7 @@ Access to SSO protected `internal` resources in an enterprise, such as repositor
1920

2021
If you're a member of an {% data variables.enterprise.prodname_emu_enterprise %}, you will instead use a new account that is provisioned for you and controlled by your enterprise. {% data reusables.enterprise-accounts.emu-more-info-account %}
2122

22-
When you attempt to access most resources within an organization that uses SSO, {% data variables.product.prodname_dotcom %} will redirect you to the organization's SSO IdP to authenticate. After you successfully authenticate with your account on the IdP, the IdP redirects you back to {% data variables.product.prodname_dotcom %}, where you can access the organization's resources.
23+
When you attempt to access most resources within an organization that uses SSO, {% data variables.product.prodname_dotcom %} will redirect you to the organization's SSO identity provider (IdP) to authenticate. After you successfully authenticate with your account on the IdP, the IdP redirects you back to {% data variables.product.prodname_dotcom %}, where you can access the organization's resources.
2324

2425
{% data reusables.saml.resources-without-sso %}
2526

@@ -29,23 +30,23 @@ If you have recently authenticated with your organization's SAML IdP in your bro
2930

3031
{% data reusables.saml.you-must-periodically-authenticate %}
3132

32-
## Linked SAML identities
33+
## Linked external identities
3334

34-
When you authenticate with your IdP account and return to {% data variables.product.prodname_dotcom %}, {% data variables.product.prodname_dotcom %} will record a link in the organization or enterprise between your {% data variables.product.prodname_dotcom %} personal account and the SAML identity you signed into. This linked identity is used to validate your membership in that organization, and depending on your organization or enterprise setup, is also used to determine which organizations and teams you're a member of as well. Each {% data variables.product.prodname_dotcom %} account can be linked to exactly one SAML identity per organization. Likewise, each SAML identity can be linked to exactly one {% data variables.product.prodname_dotcom %} account in an organization.
35+
When you authenticate with your IdP account and return to {% data variables.product.prodname_dotcom %}, {% data variables.product.prodname_dotcom %} will record a link in the organization or enterprise between your {% data variables.product.prodname_dotcom %} personal account and the external identity you signed into. This linked identity is used to validate your membership in that organization, and depending on your organization or enterprise setup, is also used to determine which organizations and teams you're a member of as well. Each {% data variables.product.prodname_dotcom %} account can be linked to exactly one external identity per organization. Likewise, each external identity can be linked to exactly one {% data variables.product.prodname_dotcom %} account in an organization.
3536

36-
If you sign in with a SAML identity that is already linked to another {% data variables.product.prodname_dotcom %} account, you will receive an error message indicating that you cannot sign in with that SAML identity. This situation can occur if you are attempting to use a new {% data variables.product.prodname_dotcom %} account to work inside of your organization. If you didn't intend to use that SAML identity with that {% data variables.product.prodname_dotcom %} account, then you'll need to sign out of that SAML identity and then repeat the SAML login. If you do want to use that SAML identity with your {% data variables.product.prodname_dotcom %} account, you'll need to ask your admin to unlink your SAML identity from your old account, so that you can link it to your new account. Depending on the setup of your organization or enterprise, your admin may also need to reassign your identity within your SAML provider. For more information, see [AUTOTITLE](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity).
37+
If you sign in with an external identity that is already linked to another {% data variables.product.prodname_dotcom %} account, you will receive an error message indicating that you cannot sign in with that identity. This situation can occur if you are attempting to use a new {% data variables.product.prodname_dotcom %} account to work inside of your organization. If you didn't intend to use that external identity with that {% data variables.product.prodname_dotcom %} account, then you'll need to sign out of that external identity and then repeat the SSO login. If you do want to use that external identity with your {% data variables.product.prodname_dotcom %} account, you'll need to ask your administrator to unlink your external identity from your old account, so that you can link it to your new account. Depending on the setup of your organization or enterprise, your admin may also need to reassign your identity within your identity provider. For more information, see [AUTOTITLE](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity).
3738

38-
If the SAML identity you sign in with does not match the SAML identity that is currently linked to your {% data variables.product.prodname_dotcom %} account, you'll receive a warning that you are about to relink your account. Because your SAML identity is used to govern access and team membership, continuing with the new SAML identity can cause you to lose access to teams and organizations inside of {% data variables.product.prodname_dotcom %}. Only continue if you know that you're supposed to use that new SAML identity for authentication in the future.
39+
If the external identity you sign in with does not match the external identity that is currently linked to your {% data variables.product.prodname_dotcom %} account, you'll receive a warning that you are about to relink your account. As your external identity is used to govern access and team membership, continuing with the new external identity can cause you to lose access to teams and organizations inside of {% data variables.product.prodname_dotcom %}. Only continue if you know that you're supposed to use that new external identity for authentication in the future.
3940

40-
## Authorizing {% data variables.product.pat_generic %}s and SSH keys with SAML SSO
41+
## Authorizing {% data variables.product.pat_generic %}s and SSH keys with SSO
4142

42-
To use the API or Git on the command line to access protected content in an organization that uses SAML SSO, you will need to use an authorized {% data variables.product.pat_generic %} over HTTPS or an authorized SSH key.
43+
To use the API or Git on the command line to access protected content in an organization that uses SSO, you will need to use an authorized {% data variables.product.pat_generic %} over HTTPS or an authorized SSH key.
4344

4445
If you don't have a {% data variables.product.pat_generic %} or an SSH key, you can create a {% data variables.product.pat_generic %} for the command line or generate a new SSH key. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) or [AUTOTITLE](/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent).
4546

46-
To use a new or existing {% data variables.product.pat_generic %} or SSH key with an organization that uses or enforces SAML SSO, you will need to authorize the token or authorize the SSH key for use with a SAML SSO organization. For more information, see [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on) or [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on).
47+
To use a new or existing {% data variables.product.pat_generic %} or SSH key with an organization that uses or enforces SSO, you will need to authorize the token or authorize the SSH key for use with the organization. For more information, see [AUTOTITLE](/authentication/authenticating-with-single-sign-on/authorizing-a-personal-access-token-for-use-with-single-sign-on) or [AUTOTITLE](/authentication/authenticating-with-single-sign-on/authorizing-an-ssh-key-for-use-with-single-sign-on).
4748

48-
## About {% data variables.product.prodname_oauth_apps %}, {% data variables.product.prodname_github_apps %}, and SAML SSO
49+
## About {% data variables.product.prodname_oauth_apps %}, {% data variables.product.prodname_github_apps %}, and SSO
4950

5051
You must have an active SSO session each time you authorize an {% data variables.product.prodname_oauth_app %} or {% data variables.product.prodname_github_app %} in order to access an organization that uses or enforces SSO. If you do not have an active session for an organization that requires SSO when you sign into the app, the app will be unable to access that organization. You can create an active SSO session by navigating to `https://github.com/orgs/ORGANIZATION-NAME/sso` or `https://github.com/enterprises/ENTERPRISE-NAME/sso` in your browser.
5152

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
---
2-
title: Authorizing a personal access token for use with SAML single sign-on
3-
intro: 'To use a {% data variables.product.pat_v1 %} with an organization that uses SAML single sign-on (SSO), you must first authorize the token.'
2+
title: Authorizing a personal access token for use with single sign-on
3+
intro: 'To use a {% data variables.product.pat_v1 %} with an organization that uses single sign-on (SSO), you must first authorize the token.'
44
redirect_from:
55
- /articles/authorizing-a-personal-access-token-for-use-with-a-saml-single-sign-on-organization
66
- /articles/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on
77
- /github/authenticating-to-github/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on
88
- /github/authenticating-to-github/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on
9+
- /authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on
910
versions:
1011
ghec: '*'
1112
topics:
1213
- SSO
13-
shortTitle: '{% data variables.product.pat_generic_caps %} with SAML'
14+
shortTitle: '{% data variables.product.pat_generic_caps %} with SSO'
1415
---
1516
You must authorize your {% data variables.product.pat_v1 %} after creation before the token can access an organization that uses SAML single sign-on (SSO). Access to `internal` resources (repositories, projects, and packages) in an enterprise requires an SSO authorization for an organization within an enterprise. For more information about creating a new {% data variables.product.pat_v1 %}, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). {% data variables.product.pat_v2_caps %}s are authorized during token creation, before access to the organization is granted.
1617

@@ -21,6 +22,7 @@ You must authorize your {% data variables.product.pat_v1 %} after creation befor
2122
{% data reusables.user-settings.access_settings %}
2223
{% data reusables.user-settings.developer_settings %}
2324
{% data reusables.user-settings.personal_access_tokens %}
25+
2426
1. Next to the token you'd like to authorize, click **Configure SSO**. {% data reusables.saml.authenticate-with-saml-at-least-once %}
2527

2628
![Screenshot of a list entry for a {% data variables.product.pat_v1 %}. A dropdown menu, labeled "Configure SSO", is outlined in orange.](/assets/images/help/settings/sso-allowlist-button.png)
@@ -30,4 +32,4 @@ You must authorize your {% data variables.product.pat_v1 %} after creation befor
3032
## Further reading
3133

3234
* [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
33-
* [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)
35+
* [AUTOTITLE](/authentication/authenticating-with-single-sign-on/about-authentication-with-single-sign-on)
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
---
2-
title: Authorizing an SSH key for use with SAML single sign-on
3-
intro: 'To use an SSH key with an organization that uses SAML single sign-on (SSO), you must first authorize the key.'
2+
title: Authorizing an SSH key for use with single sign-on
3+
intro: 'To use an SSH key with an organization that uses single sign-on (SSO), you must first authorize the key.'
44
redirect_from:
55
- /articles/authorizing-an-ssh-key-for-use-with-a-saml-single-sign-on-organization
66
- /articles/authorizing-an-ssh-key-for-use-with-saml-single-sign-on
77
- /github/authenticating-to-github/authorizing-an-ssh-key-for-use-with-saml-single-sign-on
88
- /github/authenticating-to-github/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on
9+
- /authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on
910
versions:
1011
ghec: '*'
1112
topics:
1213
- SSO
13-
shortTitle: SSH Key with SAML
14+
shortTitle: SSH Key with SSO
1415
---
1516

1617
## About authorization of SSH keys
@@ -30,6 +31,7 @@ You do not need to authorize SSH certificates signed by your organization's SSH
3031

3132
{% data reusables.user-settings.access_settings %}
3233
{% data reusables.user-settings.ssh %}
34+
3335
1. To the right of the SSH key you'd like to authorize, click **Configure SSO**. {% data reusables.saml.authenticate-with-saml-at-least-once %}
3436

3537
![Screenshot of the "Authentication Keys" section. Next to a key, a dropdown menu, labeled "Configure SSO," is outlined in orange.](/assets/images/help/settings/ssh-sso-button.png)
@@ -38,4 +40,4 @@ You do not need to authorize SSH certificates signed by your organization's SSH
3840
## Further reading
3941

4042
* [AUTOTITLE](/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys)
41-
* [AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)
43+
* [AUTOTITLE](/authentication/authenticating-with-single-sign-on/about-authentication-with-single-sign-on)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
title: Authenticating with single sign-on
3+
intro: 'You can authenticate to {% data variables.product.github %} with single sign-on (SSO) and view your active sessions.'
4+
redirect_from:
5+
- /articles/authenticating-to-a-github-organization-with-saml-single-sign-on
6+
- /articles/authenticating-with-saml-single-sign-on
7+
- /github/authenticating-to-github/authenticating-with-saml-single-sign-on
8+
- /authentication/authenticating-with-saml-single-sign-on
9+
versions:
10+
ghec: '*'
11+
topics:
12+
- SSO
13+
children:
14+
- /authenticating-with-a-managed-user-account
15+
- /about-authentication-with-single-sign-on
16+
- /authorizing-an-ssh-key-for-use-with-single-sign-on
17+
- /authorizing-a-personal-access-token-for-use-with-single-sign-on
18+
- /viewing-and-managing-your-active-sso-sessions
19+
shortTitle: Authenticate with SSO
20+
---

0 commit comments

Comments
 (0)