Skip to content
This repository has been archived by the owner on Jul 19, 2021. It is now read-only.

Prevent the following of redirects for custom domains #3

Merged
merged 2 commits into from
Aug 23, 2016
Merged
Changes from 1 commit
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
Prev Previous commit
fix redirect loop on preview_theme_id
  • Loading branch information
Ryan Macdonald committed Aug 23, 2016
commit d293147e8628b254f1afe8c5a3dfbd868a207945
6 changes: 4 additions & 2 deletions tasks/deploy-sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ gulp.task('deploy:sync-init', function() {
var tkConfig = yaml.safeLoad(file);
var envObj;
var environment;
var proxyTarget = '';
var queryStringComponents = [];

if (process.env.tkEnvironments) {
Expand All @@ -35,9 +36,10 @@ gulp.task('deploy:sync-init', function() {
}

envObj = tkConfig[environment];
proxyTarget = 'https://' + envObj.store;

if (envObj.theme_id && (envObj.theme_id === parseInt(envObj.theme_id, 10))) {
queryStringComponents.push('preview_theme_id=' + envObj.theme_id);
proxyTarget += '?preview_theme_id=' + envObj.theme_id;
}

/**
Expand All @@ -48,7 +50,7 @@ gulp.task('deploy:sync-init', function() {

browserSync.init({
proxy: {
target: 'https://' + envObj.store,
target: proxyTarget,
middleware: function(req, res, next) {
var prefix = req.url.indexOf('?') > -1 ? '&' : '?';
req.url += prefix + queryStringComponents.join('&');
Expand Down