pusher-platform 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2d621a6b9915f71967e78ca6ad32130fc88049
-  data.tar.gz: de6d68d17c1df236de5b3cf67f6f3659334e8a27
+  metadata.gz: 227190e608cfbaa5d09acc4cc329c6837ee820d1
+  data.tar.gz: ffefafb388f8bd3f2687f465bdb535ed97c9615e
 SHA512:
-  metadata.gz: 0c8dd63f3a5cc649125cd8cab1cca0e3262b003cfcd5ccdc441f027483384cb1838d4fbb2ba219ca67fc6d7523989f1ee0ed292a431a0868d25b86f937fa0dfb
-  data.tar.gz: c3dcf874cfe172b2f27983fc6249d6abf5e68d88007623b1b070540bf9ad929da2afb2a0a7987dac22584787959b9419dc3cb3714e8b010178741b20df8d6a49
+  metadata.gz: 001425ee5c3bd2c8078fdcc33a0107e71f96644732aaada61bef328a85c7d4c2a2bb464cbc53cb8301b44ddfce8c4fa7a8095c64145fa9cb0970c97bfdd59ae8
+  data.tar.gz: 601711c1329d4c4938f79184de57ba25f89172e8b892152cd7545f2e15489356394feb6223dad54f268d39b4a0b38ab810da8df22afd80743556d1a11d37a351

data/lib/pusher-platform.rb

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

data/lib/pusher-platform/authenticator.rb

@@ -6,10 +6,10 @@ module Pusher
   TOKEN_EXPIRY = 24*60*60
 
   class Authenticator
-    def initialize(app_id, app_key_id, app_key_secret)
-      @app_id = app_id
-      @app_key_id = app_key_id
-      @app_key_secret = app_id
+    def initialize(instance_id, key_id, key_secret)
+      @instance_id = instance_id
+      @key_id = key_id
+      @key_secret = key_secret
     end
 
     # Takes a Rack request to the authorization endpoint and and handles it
@@ -33,6 +33,25 @@ module Pusher
       end
     end
 
+    def generate_access_token(options)
+      now = Time.now.utc.to_i
+
+      claims = {
+        app: @instance_id,
+        iss: "api_keys/#{@key_id}",
+        iat: now - TOKEN_LEEWAY,
+        exp: now + TOKEN_EXPIRY + TOKEN_LEEWAY,
+      }
+
+      claims.merge({ sub: options[:user_id] }) unless options[:user_id].nil?
+      claims.merge({ su: true }) if options[:su]
+
+      {
+        token: JWT.encode(claims, @key_secret, 'HS256'),
+        expires_in: TOKEN_EXPIRY
+      }
+    end
+
     private
 
     def authenticate_with_client_credentials(options)
@@ -41,8 +60,8 @@ module Pusher
 
     def authenticate_with_refresh_token(old_refresh_jwt, options)
       old_refresh_token = begin
-        JWT.decode(old_refresh_jwt, @app_key_secret, true, {
-          iss: "api_keys/#{@app_key_id}",
+        JWT.decode(old_refresh_jwt, @key_secret, true, {
+          iss: "api_keys/#{@key_id}",
           verify_iss: true,
           leeway: 30,
         }).first
@@ -88,8 +107,8 @@ module Pusher
     # @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)
-      access_token = generate_access_token(options)
-      refresh_token = generate_refresh_token(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",
@@ -98,32 +117,18 @@ module Pusher
       })
     end
 
-    def generate_access_token(options)
-      now = Time.now.utc.to_i
-
-      claims = {
-        app: @app_id,
-        iss: "api_keys/#{@app_key_id}",
-        iat: now - TOKEN_LEEWAY,
-        exp: now + TOKEN_EXPIRY + TOKEN_LEEWAY,
-        sub: options[:user_id],
-      }
-
-      JWT.encode(claims, @app_key_secret, "HS256")
-    end
-
     def generate_refresh_token(options)
       now = Time.now.utc.to_i
 
       claims = {
-        app: @app_id,
-        iss: "api_keys/#{@app_key_id}",
+        app: @instance_id,
+        iss: "api_keys/#{@key_id}",
         iat: now - TOKEN_LEEWAY,
         refresh: true,
         sub: options[:user_id],
       }
 
-      JWT.encode(claims, @app_key_secret, "HS256")
+      { token: JWT.encode(claims, @key_secret, 'HS256') }
     end
 
     def response(status, body)

data/lib/pusher-platform/base_client.rb

@@ -5,7 +5,13 @@ module Pusher
   class BaseClient
     def initialize(options)
       raise "Unspecified host" if options[:host].nil?
-      @connection = Excon.new("https://#{options[:host]}")
+      port_string = options[:port] || ''
+      host_string = "https://#{options[:host]}#{port_string}"
+      @connection = Excon.new(host_string)
+
+      @instance_id = options[:instance_id]
+      @service_name = options[:service_name]
+      @service_version = options[:service_version]
     end
 
     def request(options)
@@ -24,7 +30,7 @@ module Pusher
 
       response = @connection.request(
         method: options[:method],
-        path: options[:path],
+        path: "services/#{@service_name}/#{@service_version}/#{@instance_id}/#{options[:path]}",
         headers: headers,
         body: options[:body],
       )

data/lib/pusher-platform/instance.rb

@@ -0,0 +1,74 @@
+require_relative './authenticator'
+require_relative './base_client'
+require_relative './common'
+require_relative './error_response'
+
+module Pusher
+
+  HOST_BASE = 'pusherplatform.io'
+
+  class Instance
+    def initialize(options)
+      raise "No instance provided" if options[:instance].nil?
+      raise "No service name provided" if options[:service_name].nil?
+      raise "No service version provided" if options[:service_version].nil?
+      instance = options[:instance]
+      @service_name = options[:service_name]
+      @service_version = options[:service_version]
+
+      key_parts = options[:key].match(/^([^:]+):(.+)$/)
+      raise "Invalid key" if key_parts.nil?
+
+      @key_id = key_parts[1]
+      @key_secret = key_parts[2]
+
+      split_instance = instance.split(':')
+
+      @platform_version = split_instance[0]
+      @cluster = split_instance[1]
+      @instance_id = split_instance[2]
+
+      @client = if options[:client]
+        options[:client]
+      else
+        BaseClient.new(
+          host: options[:host] || "#{@cluster}.#{HOST_BASE}",
+          port: options[:port],
+          instance_id: @instance_id,
+          service_name: @service_name,
+          service_version: @service_version
+        )
+      end
+
+      @authenticator = Authenticator.new(@instance_id, @key_id, @key_secret)
+    end
+
+    def request(options)
+      options = scope_request_options(options)
+      if options[:jwt].nil?
+        options = options.merge(
+          { jwt: @authenticator.generate_access_token({ su: true })[:token] }
+        )
+      end
+      @client.request(options)
+    end
+
+    def authenticate(request, options)
+      @authenticator.authenticate(request, options)
+    end
+
+    def generate_access_token(options)
+      @authenticator.generate_access_token(options)
+    end
+
+    private
+
+    def scope_request_options(options)
+      path = options[:path]
+        .gsub(/\/+/, "/")
+        .gsub(/\/+$/, "")
+      options.merge({ path: path })
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-platform
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -65,11 +65,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pusher-platform.rb
-- lib/pusher-platform/app.rb
 - lib/pusher-platform/authenticator.rb
 - lib/pusher-platform/base_client.rb
 - lib/pusher-platform/common.rb
 - lib/pusher-platform/error_response.rb
+- lib/pusher-platform/instance.rb
 homepage: 
 licenses:
 - MIT

data/lib/pusher-platform/app.rb

@@ -1,61 +0,0 @@
-require_relative './authenticator'
-require_relative './base_client'
-require_relative './common'
-require_relative './error_response'
-
-module Pusher
-  class App
-    def initialize(options)
-      raise "Invalid app ID" if options[:app_id].nil?
-      @app_id = options[:app_id]
-
-      app_key_parts = /^([^:]+):(.+)$/.match(options[:app_key])
-      raise "Invalid app key" if app_key_parts.nil?
-
-      @app_key_id = app_key_parts[1]
-      @app_key_secret = app_key_parts[2]
-
-      @client = if options[:client]
-        options[:client]
-      else
-        raise "Invalid cluster" if options[:cluster].nil?
-        BaseClient.new(host: options[:cluster])
-      end
-
-      @authenticator = Authenticator.new(@app_id, @app_key_id, @app_key_secret)
-    end
-
-    def request(options)
-      options = scope_request_options("apps", options)
-      if options[:jwt].nil?
-        options = options.merge({ jwt: generate_superuser_jwt() })
-      end
-      @client.request(options)
-    end
-
-    def authenticate(request, options)
-      @authenticator.authenticate(request, options)
-    end
-
-    private
-
-    def scope_request_options(prefix, options)
-      path = "/#{prefix}/#{@app_id}/#{options[:path]}"
-        .gsub(/\/+/, "/")
-        .gsub(/\/+$/, "")
-      options.merge({ path: path })
-    end
-
-    def generate_superuser_jwt
-      now = Time.now.utc.to_i
-      claims = {
-        app: @app_id,
-        iss: "api_keys/#{@app_key_id}",
-        su: true,
-        iat: now - 30,   # some leeway for the server
-        exp: now + 60*5, # 5 minutes should be enough for a single request
-      }
-      JWT.encode(claims, @app_key_secret)
-    end
-  end
-end