Skip to content

Add jwt #85

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.

Sign up for GitHub

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

Open
davlin93 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add jwt #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
428072d
add jwt and remove omniauth
davlin93 Feb 11, 2015
8bea6e2
add first JWT protected endpoint
davlin93 Feb 18, 2015
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end

gem 'jwt', '~> 1.2.1'
gem 'newrelic_rpm'
gem 'passenger'
gem 'jquery-rails'
gem 'slim-rails'
gem 'omniauth-facebook'
gem "therubyracer"
gem "less-rails"
gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
Expand Down
25 changes: 2 additions & 23 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,14 @@ GEM
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
hashie (3.3.1)
hike (1.2.3)
i18n (0.6.11)
journey (1.0.4)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (1.0.0)
jwt (1.2.1)
less (2.5.1)
commonjs (~> 0.2.7)
less-rails (2.5.0)
Expand All @@ -79,25 +76,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.25.1)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
newrelic_rpm (3.6.7.152)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-facebook (2.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
multi_json (~> 1.3)
oauth2 (~> 1.0)
omniauth (~> 1.2)
passenger (4.0.56)
daemon_controller (>= 1.2.0)
rack
Expand Down Expand Up @@ -186,9 +165,9 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
factory_girl_rails
jquery-rails
jwt (~> 1.2.1)
less-rails
newrelic_rpm
omniauth-facebook
passenger
pg
rails (= 3.2.14)
Expand Down
7 changes: 7 additions & 0 deletions app/controllers/api/ocean_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ def local_waves
end

def splash
payload = process_jwt(params[:token])
params = payload

unless params
render(json: { errors: ['bad token'] }, status: :forbidden) && return
end

unless params[:latitude] && params[:longitude] && params[:caption] &&
params[:user_id] && params[:type]
render(json: { errors: 'missing params' }, status: :bad_request) && return
Expand Down
10 changes: 10 additions & 0 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,15 @@ def current_user
@current_user ||= session[:user_id] && User.find_by_id(session[:user_id])
end

def process_jwt(token)
begin
jwt = JWT.decode(token, "secret").first
rescue
return false
end

jwt.with_indifferent_access
end

helper_method :current_user
end
5 changes: 0 additions & 5 deletions config/initializers/omniauth.rb
View file
Open in desktop

This file was deleted.