Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
pleroma-fe
Merge requests
!367
Move login to oauth.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Move login to oauth.
oauth
into
develop
Overview
40
Commits
12
Pipelines
11
Changes
13
Merged
lain
requested to merge
oauth
into
develop
6 years ago
Overview
31
Commits
12
Pipelines
11
Changes
1
Expand
This unifies Mastodon and Pleroma logins and makes it easier to implement SSO schemes.
0
0
Merge request reports
Compare
version 5
version 10
cf581b7d
6 years ago
version 9
1de382f0
6 years ago
version 8
a04795d7
6 years ago
version 7
50264410
6 years ago
version 6
bcbaf5d7
6 years ago
version 5
4d9680e7
6 years ago
version 4
fbe30b49
6 years ago
version 3
0aa5fe9d
6 years ago
version 2
60b3e4f4
6 years ago
version 1
9af204b2
6 years ago
develop (base)
and
version 6
latest version
9f64c967
12 commits,
6 years ago
version 10
cf581b7d
11 commits,
6 years ago
version 9
1de382f0
10 commits,
6 years ago
version 8
a04795d7
9 commits,
6 years ago
version 7
50264410
8 commits,
6 years ago
version 6
bcbaf5d7
7 commits,
6 years ago
version 5
4d9680e7
6 commits,
6 years ago
version 4
fbe30b49
4 commits,
6 years ago
version 3
0aa5fe9d
3 commits,
6 years ago
version 2
60b3e4f4
2 commits,
6 years ago
version 1
9af204b2
1 commit,
6 years ago
Show latest version
1 file
+
5
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/components/registration/registration.js
+
5
−
4
Options
@@ -33,10 +33,11 @@ const registration = {
}
oauthApi
.
getOrCreateApp
(
data
).
then
((
app
)
=>
{
oauthApi
.
getTokenWithCredentials
(
{
app
,
instance
:
data
.
instance
,
username
:
this
.
user
.
username
,
password
:
this
.
user
.
password
})
{
app
,
instance
:
data
.
instance
,
username
:
this
.
user
.
username
,
password
:
this
.
user
.
password
})
.
then
((
result
)
=>
{
this
.
$store
.
commit
(
'
setToken
'
,
result
.
access_token
)
this
.
$store
.
dispatch
(
'
loginUser
'
,
result
.
access_token
)
Loading