Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test Pull #9

Draft
wants to merge 61 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
e016ffc
Update Gemfile
vigneshwarankm Aug 12, 2022
953c728
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
b3e04dd
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
a032f32
Update Gemfile
vigneshwarankm Aug 12, 2022
f46e718
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
7349cf6
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
f40401b
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
0dc8666
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
fc34401
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
a63e224
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
90aa3f8
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
390693f
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
ab1198d
Update app.json
vigneshwarankm Aug 12, 2022
842c12c
Update Gemfile
vigneshwarankm Aug 12, 2022
b606d7e
Update app.json
vigneshwarankm Aug 12, 2022
909e74d
Update Gemfile
vigneshwarankm Aug 12, 2022
3f15f00
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
6c7f404
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
e9875af
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
5814b32
Update Gemfile.lock
vigneshwarankm Aug 12, 2022
a44c6c0
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
65d0088
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
519bc4d
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
2f68959
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
35e4331
Update Gemfile
vigneshwarankm Aug 16, 2022
63358f1
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
79aaff5
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
b3e754a
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
0711209
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
8f2d0dd
Update Gemfile.lock
vigneshwarankm Aug 16, 2022
a5ef08e
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
4297bd3
Update web.rb
vigneshwarankm Aug 17, 2022
f4d415f
Update web.rb
vigneshwarankm Aug 17, 2022
feb6598
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
7ae7f56
Update Gemfile
vigneshwarankm Aug 17, 2022
01cae4a
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
9444628
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
7a45cfb
Update Gemfile
vigneshwarankm Aug 17, 2022
a72ffcc
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
1f3b158
Update Gemfile
vigneshwarankm Aug 17, 2022
1e8e1e0
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
6b219dc
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
cb0f6fe
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
775f250
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
c2fa399
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
a912dc6
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
31cfbd5
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
c1939a5
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
633c280
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
fb7b221
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
d993d0c
Update Gemfile
vigneshwarankm Aug 17, 2022
b8e7398
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
b42e625
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
ca6ce89
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
a511a98
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
63c60a7
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
1e00084
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
0def51d
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
1ae1541
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
afef4d2
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
b5eaf49
Update Gemfile.lock
vigneshwarankm Aug 17, 2022
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
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby "2.5.7"
ruby "3.1.2"

gem 'sinatra'
gem 'eventmachine'
Expand All @@ -13,4 +13,6 @@ gem 'savon'
gem 'pg'
gem 'rack-ssl-enforcer'
gem 'rack-timeout'
gem 'httpclient'
gem 'httpclient'
gem 'rexml'
gem 'logger'
45 changes: 26 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,37 @@ GEM
akami (1.3.1)
gyoku (>= 0.4.0)
nokogiri
builder (3.2.3)
daemons (1.3.1)
builder (3.2.4)
daemons (1.4.1)
eventmachine (1.2.7)
facets (3.1.0)
gyoku (1.3.1)
gyoku (1.4.0)
builder (>= 2.1.2)
rexml (~> 3.0)
hpricot (0.8.6)
httpclient (2.8.3)
httpi (2.4.4)
httpi (3.0.1)
rack
socksify
json (2.2.0)
json (2.6.2)
racc (1.6.0)
mini_portile2 (2.4.0)
mustermann (1.0.3)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
nori (2.6.0)
oauth (0.5.4)
pg (1.1.4)
rack (2.0.7)
rack-protection (2.0.7)
oauth (0.5.10)
pg (1.4.3)
rack (2.2.4)
rack-protection (2.2.2)
rack
rack-ssl-enforcer (0.2.9)
rack-timeout (0.5.2)
rack-timeout (0.6.3)
rexml (3.2.5)
rforce (0.14)
builder (~> 3.0)
oauth (~> 0.4)
ruby2_keywords (0.0.5)
savon (2.12.0)
akami (~> 1.2)
builder (>= 2.1.2)
Expand All @@ -39,18 +43,19 @@ GEM
nokogiri (>= 1.8.1)
nori (~> 2.4)
wasabi (~> 3.4)
sinatra (2.0.7)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.7)
sinatra (2.2.2)
mustermann (~> 2.0)
rack (~> 2.2)
rack-protection (= 2.2.2)
tilt (~> 2.0)
soap4r-ng (2.0.4)
socksify (1.7.1)
thin (1.7.2)
thin (1.8.1)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
tilt (2.0.10)
logger (1.5.1)
wasabi (3.5.0)
httpi (~> 2.0)
nokogiri (>= 1.4.2)
Expand All @@ -72,9 +77,11 @@ DEPENDENCIES
sinatra
soap4r-ng
thin
rexml
logger

RUBY VERSION
ruby 2.5.7p206
ruby 3.1.2

BUNDLED WITH
2.0.2
2.3.20
4 changes: 2 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"name" : "ASIDE.IO",
"description" : "A Salesforce IDE - fast, free, and open source",
"repository" : "https://github.com/fillip/aside-io",
"stack" : "heroku-18"
}
"stack" : "heroku-22"
}
4 changes: 3 additions & 1 deletion web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
require 'json'
require 'rack-ssl-enforcer'
require 'rack-timeout'
require 'logger'

#use Rack::Timeout, service_timeout: 25
#use Rack::SslEnforcer
Expand Down Expand Up @@ -421,6 +422,7 @@

post '/start' do
resp = refresh(request, response, false)
logger.debug("I'm a debug log"+resp)
resp = resp == '{ success : false }' ? request.cookies['d3vsid'] : resp
ctrl = D3VController.new(resp, request.cookies['d3vpep'],
request.cookies['d3vmep'], request.cookies['d3vaep'], request.cookies['d3vuid'])
Expand Down Expand Up @@ -659,4 +661,4 @@ def refresh(request, response, forClient)

return '{ success : false }'
end
end
end