From 7ed6f576cab2d548377c80cee3773cc69795b304 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 3 Dec 2020 10:34:59 -0600 Subject: [PATCH] fix for http --- db/up/find_sessions_2020.sql | 3 ++- web/app/controllers/artifacts_controller.rb | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/db/up/find_sessions_2020.sql b/db/up/find_sessions_2020.sql index e1146ef83..7be823fe0 100644 --- a/db/up/find_sessions_2020.sql +++ b/db/up/find_sessions_2020.sql @@ -109,8 +109,9 @@ ALTER TABLE users ADD COLUMN is_past_due BOOLEAN DEFAULT FALSE; CREATE INDEX subscription_sync_code_user_index ON users USING btree(subscription_sync_code); ALTER TABLE users ADD COLUMN subscription_trial_ends_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP; ALTER TABLE users ADD COLUMN subscription_plan_reason varchar(20); -UPDATE users set subscription_trial_ends_at = (CURRENT_TIMESTAMP + '30 days'::interval), subscription_plan_code = 'jamsubgold'; +--UPDATE users set subscription_trial_ends_at = (CURRENT_TIMESTAMP + '30 days'::interval), subscription_plan_code = 'jamsubgold'; +UPDATE users set subscription_trial_ends_at = '2021-01-01', subscription_plan_code = 'jamsubgold'; UPDATE users set stored_credit_card = true where recurly_code is not null; diff --git a/web/app/controllers/artifacts_controller.rb b/web/app/controllers/artifacts_controller.rb index 9602dd565..c1232b8db 100644 --- a/web/app/controllers/artifacts_controller.rb +++ b/web/app/controllers/artifacts_controller.rb @@ -63,7 +63,6 @@ class ArtifactsController < ApiController logger.debug "version check from #{product}" - unless ArtifactUpdate::PRODUCTS.include? product render :json => { :errors => { :product => ['not a valid product'] } }, :status => :unprocessable_entity return @@ -75,6 +74,11 @@ class ArtifactsController < ApiController render :json => {}, :status => :ok else url = @artifact.determine_url + + # client can't deal with https + if url.start_with?('https://') + url = url.gsub('https://' ,'http://') + end render :json => { "version" => @artifact.version, "uri" => url, "sha1" => @artifact.sha1, "size" => @artifact.size }, :status => :ok end