pusher-platform 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8fa664613e2b4227ca919b6412f448a41b83b6879907344118badaaf31bc6d
-  data.tar.gz: f6e2d2ed0058baa06c8b1cb0cb6d258b33a1b19ab4a54ebf903203dfb0327cf5
+  metadata.gz: 1e41ca7382c2f692a1d29b1bd0f6663c7527999576a9018edf69b95700517149
+  data.tar.gz: f54842de0b46252cc2fe8321b13aa21e9459f3fc23a57a2c65ff784f14d3b02c
 SHA512:
-  metadata.gz: 01366e9a6c2d267985f5b92d8e88a1d37aaf553caf12fe38eb397ecc0718e82b557efcb193b72eeb960932f2085bfa67b4cf9607d292207cbfc2cdb87efc25ba
-  data.tar.gz: cc826fbcdeed2ac0fe95970306e9bc8b1122101d83d998ceb332f45a64fea7be230c8a4fe40f193c52fbb3754473a42e6bfe7515e347ed40e85141686e9407fe
+  metadata.gz: efe40b722811a77d902526e9096fa462f0e3563178c24ce62b79a654fea89b8a396f458f19844fb9a336e00659255a737933843f41e9fc53ff1c8fb32568ea21
+  data.tar.gz: d0c897bb31a552d3f20eb5e82677063e45131579f1784f1c3f2f0f42ae74efe04a6290b8a7d058e3ff9289f3ebb1f68ea3eda1d01ad40d8f1dfb362f24061aaa

data/lib/pusher-platform/authentication_response.rb

@@ -0,0 +1,28 @@
+module PusherPlatform
+  class AuthenticationResponse
+    attr_reader :status, :headers, :body
+
+    def initialize(options)
+      @status = options[:status]
+      @headers = options[:headers] || {}
+      @body = options[:body]
+    end
+
+    def to_s
+      "PusherPlatform::AuthenticationResponse - status: #{@status} body: #{@body.to_json}"
+    end
+
+    def as_json(options = {})
+      {
+        status: @status,
+        headers: @headers,
+        body: @body
+      }
+    end
+
+    def to_json(*options)
+      as_json(*options).to_json(*options)
+    end
+
+  end
+end

data/lib/pusher-platform/authenticator.rb

@@ -1,6 +1,7 @@
 require 'jwt'
 require 'rack'
-require_relative './error_response'
+require_relative './common'
+require_relative './authentication_response'
 
 module PusherPlatform
   TOKEN_EXPIRY = 24*60*60
@@ -13,10 +14,31 @@ module PusherPlatform
     end
 
     def authenticate(auth_payload, options)
-      authenticate_based_on_grant_type(auth_payload, options)
+      grant_type = auth_payload['grant_type'] || auth_payload[:grant_type]
+
+      unless grant_type == "client_credentials"
+        return AuthenticationResponse.new({
+          status: 422,
+          body: {
+            error: 'token_provider/invalid_grant_type',
+            error_description: "The grant_type provided, #{grant_type}, is unsupported"
+          }
+        })
+      end
+
+      authenticate_using_client_credentials(options)
     end
 
     def authenticate_with_request(request, options)
+      auth_data = Rack::Utils.parse_nested_query request.body.read
+      authenticate(auth_data, options)
+    end
+
+    def authenticate_with_refresh_token(auth_payload, options)
+      authenticate_based_on_grant_type(auth_payload, options)
+    end
+
+    def authenticate_with_refresh_token_and_request(request, options)
       auth_data = Rack::Utils.parse_nested_query request.body.read
       authenticate_based_on_grant_type(auth_data, options)
     end
@@ -46,25 +68,38 @@ module PusherPlatform
       grant_type = auth_data['grant_type'] || auth_data[:grant_type]
 
       if grant_type == "client_credentials"
-        return authenticate_with_client_credentials(options)
+        return authenticate_using_client_credentials(options, true)
       elsif grant_type == "refresh_token"
         refresh_token = auth_data['refresh_token'] || auth_data[:refresh_token]
-        return authenticate_with_refresh_token(refresh_token, options)
+        return authenticate_using_refresh_token(refresh_token, options)
       else
-        err = ErrorResponse.new({
-          status: 401,
-          error: 'invalid_grant_type',
-          error_description: "Unsupported grant_type #{grant_type}"
+        return AuthenticationResponse.new({
+          status: 422,
+          body: ErrorBody.new({
+            error: 'token_provider/invalid_grant_type',
+            error_description: "The grant_type provided, #{grant_type}, is unsupported"
+          })
         })
-        return err
       end
     end
 
-    def authenticate_with_client_credentials(options)
-      return new_token_pair(options)
+    def authenticate_using_client_credentials(options, with_refresh_token = false)
+      access_token = generate_access_token(options)[:token]
+      token_payload = {
+        access_token: access_token,
+        token_type: "bearer",
+        expires_in: TOKEN_EXPIRY
+      }
+
+      token_payload[:refresh_token] = generate_refresh_token(options)[:token] if with_refresh_token
+
+      return AuthenticationResponse.new({
+        status: 200,
+        body: token_payload
+      })
     end
 
-    def authenticate_with_refresh_token(refresh_token, options)
+    def authenticate_using_refresh_token(refresh_token, options)
       old_refresh_token = begin
         JWT.decode(refresh_token, @key_secret, true, {
           iss: "api_keys/#{@key_id}",
@@ -76,33 +111,44 @@ module PusherPlatform
         elsif e.is_a?(JWT::ImmatureSignature)
           "Refresh token is not valid yet"
         elsif e.is_a?(JWT::ExpiredSignature)
-          "Refresh tokan has expired"
+          "Refresh token has expired"
         else
           "Refresh token is invalid"
         end
 
-        err = ErrorResponse.new({
+        return AuthenticationResponse.new({
           status: 401,
-          error: 'invalid_refresh_token',
-          error_description: error_description
+          body: ErrorBody.new({
+            error: "token_provider/invalid_refresh_token",
+            error_description: error_description
+          })
         })
-        return err
       end
 
       if old_refresh_token["refresh"] != true
-        err = ErrorResponse.new({
+        return AuthenticationResponse.new({
           status: 401,
-          error: 'invalid_refresh_token',
-          error_description: "Refresh token does not have a refresh claim"
+          body: ErrorBody.new({
+            error: "token_provider/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 ErrorResponse.new(401, "refresh token has an invalid user id")
+        return AuthenticationResponse.new({
+          status: 401,
+          body: ErrorBody.new({
+            error: "token_provider/invalid_user_id_in_refresh_token",
+            error_description: "Refresh token has an invalid user id"
+          })
+        })
       end
 
-      return new_token_pair(options)
+      return AuthenticationResponse.new({
+        status: 200,
+        body: new_token_pair(options)
+      })
     end
 
     # Creates a payload dictionary made out of access and refresh token pair and TTL for the access token.

data/lib/pusher-platform/common.rb

@@ -1,4 +1,28 @@
 module PusherPlatform
   class Error < ::StandardError
   end
+
+  class ErrorBody
+    attr_reader :error, :error_description, :error_uri
+
+    def initialize(options)
+      @error = options[:error]
+      @error_description = options[:error_description]
+      @error_uri = options[:error_uri]
+    end
+
+    def as_json(options = {})
+      json = {
+        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

@@ -60,6 +60,14 @@ module PusherPlatform
       @authenticator.authenticate_with_request(request, options)
     end
 
+    def authenticate_with_refresh_token(auth_payload, options)
+      @authenticator.authenticate_with_refresh_token(auth_payload, options)
+    end
+
+    def authenticate_with_refresh_token_and_request(auth_payload, options)
+      @authenticator.authenticate_with_refresh_token_and_request(auth_payload, options)
+    end
+
     def generate_access_token(options)
       @authenticator.generate_access_token(options)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-platform
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -65,6 +65,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pusher-platform.rb
+- lib/pusher-platform/authentication_response.rb
 - lib/pusher-platform/authenticator.rb
 - lib/pusher-platform/base_client.rb
 - lib/pusher-platform/common.rb