about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock22
-rw-r--r--app/controllers/application_controller.rb10
-rw-r--r--config/routes.rb2
4 files changed, 0 insertions, 35 deletions
diff --git a/Gemfile b/Gemfile index d74e090..d0f9528 100644 --- a/Gemfile +++ b/Gemfile
@@ -70,7 +70,6 @@ gem 'normalize-rails'
70gem 'devise' 70gem 'devise'
71gem 'paperclip' 71gem 'paperclip'
72gem 'jquery-rails' 72gem 'jquery-rails'
73gem 'pokeviewer', git: "https://git.fourisland.com/pokeviewer"
74gem 'acts-as-taggable-on' 73gem 'acts-as-taggable-on'
75gem 'jquery-ui-rails' 74gem 'jquery-ui-rails'
76gem 'js-routes' 75gem 'js-routes'
diff --git a/Gemfile.lock b/Gemfile.lock index 2980acc..a3408d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock
@@ -1,19 +1,3 @@
1GIT
2 remote: https://git.fourisland.com/pokeviewer
3 revision: c1b0443ba2aebdbd39291ddab0c189f3f4831320
4 specs:
5 pokeviewer (0.1.0)
6 activerecord-diff
7 coffee-rails (~> 4.2)
8 enumerize
9 haml
10 jquery-rails
11 normalize-rails
12 rails (~> 7.1.0)
13 sassc-rails
14 sequenced
15 victor
16
17GEM 1GEM
18 remote: https://rubygems.org/ 2 remote: https://rubygems.org/
19 specs: 3 specs:
@@ -79,7 +63,6 @@ GEM
79 activemodel (= 7.1.1) 63 activemodel (= 7.1.1)
80 activesupport (= 7.1.1) 64 activesupport (= 7.1.1)
81 timeout (>= 0.4.0) 65 timeout (>= 0.4.0)
82 activerecord-diff (2.0.0)
83 activestorage (7.1.1) 66 activestorage (7.1.1)
84 actionpack (= 7.1.1) 67 actionpack (= 7.1.1)
85 activejob (= 7.1.1) 68 activejob (= 7.1.1)
@@ -319,9 +302,6 @@ GEM
319 rexml (~> 3.2, >= 3.2.5) 302 rexml (~> 3.2, >= 3.2.5)
320 rubyzip (>= 1.2.2, < 3.0) 303 rubyzip (>= 1.2.2, < 3.0)
321 websocket (~> 1.0) 304 websocket (~> 1.0)
322 sequenced (4.0.0)
323 activerecord (>= 3.0)
324 activesupport (>= 3.0)
325 spring (2.1.1) 305 spring (2.1.1)
326 spring-watcher-listen (2.0.1) 306 spring-watcher-listen (2.0.1)
327 listen (>= 2.7, < 4.0) 307 listen (>= 2.7, < 4.0)
@@ -352,7 +332,6 @@ GEM
352 turbolinks-source (5.2.0) 332 turbolinks-source (5.2.0)
353 tzinfo (2.0.6) 333 tzinfo (2.0.6)
354 concurrent-ruby (~> 1.0) 334 concurrent-ruby (~> 1.0)
355 victor (0.3.4)
356 warden (1.2.9) 335 warden (1.2.9)
357 rack (>= 2.0.9) 336 rack (>= 2.0.9)
358 web-console (4.2.1) 337 web-console (4.2.1)
@@ -405,7 +384,6 @@ DEPENDENCIES
405 mysql2 384 mysql2
406 normalize-rails 385 normalize-rails
407 paperclip 386 paperclip
408 pokeviewer!
409 rails (~> 7.1.0) 387 rails (~> 7.1.0)
410 rails_autolink 388 rails_autolink
411 redcarpet 389 redcarpet
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c9d4e15..0174cae 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb
@@ -1,16 +1,6 @@
1class ApplicationController < ActionController::Base 1class ApplicationController < ActionController::Base
2 protect_from_forgery with: :exception 2 protect_from_forgery with: :exception
3 3
4 protected
5
6 def authenticate_pokeviewer(login, token)
7 user = login && User.find_by_login(login)
8
9 ActiveSupport::SecurityUtils.secure_compare(
10 ::Digest::SHA256.hexdigest(user.pokeviewer_token),
11 ::Digest::SHA256.hexdigest(token))
12 end
13
14 private 4 private
15 5
16 def after_sign_out_path_for(resource) 6 def after_sign_out_path_for(resource)
diff --git a/config/routes.rb b/config/routes.rb index 3fffa35..6f7b7de 100644 --- a/config/routes.rb +++ b/config/routes.rb
@@ -81,6 +81,4 @@ Rails.application.routes.draw do
81 post 'downvote' 81 post 'downvote'
82 end 82 end
83 end 83 end
84
85 mount Pokeviewer::Engine => '/poke3'
86end 84end