Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
wxcafé
funkwhale
Commits
f1557ac4
Verified
Commit
f1557ac4
authored
7 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
Fixed #57: now refresh jwt token on page refresh
parent
8fa73306
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
api/config/api_urls.py
+2
-3
2 additions, 3 deletions
api/config/api_urls.py
api/tests/users/test_views.py
+35
-0
35 additions, 0 deletions
api/tests/users/test_views.py
front/package.json
+1
-0
1 addition, 0 deletions
front/package.json
front/src/store/auth.js
+15
-1
15 additions, 1 deletion
front/src/store/auth.js
with
53 additions
and
4 deletions
api/config/api_urls.py
+
2
−
3
View file @
f1557ac4
...
...
@@ -46,9 +46,8 @@ v1_patterns += [
include
(
(
'
funkwhale_api.users.api_urls
'
,
'
users
'
),
namespace
=
'
users
'
)),
url
(
r
'
^token/
'
,
jwt_views
.
obtain_jwt_token
),
url
(
r
'
^token/refresh/
'
,
jwt_views
.
refresh_jwt_token
),
url
(
r
'
^token/$
'
,
jwt_views
.
obtain_jwt_token
,
name
=
'
token
'
),
url
(
r
'
^token/refresh/$
'
,
jwt_views
.
refresh_jwt_token
,
name
=
'
token_refresh
'
),
]
urlpatterns
=
[
...
...
This diff is collapsed.
Click to expand it.
api/tests/users/test_views.py
+
35
−
0
View file @
f1557ac4
...
...
@@ -62,3 +62,38 @@ def test_can_fetch_data_from_api(client, factories):
assert
payload
[
'
name
'
]
==
user
.
name
assert
payload
[
'
permissions
'
][
'
import.launch
'
][
'
status
'
]
assert
payload
[
'
permissions
'
][
'
settings.change
'
][
'
status
'
]
def
test_can_get_token_via_api
(
client
,
factories
):
user
=
factories
[
'
users.User
'
]()
url
=
reverse
(
'
api:v1:token
'
)
payload
=
{
'
username
'
:
user
.
username
,
'
password
'
:
'
test
'
}
response
=
client
.
post
(
url
,
payload
)
assert
response
.
status_code
==
200
assert
'"
token
"
:
'
in
response
.
content
.
decode
(
'
utf-8
'
)
def
test_can_refresh_token_via_api
(
client
,
factories
):
# first, we get a token
user
=
factories
[
'
users.User
'
]()
url
=
reverse
(
'
api:v1:token
'
)
payload
=
{
'
username
'
:
user
.
username
,
'
password
'
:
'
test
'
}
response
=
client
.
post
(
url
,
payload
)
assert
response
.
status_code
==
200
token
=
json
.
loads
(
response
.
content
.
decode
(
'
utf-8
'
))[
'
token
'
]
url
=
reverse
(
'
api:v1:token_refresh
'
)
response
=
client
.
post
(
url
,{
'
token
'
:
token
})
assert
response
.
status_code
==
200
assert
'"
token
"
:
'
in
response
.
content
.
decode
(
'
utf-8
'
)
# a different token should be returned
assert
token
in
response
.
content
.
decode
(
'
utf-8
'
)
This diff is collapsed.
Click to expand it.
front/package.json
+
1
−
0
View file @
f1557ac4
...
...
@@ -16,6 +16,7 @@
"dependencies"
:
{
"dateformat"
:
"^2.0.0"
,
"js-logger"
:
"^1.3.0"
,
"jwt-decode"
:
"^2.2.0"
,
"lodash"
:
"^4.17.4"
,
"semantic-ui-css"
:
"^2.2.10"
,
"vue"
:
"^2.3.3"
,
...
...
This diff is collapsed.
Click to expand it.
front/src/store/auth.js
+
15
−
1
View file @
f1557ac4
import
Vue
from
'
vue
'
import
jwtDecode
from
'
jwt-decode
'
import
config
from
'
@/config
'
import
logger
from
'
@/logging
'
import
router
from
'
@/router
'
const
LOGIN_URL
=
config
.
API_URL
+
'
token/
'
const
REFRESH_TOKEN_URL
=
config
.
API_URL
+
'
token/refresh/
'
const
USER_PROFILE_URL
=
config
.
API_URL
+
'
users/users/me/
'
export
default
{
...
...
@@ -13,7 +15,8 @@ export default {
username
:
''
,
availablePermissions
:
{},
profile
:
null
,
token
:
''
token
:
''
,
tokenData
:
{}
},
getters
:
{
header
:
state
=>
{
...
...
@@ -32,6 +35,7 @@ export default {
},
token
:
(
state
,
value
)
=>
{
state
.
token
=
value
state
.
tokenData
=
jwtDecode
(
value
)
},
permission
:
(
state
,
{
key
,
status
})
=>
{
state
.
availablePermissions
[
key
]
=
status
...
...
@@ -70,6 +74,7 @@ export default {
commit
(
'
token
'
,
jwt
)
logger
.
default
.
info
(
'
Logged back in as
'
+
username
)
dispatch
(
'
fetchProfile
'
)
dispatch
(
'
refreshToken
'
)
}
else
{
logger
.
default
.
info
(
'
Anonymous user
'
)
commit
(
'
authenticated
'
,
false
)
...
...
@@ -90,6 +95,15 @@ export default {
},
(
response
)
=>
{
logger
.
default
.
info
(
'
Error while fetching user profile
'
)
})
},
refreshToken
({
commit
,
dispatch
,
state
})
{
let
resource
=
Vue
.
resource
(
REFRESH_TOKEN_URL
)
return
resource
.
save
({},
{
token
:
state
.
token
}).
then
(
response
=>
{
logger
.
default
.
info
(
'
Refreshed auth token
'
)
commit
(
'
token
'
,
response
.
data
.
token
)
},
response
=>
{
logger
.
default
.
error
(
'
Error while refreshing token
'
,
response
.
data
)
})
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment