Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f7fc352b
Commit
f7fc352b
authored
Jun 21, 2016
by
Timothy Andrew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add notices about disabling auth features for users with 2FA.
parent
5804b6a0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
0 deletions
+18
-0
doc/api/oauth2.md
doc/api/oauth2.md
+9
-0
doc/api/session.md
doc/api/session.md
+9
-0
No files found.
doc/api/oauth2.md
View file @
f7fc352b
...
@@ -65,6 +65,13 @@ curl -H "Authorization: Bearer OAUTH-TOKEN" https://localhost:3000/api/v3/user
...
@@ -65,6 +65,13 @@ curl -H "Authorization: Bearer OAUTH-TOKEN" https://localhost:3000/api/v3/user
## Resource Owner Password Credentials
## Resource Owner Password Credentials
## Deprecation Notice
1.
Starting in GitLab 9.0, the Resource Owner Password Credentials will be
*disabled*
for users with two-factor authentication turned on.
2.
These users can access the API using [personal access tokens] instead.
---
In this flow, a token is requested in exchange for the resource owner credentials (username and password).
In this flow, a token is requested in exchange for the resource owner credentials (username and password).
The credentials should only be used when there is a high degree of trust between the resource owner and the client (e.g. the
The credentials should only be used when there is a high degree of trust between the resource owner and the client (e.g. the
client is part of the device operating system or a highly privileged application), and when other authorization grant types are not
client is part of the device operating system or a highly privileged application), and when other authorization grant types are not
...
@@ -100,3 +107,5 @@ client = OAuth2::Client.new('the_client_id', 'the_client_secret', :site => "http
...
@@ -100,3 +107,5 @@ client = OAuth2::Client.new('the_client_id', 'the_client_secret', :site => "http
access_token = client.password.get_token('user@example.com', 'sekret')
access_token = client.password.get_token('user@example.com', 'sekret')
puts access_token.token
puts access_token.token
```
```
[
personal access tokens
]:
./README.md#personal-access-tokens
doc/api/session.md
View file @
f7fc352b
# Session
# Session
## Deprecation Notice
1.
Starting in GitLab 9.0, this feature will be
*disabled*
for users with two-factor authentication turned on.
2.
These users can access the API using [personal access tokens] instead.
---
You can login with both GitLab and LDAP credentials in order to obtain the
You can login with both GitLab and LDAP credentials in order to obtain the
private token.
private token.
...
@@ -45,3 +52,5 @@ Example response:
...
@@ -45,3 +52,5 @@ Example response:
"private_token"
:
"9koXpg98eAheJpvBs5tK"
"private_token"
:
"9koXpg98eAheJpvBs5tK"
}
}
```
```
[
personal access tokens
]:
./README.md#personal-access-tokens
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment