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

Commit a1b41ab

Browse files
author
vikasrohit
authored
Merge pull request #854 from appirio-tech/feature/blank-screen-after-sso
blank screen after sso
2 parents 0e02493 + 2659eb7 commit a1b41ab

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

app/topcoder.routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import moment from 'moment'
2828
if (path.indexOf('?') > -1) {
2929
return path.replace('?', '/?')
3030
}
31-
return path + '/'
31+
$location.replace().path(path + '/')
3232
})
3333

3434
var states = {

webpack.config.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@ if (CI === 'master') {
1616
process.env.NODE_ENV = 'development'
1717
}
1818

19-
20-
process.env.CONNECTOR_URL = `https://accounts.${process.env.DOMAIN}/connector.html`
21-
process.env.ACCOUNTS_APP_URL = `https://accounts.${process.env.DOMAIN}/tc`
19+
var accountsAppURL = null
20+
if (process.env.ACCOUNTS_APP_URL) {
21+
accountsAppURL = process.env.ACCOUNTS_APP_URL
22+
}
23+
var accountsConnectorURL = null
24+
if (process.env.ACCOUNTS_APP_CONNECTOR_URL) {
25+
accountsConnectorURL = process.env.ACCOUNTS_APP_CONNECTOR_URL
26+
}
2227

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

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

42+
if (accountsAppURL) {
43+
process.env.ACCOUNTS_APP_URL = accountsAppURL
44+
}
45+
if (accountsConnectorURL) {
46+
process.env.ACCOUNTS_APP_CONNECTOR_URL = accountsConnectorURL
47+
}
48+
3749
module.exports = config

0 commit comments

Comments
 (0)