seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix for http

This commit is contained in:
Seth Call 2020-12-03 10:34:59 -06:00
parent 5b7ba2f99d
commit 7ed6f576ca
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/up/find_sessions_2020.sql
View File

@ -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); 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_trial_ends_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
ALTER TABLE users ADD COLUMN subscription_plan_reason varchar(20); 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; UPDATE users set stored_credit_card = true where recurly_code is not null;

6
web/app/controllers/artifacts_controller.rb
View File

@ -63,7 +63,6 @@ class ArtifactsController < ApiController
logger.debug "version check from #{product}" logger.debug "version check from #{product}"
unless ArtifactUpdate::PRODUCTS.include? product unless ArtifactUpdate::PRODUCTS.include? product
render :json => { :errors => { :product => ['not a valid product'] } }, :status => :unprocessable_entity render :json => { :errors => { :product => ['not a valid product'] } }, :status => :unprocessable_entity
return return
@ -75,6 +74,11 @@ class ArtifactsController < ApiController
render :json => {}, :status => :ok render :json => {}, :status => :ok
else else
url = @artifact.determine_url 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 render :json => { "version" => @artifact.version, "uri" => url, "sha1" => @artifact.sha1, "size" => @artifact.size }, :status => :ok
end end