phoenix_rails 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba3a90d1406cd914f385cf34a621a874f6b8ecc
-  data.tar.gz: 0c039add1bce2539e7e57cc9f493e6d62b70f5d3
+  metadata.gz: 8268589d0a66612c558723423666c396842f393a
+  data.tar.gz: b4a5ceb4ac3973db76bb278bfb25b54ab327f1a3
 SHA512:
-  metadata.gz: 8a665e679f72d1b710b4d579b113b0920a0f74a03e68cd11acb1a0a2d69d3e3499ac2427221d7d17c95201311cc67063a7606f7edc7827b18c5751d05d0c414b
-  data.tar.gz: f4defb8ff94eb68dcb33046ea5b2ae5ff2e86f3e862e77af345f0ff0959d7a74dbe3354fe66581cb11acebd56654ebff1b67ded26f782e3fc38b994a569ecae6
+  metadata.gz: 0087cbbedb81696aa72f95b33979d5553127319f492c8f58ea4bb270ac5bc508cd2748df85fe8ca453382923e2fa8c4a3ed2ad7885829d3bd73a0cdff624cfc0
+  data.tar.gz: e391b20bb4d241b1ca3b1f4eb28479d9f9c75dc423656b09a14a3ccb237923ed53c6e9d26fbe19a35fa6184e44a0b3c3cfceb9080e286b6a1f4cfbf19ef49207

data/lib/phoenix_rails/channel.rb

@@ -48,62 +48,6 @@ module PhoenixRails
       @client.get("/channels/#{name}/users")[:users]
     end
 
-    # Compute authentication string required as part of the authentication
-    # endpoint response. Generally the authenticate method should be used in
-    # preference to this one
-    #
-    # @param socket_id [String] Each PhoenixRails socket connection receives a
-    #   unique socket_id. This is sent from phoenix.js to your server when
-    #   channel authentication is required.
-    # @param custom_string [String] Allows signing additional data
-    # @return [String]
-    #
-    def authentication_string(socket_id, custom_string = nil)
-      validate_socket_id(socket_id)
-
-      unless custom_string.nil? || custom_string.kind_of?(String)
-        raise Error, 'Custom argument must be a string'
-      end
-
-      string_to_sign = [socket_id, name, custom_string].
-        compact.map(&:to_s).join(':')
-      PhoenixRails.logger.debug "Signing #{string_to_sign}"
-      token = @client.authentication_token
-      digest = OpenSSL::Digest::SHA256.new
-      signature = OpenSSL::HMAC.hexdigest(digest, token.secret, string_to_sign)
-
-      return "#{token.key}:#{signature}"
-    end
-
-    # Generate the expected response for an authentication endpoint.
-    #
-    # @example Private channels
-    #   render :json => PhoenixRails['private-my_channel'].authenticate(params[:socket_id])
-    #
-    # @example Presence channels
-    #   render :json => PhoenixRails['private-my_channel'].authenticate(params[:socket_id], {
-    #     :user_id => current_user.id, # => required
-    #     :user_info => { # => optional - for example
-    #       :name => current_user.name,
-    #       :email => current_user.email
-    #     }
-    #   })
-    #
-    # @param socket_id [String]
-    # @param custom_data [Hash] used for example by private channels
-    #
-    # @return [Hash]
-    #
-    # @private Custom data is sent to server as JSON-encoded string
-    #
-    def authenticate(socket_id, custom_data = nil)
-      custom_data = MultiJson.encode(custom_data) if custom_data
-      auth = authentication_string(socket_id, custom_data)
-      r = {:auth => auth}
-      r[:channel_data] = custom_data if custom_data
-      r
-    end
-
     private
 
     def validate_socket_id(socket_id)

data/lib/phoenix_rails/client.rb

@@ -1,5 +1,3 @@
-require 'signature'
-
 module PhoenixRails
   class Client
     attr_accessor :scheme, :host, :port, :key, :secret
@@ -74,10 +72,6 @@ module PhoenixRails
       post('/events', trigger_params(channels, event_name, data, params))
     end
 
-    def authentication_token
-      Signature::Token.new(@key, @secret)
-    end
-
     # @private Construct a net/http http client
     def http_client
       @client ||= begin

data/lib/phoenix_rails/request.rb

@@ -1,4 +1,4 @@
-require 'signature'
+require 'jwt'
 require 'digest/md5'
 require 'multi_json'
 
@@ -11,9 +11,8 @@ module PhoenixRails
       @head = { 'Content-Type' => 'application/json'}
       @body = body
 
-      request = Signature::Request.new(verb.to_s.upcase, uri.path, params)
-      request.sign(client.authentication_token)
-      @params = request.signed_params
+      token = JWT.encode @body, client.secret, 'HS256'
+      @head[:Authorization] = "Bearer #{token}"
     end
 
     def send

data/lib/phoenix_rails.rb

@@ -10,7 +10,7 @@ module PhoenixRails
     def_delegators :default_client, :scheme, :host, :port, :key, :secret
     def_delegators :default_client, :scheme=, :host=, :port=, :key=, :secret=
 
-    def_delegators :default_client, :authentication_token, :url
+    def_delegators :default_client, :url
     def_delegators :default_client, :encrypted=, :url=
     def_delegators :default_client, :timeout=, :connect_timeout=, :send_timeout=, :receive_timeout=, :keep_alive_timeout=
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phoenix_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nguyen Le
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: Gem for pushing event to a Phoenix server for realtime
 email: nathanle89@gmail.com
 executables: []