Use new server configuration for logging in
This commit is contained in:
@@ -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)=>
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -143,7 +143,7 @@ screen.type.compute = ->
|
||||
return screen.type.desktop
|
||||
|
||||
exports.server = {}
|
||||
exports.server.defaultPort = 8080
|
||||
exports.server.defaultPort = 4347
|
||||
|
||||
exports.text = text = {}
|
||||
text.browseDescription = _.template 'Browse through complete item listings for over a dozen top mods and use the interactive crafting planner for step-by-step instructions'
|
||||
|
||||
@@ -16,8 +16,7 @@ module.exports = class CraftingGuideServer
|
||||
|
||||
constructor: (port)->
|
||||
if not port? then throw new Error 'port is mandatory'
|
||||
if not _.isNumber port then throw new Error 'port must be a number'
|
||||
@port = parseInt port
|
||||
@port = port
|
||||
|
||||
app = express()
|
||||
app.disable 'etag'
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# All rights reserved.
|
||||
#
|
||||
|
||||
CraftingGuideServer = require './crafting_guide_server'
|
||||
require('dotenv').config()
|
||||
|
||||
########################################################################################################################
|
||||
|
||||
@@ -15,10 +15,8 @@ global.w = require 'when'
|
||||
|
||||
########################################################################################################################
|
||||
|
||||
port = parseInt process.argv[2]
|
||||
port = if _.isNaN port then c.server.defaultPort else port
|
||||
|
||||
server = new CraftingGuideServer port
|
||||
CraftingGuideServer = require './crafting_guide_server'
|
||||
server = new CraftingGuideServer process.env.WEBSITE_SERVER_PORT
|
||||
server.start()
|
||||
|
||||
process.on 'SIGINT', ->
|
||||
|
||||
Reference in New Issue
Block a user