Use new server configuration for logging in
This commit is contained in:
@@ -79,9 +79,9 @@ module.exports = class LoginPageController extends PageController
|
||||
@$userName = @$('.user .name')
|
||||
|
||||
if (not @user?) and (@_params?.state?) and (@_params?.state is @loginSecurityToken)
|
||||
@_client.completeGitHubLogin code:@_params.code
|
||||
@_client.createSession code:@_params.code
|
||||
.then (response)=>
|
||||
attributes = response.json.data.user
|
||||
attributes = response.json
|
||||
if attributes?
|
||||
global.site.user = new GitHubUser attributes
|
||||
global.site.resumeAfterLogin()
|
||||
@@ -133,7 +133,7 @@ module.exports = class LoginPageController extends PageController
|
||||
return @State.ReadyToLogin
|
||||
|
||||
_compeleteLogin: (code)->
|
||||
@_client.completeGitHubLogin code:code
|
||||
@_client.createSession code:code
|
||||
.then (response)=>
|
||||
global.site.user = new GitHubUser response.json
|
||||
.catch (error)=>
|
||||
|
||||
@@ -59,9 +59,9 @@ module.exports = class SiteController extends BaseController
|
||||
@$pageContentLoading.addClass 'hidden'
|
||||
|
||||
loadCurrentUser: ->
|
||||
@client.fetchCurrentUser()
|
||||
@client.getCurrentUser()
|
||||
.then (response)=>
|
||||
userData = response.json?.data?.user
|
||||
userData = response.json
|
||||
@user = new GitHubUser userData if userData?
|
||||
.catch (error)=>
|
||||
if error?.response?.statusCode isnt 401
|
||||
@@ -77,7 +77,7 @@ module.exports = class SiteController extends BaseController
|
||||
logout: ->
|
||||
@storage.store 'loginSecurityToken', null
|
||||
@user = null
|
||||
@client.logout()
|
||||
@client.deleteSession()
|
||||
.catch (error)->
|
||||
logger.error -> "Failed to log out: #{error}"
|
||||
.done()
|
||||
|
||||
Reference in New Issue
Block a user