pusher-platform 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bdffd489f757406cff5d4919ae39738c7e9f86a8
-  data.tar.gz: b15393a6ff63d326e4ca39d354e046635db89490
+SHA256:
+  metadata.gz: 3f8fa664613e2b4227ca919b6412f448a41b83b6879907344118badaaf31bc6d
+  data.tar.gz: f6e2d2ed0058baa06c8b1cb0cb6d258b33a1b19ab4a54ebf903203dfb0327cf5
 SHA512:
-  metadata.gz: 2ec68b234270eea843e46a968e9d2fbc4877b01b1d53153a6f23152f0d439fb5162be3b66848e2439be89a5d8bd1eec9cd03bcf453d3fd8e317f64bbbae02138
-  data.tar.gz: d1d3a2cacdaeb9e2f40e00042e4e8fe8840d4b87c3ab8730b1dc1b336315595c4bfe9266cbbd51c98956eae619573c88a8f000350b896b20b4cd3309b2965a58
+  metadata.gz: 01366e9a6c2d267985f5b92d8e88a1d37aaf553caf12fe38eb397ecc0718e82b557efcb193b72eeb960932f2085bfa67b4cf9607d292207cbfc2cdb87efc25ba
+  data.tar.gz: cc826fbcdeed2ac0fe95970306e9bc8b1122101d83d998ceb332f45a64fea7be230c8a4fe40f193c52fbb3754473a42e6bfe7515e347ed40e85141686e9407fe

data/lib/pusher-platform/authenticator.rb

@@ -1,7 +1,8 @@
 require 'jwt'
 require 'rack'
+require_relative './error_response'
 
-module Pusher
+module PusherPlatform
   TOKEN_EXPIRY = 24*60*60
 
   class Authenticator
@@ -11,25 +12,13 @@ module Pusher
       @key_secret = key_secret
     end
 
-    # Takes a Rack request to the authorization endpoint and and handles it
-    # either returning a new access/refresh token pair, or an error.
-    #
-    # @param request [Rack::Request] the request to authenticate
-    # @return the response object
-    def authenticate(request, options)
-      form_data = Rack::Utils.parse_nested_query request.body.read
-      grant_type = form_data['grant_type']
+    def authenticate(auth_payload, options)
+      authenticate_based_on_grant_type(auth_payload, options)
+    end
 
-      if grant_type == "client_credentials"
-        return authenticate_with_client_credentials(options)
-      elsif grant_type == "refresh_token"
-        old_refresh_jwt = form_data['refresh_token']
-        return authenticate_with_refresh_token(old_refresh_jwt, options)
-      else
-        return response(401, {
-          error: "unsupported_grant_type"
-        })
-      end
+    def authenticate_with_request(request, options)
+      auth_data = Rack::Utils.parse_nested_query request.body.read
+      authenticate_based_on_grant_type(auth_data, options)
     end
 
     def generate_access_token(options)
@@ -53,66 +42,82 @@ module Pusher
 
     private
 
+    def authenticate_based_on_grant_type(auth_data, options)
+      grant_type = auth_data['grant_type'] || auth_data[:grant_type]
+
+      if grant_type == "client_credentials"
+        return authenticate_with_client_credentials(options)
+      elsif grant_type == "refresh_token"
+        refresh_token = auth_data['refresh_token'] || auth_data[:refresh_token]
+        return authenticate_with_refresh_token(refresh_token, options)
+      else
+        err = ErrorResponse.new({
+          status: 401,
+          error: 'invalid_grant_type',
+          error_description: "Unsupported grant_type #{grant_type}"
+        })
+        return err
+      end
+    end
+
     def authenticate_with_client_credentials(options)
-      return respond_with_new_token_pair(options)
+      return new_token_pair(options)
     end
 
-    def authenticate_with_refresh_token(old_refresh_jwt, options)
+    def authenticate_with_refresh_token(refresh_token, options)
       old_refresh_token = begin
-        JWT.decode(old_refresh_jwt, @key_secret, true, {
+        JWT.decode(refresh_token, @key_secret, true, {
           iss: "api_keys/#{@key_id}",
           verify_iss: true,
         }).first
       rescue => e
         error_description = if e.is_a?(JWT::InvalidIssuerError)
-          "refresh token issuer is invalid"
+          "Refresh token issuer is invalid"
         elsif e.is_a?(JWT::ImmatureSignature)
-          "refresh token is not valid yet"
+          "Refresh token is not valid yet"
         elsif e.is_a?(JWT::ExpiredSignature)
-          "refresh tokan has expired"
+          "Refresh tokan has expired"
         else
-          "refresh token is invalid"
+          "Refresh token is invalid"
         end
 
-        return response(401, {
-          error: "invalid_grant",
-          error_description: error_description,
-          # TODO error_uri
+        err = ErrorResponse.new({
+          status: 401,
+          error: 'invalid_refresh_token',
+          error_description: error_description
         })
+        return err
       end
 
       if old_refresh_token["refresh"] != true
-        return response(401, {
-          error: "invalid_grant",
-          error_description: "refresh token does not have a refresh claim",
-          # TODO error_uri
+        err = ErrorResponse.new({
+          status: 401,
+          error: 'invalid_refresh_token',
+          error_description: "Refresh token does not have a refresh claim"
         })
+        return err
       end
 
       if options[:user_id] != old_refresh_token["sub"]
-        return response(401, {
-          error: "invalid_grant",
-          error_description: "refresh token has an invalid user id",
-          # TODO error_uri
-        })
+        return ErrorResponse.new(401, "refresh token has an invalid user id")
       end
 
-      return respond_with_new_token_pair(options)
+      return new_token_pair(options)
     end
 
     # Creates a payload dictionary made out of access and refresh token pair and TTL for the access token.
     #
     # @param user_id [String] optional id of the user, ignore for anonymous users
     # @return [Hash] Payload as a hash
-    def respond_with_new_token_pair(options)
+    def new_token_pair(options)
       access_token = generate_access_token(options)[:token]
       refresh_token = generate_refresh_token(options)[:token]
-      return response(200, {
+      {
         access_token: access_token,
         token_type: "bearer",
         expires_in: TOKEN_EXPIRY,
         refresh_token: refresh_token,
-      })
+      }
     end
 
     def generate_refresh_token(options)
@@ -128,12 +133,5 @@ module Pusher
 
       { token: JWT.encode(claims, @key_secret, 'HS256') }
     end
-
-    def response(status, body)
-      return {
-        status: status,
-        json: body,
-      }
-    end
   end
 end

data/lib/pusher-platform/base_client.rb

@@ -1,7 +1,8 @@
 require 'excon'
 require 'json'
+require_relative './error_response'
 
-module Pusher
+module PusherPlatform
   class BaseClient
     def initialize(options)
       raise "Unspecified host" if options[:host].nil?

data/lib/pusher-platform/common.rb

@@ -1,4 +1,4 @@
-module Pusher
+module PusherPlatform
   class Error < ::StandardError
   end
 end

data/lib/pusher-platform/error_response.rb

@@ -1,15 +1,35 @@
-module Pusher
+require_relative './common'
+
+module PusherPlatform
   class ErrorResponse < Error
-    attr_accessor :status, :headers, :description
+    attr_reader :status, :headers, :error_description, :error, :error_uri
 
-    def initialize(status, headers, description)
-      @status = status
-      @headers = headers
-      @description = description
+    def initialize(options)
+      @status = options[:status]
+      @headers = options[:headers] || {}
+      @error = options[:error]
+      @error_description = options[:error_description]
+      @error_uri = options[:error_uri]
     end
 
     def to_s
-      "Pusher::ErrorResponse: #{status} #{description}"
+      "PusherPlatform::ErrorResponse - status: #{@status} description: #{@error_description}"
+    end
+
+    def as_json(options = {})
+      json = {
+        status: @status,
+        headers: @headers,
+        error: @error,
+        error_description: @error_description,
+      }
+      json[:error_uri] = @error_uri unless @error_uri.nil?
+      json
     end
+
+    def to_json(*options)
+      as_json(*options).to_json(*options)
+    end
+
   end
 end

data/lib/pusher-platform/instance.rb

@@ -3,7 +3,7 @@ require_relative './base_client'
 require_relative './common'
 require_relative './error_response'
 
-module Pusher
+module PusherPlatform
 
   HOST_BASE = 'pusherplatform.io'
 
@@ -52,8 +52,12 @@ module Pusher
       @client.request(options)
     end
 
-    def authenticate(request, options)
-      @authenticator.authenticate(request, options)
+    def authenticate(auth_payload, options)
+      @authenticator.authenticate(auth_payload, options)
+    end
+
+    def authenticate_with_request(request, options)
+      @authenticator.authenticate_with_request(request, options)
     end
 
     def generate_access_token(options)

data/lib/pusher-platform.rb

@@ -1 +1 @@
-require 'pusher-platform/instance'
+require_relative 'pusher-platform/instance'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-platform
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Pusher Platform Ruby SDK