diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 21:08:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 21:08:33 +0300 |
commit | 24d67ec55454fc6f4e8e80bf7c8dc5bc677e8514 (patch) | |
tree | 6ce73c2fd8ec96c6f043c4a1403c0991fd448b81 /doc/integration/oauth_provider.md | |
parent | a0fdcfcdd514c2af98f18cadfa75f8a6a85b4d2c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/oauth_provider.md')
-rw-r--r-- | doc/integration/oauth_provider.md | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index e33f874d35a..4031f3a52e7 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -86,7 +86,7 @@ To create an application for your GitLab instance: When creating application in the **Admin Area** , you can mark it as _trusted_. The user authorization step is automatically skipped for this application. -## Expiring access tokens +## Access token expiration > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/21745) in GitLab 14.3, with the ability to opt out. > - Ability to opt-out of expiring access token [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/340848) in GitLab 15.0. @@ -97,12 +97,7 @@ in GitLab 14.3 and [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/34084 existing integrations must be updated to support access token refresh. Access tokens expire in two hours which means that integrations that use them must support generating new access -tokens at least every two hours. Existing: - -- Applications can have expiring access tokens: - 1. Edit the application. - 1. Select **Expire access tokens**. -- Tokens must be [revoked](../api/oauth2.md#revoke-a-token) or they don't expire. +tokens at least every two hours. When applications are deleted, all grants and tokens associated with the application are also deleted. |