Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

blank screen after sso #854

Merged
merged 3 commits into from
Jun 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/topcoder.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import moment from 'moment'
if (path.indexOf('?') > -1) {
return path.replace('?', '/?')
}
return path + '/'
$location.replace().path(path + '/')
})

var states = {
Expand Down
18 changes: 15 additions & 3 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ if (CI === 'master') {
process.env.NODE_ENV = 'development'
}


process.env.CONNECTOR_URL = `https://accounts.${process.env.DOMAIN}/connector.html`
process.env.ACCOUNTS_APP_URL = `https://accounts.${process.env.DOMAIN}/tc`
var accountsAppURL = null
if (process.env.ACCOUNTS_APP_URL) {
accountsAppURL = process.env.ACCOUNTS_APP_URL
}
var accountsConnectorURL = null
if (process.env.ACCOUNTS_APP_CONNECTOR_URL) {
accountsConnectorURL = process.env.ACCOUNTS_APP_CONNECTOR_URL
}

const config = require('appirio-tech-webpack-config')({
dirname: __dirname,
Expand All @@ -34,4 +39,11 @@ const config = require('appirio-tech-webpack-config')({

if (CI) config.output.publicPath = process.env.ASSET_PREFIX

if (accountsAppURL) {
process.env.ACCOUNTS_APP_URL = accountsAppURL
}
if (accountsConnectorURL) {
process.env.ACCOUNTS_APP_CONNECTOR_URL = accountsConnectorURL
}

module.exports = config