Use new server configuration for logging in

This commit is contained in:
Andrew Miner
2016-05-15 19:52:21 -07:00
parent b34ca26d0a
commit 22009557d2
9 changed files with 21 additions and 18 deletions
+2 -2
View File
@@ -37,11 +37,11 @@ switch global.hostName
when 'prerender.crafting-guide.com'
global.env = 'prerender'
logger.level = Logger.FATAL
apiBaseUrl = 'http://local.crafting-guide.com:8001'
apiBaseUrl = 'http://local.crafting-guide.com:4347'
when 'local.crafting-guide.com', 'localhost'
global.env = 'local'
logger.level = Logger.DEBUG
apiBaseUrl = 'http://local.crafting-guide.com:8001'
apiBaseUrl = 'http://local.crafting-guide.com:4347'
when 'staging.crafting-guide.com'
global.env = 'staging'
logger.level = Logger.VERBOSE
@@ -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)=>
+3 -3
View File
@@ -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()