auth_client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89c8304e810a83061d1952e20b3f370e0a457f58
-  data.tar.gz: 30559b55d253ba9455b03a4e9bb89a85058bbccc
+  metadata.gz: 0ee62d1441bd1818134640c3133387764de22742
+  data.tar.gz: fee00f50739000a0729390831459529cc588f652
 SHA512:
-  metadata.gz: a7831f84f6a97e6258d0e3a80b086ce62de8453ebc2b4e4222a7ffe5217391e1140f14ec7d4a2b7e40637084f6b7b24e1e2f221852609003875da1dcc634592d
-  data.tar.gz: 65f8dbbdf1fb1f861e23a2beec150f36ff9d57481b30907063fefe6b0475b57b06de25e72357c9d085e1068113426c9c7381bf3e095019fabdc0565ff4438c61
+  metadata.gz: 652ac1275888cf944657c03fa5b87ff98174e01de480a99fa9dcf4c09812a854f74254849568ea11355ecac719641b0ce72053ea1d1feaa67d36db173eeedf22
+  data.tar.gz: 8db6b06baf79406eb8782003318b1f2f9c4589e016d662a037395b2866474b9b1eb2dc06cf60b2ca90f9f5be3a7fd823fba6e51aa6393b8571c58f4bd58bad03

data/README.md

@@ -1,7 +1,5 @@
 # AuthClient
 
-TODO: Write a gem description
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -11,19 +9,27 @@ Add this line to your application's Gemfile:
 And then execute:
 
     $ bundle
-
-Or install it yourself as:
-
-    $ gem install auth_client
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/auth_client/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+    
+Run generator:
+
+    bundle exec rails generate auth_client:install
+    
+Or use similar models
+
+```ruby
+class User
+  include AuthClient::User
+  
+  # your code goes here
+end
+```
+
+```ruby
+class Permission < ActiveRecord::Base
+  include AuthClient::Permission
+
+  acts_as_auth_client_permission roles: [:admin]
+  
+  # your code goes here
+end
+```

data/auth_client.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency 'auth_redis_user_connector'
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'auth_redis_user_connector'
   spec.add_dependency 'configliere'
+  spec.add_dependency 'daemons'
+  spec.add_dependency 'rails'
 end

data/lib/auth_client.rb

@@ -1,13 +1,10 @@
 require "auth_client/version"
 
+require 'auth_client/helpers'
+require 'auth_client/permission'
 require 'auth_client/user'
-require 'auth_client/auth_client_helpers'
+require 'auth_client/subscriber' if defined?(Rails)
 
 module AuthClient
 end
 
-ActiveSupport.on_load :action_controller do
-  include AuthClientHelpers
-
-  helper_method :current_user, :user_signed_in?, :sign_in_url, :sign_out_url
-end

data/lib/auth_client/helpers.rb

@@ -0,0 +1,61 @@
+require 'active_support/concern'
+require 'configliere'
+
+module AuthClient
+  module Helpers
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :check_session
+    end
+
+    def current_user
+      @current_user ||= ::User.find_by(id: session_user_id)
+    end
+
+    def user_signed_in?
+      !!current_user
+    end
+
+    def sign_in_url
+      uri = URI.parse(Settings['auth_server.sign_in_url'])
+
+      uri.query = { :redirect_url => request.original_url }.to_query
+
+      uri.to_s
+    end
+
+    def sign_out_url
+      uri = URI.parse(Settings['auth_server.sign_out_url'])
+
+      uri.query = { :redirect_url => request.original_url }.to_query
+
+      uri.to_s
+    end
+
+    private
+
+    def session_user_id
+      session['warden.user.user.key'].try(:first).try(:first)
+    end
+
+    def check_session
+      if session['warden.user.user.session']
+        last_request_at = session['warden.user.user.session']['last_request_at']
+        if Time.zone.now.to_i - last_request_at > 1800
+          session.clear
+        else
+          session['warden.user.user.session']['last_request_at'] = Time.zone.now.to_i
+
+          current_user.activity_notify if current_user
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load :action_controller do
+  include AuthClient::Helpers
+
+  helper_method :current_user, :user_signed_in?, :sign_in_url, :sign_out_url
+end

data/lib/auth_client/permission.rb

@@ -0,0 +1,32 @@
+require 'active_support/concern'
+
+module AuthClient
+  module Permission
+    extend ActiveSupport::Concern
+
+    def user
+      ::User.find_by id: user_id
+    end
+
+    module ClassMethods
+      def acts_as_auth_client_permission(roles: roles)
+        define_singleton_method :available_roles do
+          roles.map(&:to_s)
+        end
+
+        delegate :info_notify, :to => :user, :prefix => true, :allow_nil => true
+
+        after_destroy :user_info_notify
+        after_save :user_info_notify
+
+        belongs_to :context, :polymorphic => true
+
+        scope :for_role, ->(role) { where(:role => role)  }
+        scope :for_context, ->(context) { where(:context_id => context.try(:id), :context_type => context.try(:class))  }
+
+        validates_inclusion_of :role, :in => available_roles + available_roles.map(&:to_sym)
+        validates_presence_of :role
+      end
+    end
+  end
+end

data/lib/auth_client/subscriber.rb

@@ -0,0 +1,47 @@
+require 'auth_redis_user_connector'
+require 'daemons'
+
+module AuthClient
+  class Subscriber < ::Rails::Railtie
+    rake_tasks do
+      namespace :subscriber do
+        desc 'Start listen channel'
+        task :start => :environment do
+          Daemons.call(:app_name => 'subscriber', :multiple => false, :dir_mode => :normal, :dir => 'tmp/pids') do
+            logger = Logger.new("#{Rails.root}/log/subscriber.log")
+
+            begin
+              RedisUserConnector.sub('broadcast') do |on|
+                on.subscribe    do
+                  logger.info 'Subscribed to broadcast channel'
+                end
+
+                on.message      do |_, message|
+                  logger.info "Recieved message about user <#{message}> signed in"
+                  ::User.find_by(:id => message).try :after_signed_in
+                end
+
+                on.unsubscribe  do
+                  logger.info 'Unsubscribed from broadcast channel'
+                end
+              end
+            rescue Exception => e
+              logger.fatal e
+            end
+          end
+        end
+
+        desc 'Stop listen channel'
+        task :stop => :environment do
+          Daemons::Monitor.find('tmp/pids', 'subscriber').try :stop
+        end
+
+        desc 'Restart subscriber'
+        task :restart => :environment do
+          Rake::Task['subscriber:stop'].invoke
+          Rake::Task['subscriber:start'].invoke
+        end
+      end
+    end
+  end
+end

data/lib/auth_client/user.rb

@@ -1,21 +1,98 @@
+require 'active_support/concern'
 require 'auth_redis_user_connector'
 
-class User
-  def self.find_by(id: nil)
-    return nil unless id
+module AuthClient
+  module User
+    extend ActiveSupport::Concern
 
-    new RedisUserConnector.get(id).merge('id' => id)
-  end
+    included do
+      acts_as_auth_client_user
+    end
 
-  def initialize(options)
-    options.each_pair do |key, val|
-      self.class_eval("def #{key}; @#{key}; end")
-      self.instance_variable_set "@#{key}", val
+    def to_s
+      [surname, name, patronymic].compact.join(' ')
+    end
+
+    def fullname
+      to_s
+    end
+
+    def app_name
+    end
+
+    def check_app_name
+      raise 'User#app_name should not be blank' if app_name.blank?
     end
-  end
 
-  def to_s
-    [surname, name, patronymic].compact.join(' ')
+    def activity_notify
+      check_app_name
+
+      RedisUserConnector.set id, "#{app_name}_last_activity", Time.zone.now.to_i
+    end
+
+    def info_notify
+      check_app_name
+
+      RedisUserConnector.set id, "#{app_name}_info", info_hash.to_json
+    end
+
+    def info_hash
+      { :permissions => permissions_info, :url => "https://#{app_name}.tusur.ru/" }
+    end
+
+    def permissions_info
+      permissions.map { |p| { :role => p.role, :info => p.context.try(:to_s) }}
+    end
+
+    def after_signed_in
+      info_notify
+    end
+
+    def last_activity_at
+      return nil if app_name.blank?
+
+      seconds = instance_variable_get("@#{app_name}_last_activity").to_i
+
+      Time.at(seconds)
+    end
+
+    module ClassMethods
+      def acts_as_auth_client_user
+        define_method :permissions do
+          ::Permission.where :user_id => id
+        end
+
+        define_method(:has_permission?) do |role:, context: nil|
+          context ?
+            permissions.for_role(role).for_context(context).exists? :
+            permissions.for_role(role).exists?
+        end
+      end
+
+      def find_by(id:)
+        redis_data = RedisUserConnector.get(id)
+
+        return nil if (redis_data.nil? || redis_data.empty?)
+
+        attributes = redis_data.merge(:id => id)
+
+        build_user attributes
+      end
+
+      private
+
+      def build_user(attributes)
+        new.tap do |user|
+          attributes.each do |attribute, value|
+            name = "@#{attribute}"
+            user.instance_variable_set name, value
+
+            user.define_singleton_method attribute do
+              instance_variable_get name
+            end
+          end
+        end
+      end
+    end
   end
 end
-

data/lib/auth_client/version.rb

@@ -1,3 +1,3 @@
 module AuthClient
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/auth_client/install_generator.rb

@@ -0,0 +1,17 @@
+require 'rails/generators'
+
+module AuthClient
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)
+
+    desc 'Setup AuthClient'
+
+    def copy_user
+      copy_file 'user.rb', 'app/models/user.rb'
+    end
+
+    def copy_permission
+      copy_file 'permission.rb', 'app/models/permission.rb'
+    end
+  end
+end

data/lib/generators/auth_client/templates/permission.rb

@@ -0,0 +1,5 @@
+class Permission < ActiveRecord::Base
+  include AuthClient::Permission
+
+  acts_as_auth_client_permission roles: [:admin]
+end

data/lib/generators/auth_client/templates/user.rb

@@ -0,0 +1,7 @@
+class User
+  include AuthClient::User
+
+  def app_name
+    Settings['app.host']
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auth_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - OpenTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: auth_redis_user_connector
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: auth_redis_user_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Auth Client
 email:
 - developers@openteam.ru
@@ -94,9 +122,14 @@ files:
 - Rakefile
 - auth_client.gemspec
 - lib/auth_client.rb
-- lib/auth_client/auth_client_helpers.rb
+- lib/auth_client/helpers.rb
+- lib/auth_client/permission.rb
+- lib/auth_client/subscriber.rb
 - lib/auth_client/user.rb
 - lib/auth_client/version.rb
+- lib/generators/auth_client/install_generator.rb
+- lib/generators/auth_client/templates/permission.rb
+- lib/generators/auth_client/templates/user.rb
 homepage: https://github.com/openteam-com
 licenses:
 - MIT

data/lib/auth_client/auth_client_helpers.rb

@@ -1,51 +0,0 @@
-require 'active_support/concern'
-require 'configliere'
-
-module AuthClientHelpers
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :check_session
-  end
-
-  def current_user
-    @current_user ||= User.find_by(:id => session_user_id)
-  end
-
-  def user_signed_in?
-    !!current_user
-  end
-
-  def sign_in_url
-    uri = URI.parse(Settings['auth_server.sign_in_url'])
-
-    uri.query = { :redirect_url => request.original_url }.to_query
-
-    uri.to_s
-  end
-
-  def sign_out_url
-    uri = URI.parse(Settings['auth_server.sign_out_url'])
-
-    uri.query = { :redirect_url => request.original_url }.to_query
-
-    uri.to_s
-  end
-
-  private
-
-  def session_user_id
-    session['warden.user.user.key'].try(:first).try(:first)
-  end
-
-  def check_session
-    if session['warden.user.user.session']
-      last_request_at = session['warden.user.user.session']['last_request_at']
-      if Time.zone.now.to_i - last_request_at > 1800
-        session.clear
-      else
-        session['warden.user.user.session']['last_request_at'] = Time.zone.now.to_i
-      end
-    end
-  end
-end