fly_admin 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ece4ad87b562e057fd775e52d6e920fc3c3c3f
-  data.tar.gz: 193b9bf46bdfc2db083d83dae5eeaee85bb27a3b
+  metadata.gz: bffa9e90bccfe95f80335440a8393581f198f7ab
+  data.tar.gz: 34047bfcc870a87ef8835bbd489c45f79a9356ff
 SHA512:
-  metadata.gz: a9f4f60533381215453d0173a247a37c862c1401f62bfec28f16fa1fc25aab8d1eff0f36558e4161618d4f40dcce3ba0beba68f10000d5bee645ef73346f71ab
-  data.tar.gz: 3cf12dfcb1abf52c09c059d391ce06139ec659a62d7235ad2436c21e16b8d5a2ae35ac51ff91a2226166056b5e3da1d153133ca67499796e92bb8af38607b5c2
+  metadata.gz: e8d0341823a13b4ccd32638b0604740aeea63f61d2cbae3ee19751e640300fe6fcf29f1183a17294bc69fd3bca320beee0f4789710fa50ca2b12806104d05835
+  data.tar.gz: 80e4a167e99617d546d8c7e6a27835c2d31780deb5e152b60317dcb593b0f6a399c5f4b0200d0cab2d5677f37c7563935d6de3536337881a772391adef5b38a9

data/app/controllers/fly_admin/application_controller.rb

@@ -1,4 +1,4 @@
-class FlyAdmin::ApplicationController < ApplicationController
+class FlyAdmin::ApplicationController < ActionController::Base
   before_filter :authenticate_admin!
 
   def authenticate_admin!

data/app/controllers/fly_admin/imbs/application_controller.rb

@@ -0,0 +1,63 @@
+class FlyAdmin::Imbs::ApplicationController < ActionController::Base
+  protect_from_forgery
+
+  before_filter :block_user, :store_link_param
+  before_filter :check_user_status, if: Proc.new { user_signed_in? && old_user? }, unless: :devise_controller?
+  before_filter :set_locale, :load_footer
+
+  def block_user
+    render_blocked if session[:blocked]
+  end
+
+  def store_link_param
+    session[:link] = params[:link] if params[:link].present?
+  end
+
+  def check_user_status
+    user_is_valid = FlyAdmin::Imbs::ConnectionApi.check_user(current_user)
+
+    if user_is_valid 
+      current_user.update_attributes is_active: true
+      cookies[:active_user] = { value: 1, expires: 1.day.from_now }
+    else
+      current_user.update_attributes is_active: false
+      session[:blocked] = true
+      render_blocked
+    end
+  end
+
+  def load_footer
+    paysite = session['action_type'] || 'wap'
+    country = I18n.locale.to_s
+    @footer = SiteCache.read("content_#{paysite}_#{country}")
+  end
+  
+  private
+
+  def old_user?
+    !(current_user.admin? || current_user.tester? || cookies[:active_user].present?)
+  end
+
+  def set_locale
+    locale = params["locale"].try(:downcase).try(:to_sym)
+    I18n.locale = locale && I18n.available_locales.include?(params) ? locale : I18n.default_locale
+  end
+
+  # Locale for all url_helpers in rails
+  def default_url_options(options = {})
+    { locale: I18n.locale }.merge options
+  end
+    
+  def after_sign_in_path_for(resource)
+    root_url
+  end
+
+  def after_sign_out_path_for(resource)
+    root_url
+  end
+
+  def render_blocked
+    render 'errors/blocked', status: :forbidden
+  end
+
+end

data/app/controllers/fly_admin/imbs/main_controller.rb

@@ -0,0 +1,81 @@
+class FlyAdmin::Imbs::MainController < ActionController::Base
+  skip_before_filter :check_user_status
+
+  def you_blocked
+  end
+
+  def test_request_headers
+    @env = request.env
+  end
+
+  def enter
+    if params[:operation_status] == 'deviceblock'
+      redirect_to "#{root_url}&operation_status=deviceblock" and return
+    end
+    redirect_to paysite_root_url and return unless check_hash!
+    authorize_customer params[:key], params[:pass], params[:login]
+  end
+
+  def authorize_customer(customer_key, password, login)
+    user = User.find_by_login(login)
+    if user.nil?
+      user = User.new(
+        :login => login,
+        :password => password,
+        :customer_key => customer_key
+        )
+      user.save
+    end
+
+    sign_in user unless user_signed_in?
+    flash[:notice] = [ t('your_login') + " #{login}" ]
+    flash[:notice] << "#{t('your_password')} #{password}"
+
+    cookies[:active_user] = { value: 1, expires: 1.day.from_now }
+
+    redirect_to item_link
+  end
+
+  private
+
+  def check_hash!
+    true_hash = Digest::MD5.hexdigest(params[:login].to_s + params[:pass].to_s + SiteConfig['wc_service_salt'].to_s)
+    true_hash == params[:hash]
+  end
+
+  def item_link
+    case FlyAdmin.paysite_type
+    when "serials"
+      item_link_for_serials
+    when "news"
+       item_link_for_news 
+    end
+  end
+  
+  def paysite_root_url
+    case FlyAdmin.paysite_type
+    when "serials"
+      main_app.root_url
+    when "news"
+      main_app.root_url  
+    end
+  end 
+
+  def item_link_for_news
+    if session[:item]
+      item = JSON.parse session[:item]
+      category_article_path(item['category_id'], item['id'])
+    else
+      paysite_root_url
+    end
+  end
+
+  def item_link_for_serials
+    if session[:item]
+      item = JSON.parse session[:item]
+      category_season_video_path(item['category_id'], item['season_id'], item['id'])
+    else
+      paysite_root_url
+    end  
+  end
+end

data/app/controllers/fly_admin/imbs/subscriptions_controller.rb

@@ -0,0 +1,38 @@
+class FlyAdmin::Imbs::SubscriptionsController < ActionController::Base
+  def start
+    save_data_to_session
+
+    link_uuid = session[:link] || SiteConfig['default_uuid']
+    back_url = CGI.escape "http://#{request.host_with_port}/you_blocked"
+    redirect_to "#{SiteConfig['wap_click_addr']}/start/#{link_uuid}?back_url=#{back_url}"
+  end
+  
+  def splash  
+    begin
+      link = params[:back_url] + "?key=#{params[:customer_key]}"
+      redirect_to link
+    rescue Exception => e 
+      SUBSCRIPTION_LOG.error "#{e.message}\n\t#{e.backtrace}"
+      render nothing: true
+    end  
+  end
+  
+  private
+  
+  def save_data_to_session
+    case FlyAdmin.paysite_type
+    when "serials"
+      save_serials_data_to_session
+    when "news"
+      save_news_data_to_session
+    end
+  end
+  
+  def save_serials_data_to_session
+    session[:item] = JSON.generate({ :id => params[:video_id], :category_id => params[:category_id], :season_id => params[:season_id] })
+  end
+
+  def save_news_data_to_session
+    session[:item] = JSON.generate({ :id => params[:item_id], :category_id => params[:category_id] })        
+  end 
+end

data/app/helpers/fly_admin/imbs/application_helper.rb

@@ -0,0 +1,31 @@
+module FlyAdmin::Imbs::ApplicationHelper
+
+  # If anonymous - link to landing page
+  # If customer/admin/etc - link to item page (video#show, article#show etc)  
+  
+  def item_link(*args)
+    case FlyAdmin.paysite_type
+    when "serials"
+      serials_item_link(*args)
+    when "articles"
+      articles_item_link(*args)
+    end  
+  end
+
+  def serials_item_link(category, season, video)
+    if user_signed_in?
+      category_season_video_path(category, season, video)
+    else
+      category_season_video_start_path(category, season, video)
+    end
+  end
+
+  def articles_item_link(category, article)
+    if user_signed_in?
+      category_article_path(category, article)
+    else
+      category_start_path(category, article)
+    end 
+  end
+
+end

data/lib/fly_admin/imbs/connection_api.rb

@@ -0,0 +1,24 @@
+module FlyAdmin
+  module Imbs
+    class ConnectionApi
+      def self.check_user(user)
+        return true if Rails.env == 'development'
+
+        valid = true
+        begin
+          api_url = SiteConfig['wap_click_addr'] + "/api/check"
+          request = RestClient.get(api_url, :params => {:uuid => user.customer_key, :hash => Digest::MD5.hexdigest(user.customer_key + SiteConfig['wc_service_salt']) })
+          hash = JSON.parse(request).with_indifferent_access
+          
+          VALIDATION_LOG.info "status for user #{user.id}: #{hash.inspect}"
+          
+          valid = false unless hash[:status].eql? true
+        rescue Exception => e
+          VALIDATION_LOG.error "error check status for user #{user.id}: #{e.message}"
+        end
+        valid
+      end
+
+    end
+  end
+end

data/lib/fly_admin/version.rb

@@ -1,3 +1,3 @@
 module FlyAdmin
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/fly_admin.rb

@@ -1,9 +1,9 @@
 require "fly_admin/engine"
 require "fly_admin/page_cache"
-require "fly_admin/connection_api"
+require "fly_admin/imbs/connection_api"
 # require "awesome_print"
 module FlyAdmin
-  # See fly_admin_initializer.rb for more description
-  mattr_accessor :api_type
+  # See fly_admin initializer for more description
+  mattr_accessor :api_type, :paysite_type
   mattr_accessor :path
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ruslan Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -918,13 +918,16 @@ files:
 - app/controllers/fly_admin/application_controller.rb
 - app/controllers/fly_admin/categories_controller.rb
 - app/controllers/fly_admin/footers_controller.rb
+- app/controllers/fly_admin/imbs/application_controller.rb
+- app/controllers/fly_admin/imbs/main_controller.rb
+- app/controllers/fly_admin/imbs/subscriptions_controller.rb
 - app/controllers/fly_admin/settings_controller.rb
-- app/controllers/fly_admin/subscriptions_controller.rb
 - app/controllers/fly_admin/uploads_controller.rb
 - app/controllers/fly_admin/videos_controller.rb
 - app/helpers/fly_admin/application_helper.rb
 - app/helpers/fly_admin/categories_helper.rb
 - app/helpers/fly_admin/footers_helper.rb
+- app/helpers/fly_admin/imbs/application_helper.rb
 - app/helpers/fly_admin/settings_helper.rb
 - app/helpers/fly_admin/upload_controller_helper.rb
 - app/helpers/fly_admin/videos_helper.rb
@@ -967,8 +970,9 @@ files:
 - db/migrate/20150428102104_add_source_type_to_fly_admin_footers.rb
 - db/migrate/20150514114816_add_uuid_to_video.rb
 - lib/fly_admin.rb
-- lib/fly_admin/connection_api.rb
+- lib/fly_admin/bornpay/connection_api.rb
 - lib/fly_admin/engine.rb
+- lib/fly_admin/imbs/connection_api.rb
 - lib/fly_admin/page_cache.rb
 - lib/fly_admin/railtie.rb
 - lib/fly_admin/version.rb
@@ -1056,59 +1060,58 @@ signing_key:
 specification_version: 4
 summary: FlyAdmin Rails Engine
 test_files:
-- test/controllers/fly_admin/footers_controller_test.rb
-- test/controllers/fly_admin/serials_controller_test.rb
-- test/controllers/fly_admin/settings_controller_test.rb
-- test/controllers/fly_admin/upload_controller_controller_test.rb
-- test/controllers/fly_admin/videos_controller_test.rb
-- test/dummy/app/assets/javascripts/application.js
+- test/integration/navigation_test.rb
+- test/helpers/fly_admin/serials_helper_test.rb
+- test/helpers/fly_admin/footers_helper_test.rb
+- test/helpers/fly_admin/upload_controller_helper_test.rb
+- test/lib/generators/fly_admin/install_generator_test.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
 - test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/environment.rb
 - test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/application.rb
 - test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/db/schema.rb
-- test/dummy/public/404.html
 - test/dummy/public/422.html
+- test/dummy/public/404.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
-- test/fixtures/fly_admin/countries.yml
-- test/fixtures/fly_admin/footers.yml
-- test/fixtures/fly_admin/paysites.yml
+- test/dummy/config.ru
+- test/dummy/bin/rails
+- test/dummy/bin/bundle
+- test/dummy/bin/rake
+- test/dummy/db/schema.rb
+- test/test_helper.rb
+- test/controllers/fly_admin/serials_controller_test.rb
+- test/controllers/fly_admin/videos_controller_test.rb
+- test/controllers/fly_admin/upload_controller_controller_test.rb
+- test/controllers/fly_admin/settings_controller_test.rb
+- test/controllers/fly_admin/footers_controller_test.rb
 - test/fly_admin_test.rb
-- test/helpers/fly_admin/footers_helper_test.rb
-- test/helpers/fly_admin/serials_helper_test.rb
-- test/helpers/fly_admin/upload_controller_helper_test.rb
-- test/integration/navigation_test.rb
-- test/jobs/fly_admin/convert_video_job_test.rb
-- test/jobs/fly_admin/daemon_control_job_test.rb
 - test/jobs/fly_admin/stop_f_fmpeg_job_test.rb
-- test/lib/generators/fly_admin/install_generator_test.rb
+- test/jobs/fly_admin/daemon_control_job_test.rb
+- test/jobs/fly_admin/convert_video_job_test.rb
+- test/models/fly_admin/paysite_test.rb
 - test/models/fly_admin/country_test.rb
 - test/models/fly_admin/footer_test.rb
-- test/models/fly_admin/paysite_test.rb
-- test/test_helper.rb
-has_rdoc: 
+- test/fixtures/fly_admin/footers.yml
+- test/fixtures/fly_admin/paysites.yml
+- test/fixtures/fly_admin/countries.yml

data/app/controllers/fly_admin/subscriptions_controller.rb

@@ -1,35 +0,0 @@
-module FlyAdmin
-  class SubscriptionsController < ActionController::Base
-    def start
-      get_cookie
-      if @customer_key.present?
-        # video can be in multiple categories , so save category_id
-        session[:video] = JSON.generate({ :id => params[:video_id], :category_id => params[:category_id], :season_id => params[:season_id] })
-        link =  "http://#{@alias}/continue?key=#{@customer_key}"
-        redirect_to link
-      else
-        render nothing: true
-      end
-    end
-    
-    def splash  
-      begin
-        link = params[:back_url] + "?key=#{params[:customer_key]}"
-        redirect_to link
-      rescue Exception => e 
-        SUBSCRIPTION_LOG.error "#{e.message}\n\t#{e.backtrace}"
-        render nothing: true
-      end  
-    end
-
-    private
-
-    def get_cookie
-      if session[:alias]
-        @alias = session[:alias] 
-        @customer_key = session[:customer_key]
-      end
-    end  
-    
-  end
-end