Skip to content

Commit

Permalink
fix login, fix refresh
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewdias committed Jan 5, 2017
1 parent be8e500 commit c3101ca
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/common/js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ onMessage((request, sender, sendResponse) => {
return
}
if (request.action == 'login') {
manager.kitsu.login(request.username, request.password)
manager.kitsu.login(request.username, request.password).then((success) => {
sendResponse(success)
})
return
}
if (request.action == 'logout') {
Expand Down
3 changes: 2 additions & 1 deletion src/common/js/kitsu.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,13 @@ class Kitsu {
}

login(username, password) {
this.auth.owner.getToken(username, password).then((user) => {
return this.auth.owner.getToken(username, password).then((user) => {
localStorage.setItem('username', username)
localStorage.setItem('token', user.accessToken)
localStorage.setItem('refresh', user.refreshToken)
this.getUser().then((user) => { localStorage.setItem('id', user.id) })
this.authenticate(user.accessToken)
return true
})
}

Expand Down
2 changes: 1 addition & 1 deletion src/common/js/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Manager {
let { access_token, refresh_token } = authToken.data
localStorage.setItem('token', access_token)
localStorage.setItem('refresh', refresh_token)
this.kitsu.authenticate(token)
this.kitsu.authenticate(access_token)
})
}
}
Expand Down
7 changes: 5 additions & 2 deletions src/common/js/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const init = () => {
}

const loadUser = () => {
if (localStorage.getItem('username')) {
if (localStorage.getItem('token')) {
sendMessage({ action: 'user' }, (user) => {
avatar.src = user.avatar.medium
name.innerHTML = user.name
Expand Down Expand Up @@ -100,7 +100,10 @@ loginButton.onclick = (event) => {
action: 'login',
username: userField.value,
password: passField.value
}, loadUser())
}, (success) => {
if (success)
loadUser()
})
}

grayscale.onchange = (event) => {
Expand Down

0 comments on commit c3101ca

Please sign in to comment.