easy_login 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90c1b0dfb4a988eb8730d3e2d5eb629c27f3204f
-  data.tar.gz: 65b1f32113d62cbb1969aab015a08f72f906105d
+  metadata.gz: 9e51def3be4d60b249dae811431eedb238af9faa
+  data.tar.gz: bb720e50dfbf828a46d7f62058330d96355f57e5
 SHA512:
-  metadata.gz: 7ea9abf0ecbfdc5817f520b2e559de2f86fc55122c10ba151e6c24bfafcd29b396402b96d5447d9f6cd90ee9064ea2aeaca22b9ba10c9978e01408b5885f1bdd
-  data.tar.gz: 6653bf4823ae177a578a0c1831d27c7b406b0d4996cdf1ca5716edae9341fb0d072989fc8f06654078a7b3b4d171999a9175b39e1b958a300c562c88ced48863
+  metadata.gz: d83e34a329de9dc3828d727559af5f33916ab377b7a4727d16e307c803cf094a2e5febd5905bf7ed9e092df32c0bba715c57181f80e5edde1f9fc0c37abe3145
+  data.tar.gz: 1fac675949a0d8470c1d3c567d3d8cc19b77c47391df7376019248e449d18abba5dd1790cc3a95f1458fd70397cd719941d12efd332d5906daa3a3617f3a2fd6

data/README.md

@@ -75,7 +75,20 @@ controller:
     user_role3: raise->{message}
 ```
 
-The `user_role` if the role attribute of your user model configed in `config/application.rb` or `config/environments/*.rb`  
+The `user_role` is the role attribute of your user model configed in `config/application.rb` or `config/environments/*.rb`  
+And also you need define a enum about this role like:
+
+```ruby
+class User < ApplicationRecord
+  has_secure_password
+
+  enum :role => {
+    :user_role1 => 0,
+    :user_role2 => 1,
+    :user_role3 => 2
+  }
+end
+```
   
 The `action` has 3 types
 

data/lib/easy_login.rb

@@ -10,7 +10,7 @@ require "easy_login/permission"
 
 module EasyLogin
 	def self.helper_method
-		[:signed_in?, :current_user, :current_user?]
+		[:signed_in?, :current_user, :current_user?, :easy_login_session]
 	end
 
 	class Railtie < Rails::Railtie
@@ -26,21 +26,17 @@ module EasyLogin
 	end
 	
   def self.included(base)
-    base.send :include, Session
     if base == ApplicationController
+      base.send :include, Session
       base.helper_method EasyLogin.helper_method
       base.send :before_action do |controller|
         Permission.action controller
       end
-    elsif base == ApplicationCable::Connection
-      base.send :identified_by, :client
+    elsif base == ApplicationCable::Channel
+      base.send :include, Cable
     elsif base == Grape::API || base.superclass == Grape::API
       base.helpers GrapeHelper
     end
   end
 
-  def self.cable_authorize(connection, current_user)
-    connection.client = current_user
-  end
-
 end

data/lib/easy_login/cable.rb

@@ -0,0 +1,39 @@
+module EasyLogin
+
+  module Cable
+    def signed_in?
+      return !current_user.nil?
+    end
+
+    def current_user?(user)
+      if(user == nil || current_user == nil)
+        return false;
+      end
+      return user.id == current_user.id
+    end
+
+    def current_user
+      user_id = session_info[0]
+      return nil if user_id == nil
+      user = EasyLogin.config.user_model.capitalize.constantize.find_by_id(user_id)
+      return user
+    end
+
+    private
+    def session_info
+      session = params[:f]
+      # cookie signed failed
+      return [nil, nil] unless session
+      session = Base64.decode64 session.split('--').first
+      begin
+        session = JSON.parse session
+      rescue
+        return [nil, nil]
+      end
+      digest = Digest::MD5.hexdigest "#{session[0]},#{EasyLogin.config.salt},#{Time.parse(session[1]).to_i}"
+      # digest check failed
+      return [nil, nil] unless session[2] == digest
+      [session[0], session[1]]
+    end
+  end
+end

data/lib/easy_login/grape_helper.rb

@@ -27,10 +27,10 @@ module EasyLogin
 
     private
     def session_info
-      session = cookies[:f]
+      session = params[:f]
       # cookie signed failed
       return [nil, nil] unless session
-      session = Base64.decode64 cookies[:f].split('--').first
+      session = Base64.decode64 session.split('--').first
       begin
         session = JSON.parse session
       rescue

data/lib/easy_login/session.rb

@@ -28,6 +28,11 @@ module EasyLogin
 			return user
 		end
 
+    def easy_login_session
+      session = cookies.signed[:f]
+      "<div id='easy_login_session' uid=#{session[0]} ts='#{session[1]}' d='#{session[2]}'></div>".html_safe
+    end
+
 		private
     def session_info
       session = cookies.signed[:f]

data/lib/easy_login/version.rb

@@ -1,3 +1,3 @@
 module EasyLogin
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_login
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - goshan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - Rakefile
 - easy_login.gemspec
 - lib/easy_login.rb
+- lib/easy_login/cable.rb
 - lib/easy_login/config.rb
 - lib/easy_login/grape_helper.rb
 - lib/easy_login/permission.rb