zuora_connect 0.0.5.6 → 0.0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75f9ed98e63d0fc10ad01c42cab2ef742f1a999
-  data.tar.gz: c0458d7d31cfc53e81e4cc0bf01d157f28709dd3
+  metadata.gz: c71fd050560a8874be39b40ffb67748135fb58a5
+  data.tar.gz: 64e34408cded45de75c19eeb10b0b0206e69bf84
 SHA512:
-  metadata.gz: e65ce18868b73e80d407bf6bb64b97f3db4dd394cdb523f4fa87b6c4e2947e1635b3d4bb94d2b56b21eff63b278c8f7d885d6b19fedb2cb62cf6a705b249e674
-  data.tar.gz: 44c17338a21b285a94bc0fb839f83b8e84e81cf20097780ae8f40f46efe6a660c88f96241e8a6acc4cba7862e37ddda20a19817dbf6e8d3cfdd99cbe0144eb05
+  metadata.gz: ff693b4d0094d05711f83bc5a6002664fa7166c3e7238e4e49377611c75c9bdf81b783d71a3642d66df88ba3612e47e27bdf04a8a7fbcc1bf5b295b9278c236d
+  data.tar.gz: 75426091080e23acf1b0c176d027b6caccbb5bf941794754375e28efccea47618c4973e1e6bb4856b251bf6251ee8acadce966349303e4bd3d119a100c4589c6

data/app/helpers/zuora_connect/application_helper.rb

@@ -1,4 +1,5 @@
 module ZuoraConnect
   module ApplicationHelper
+
   end
 end

data/app/models/zuora_connect/app_instance.rb

@@ -1,22 +1,24 @@
 module ZuoraConnect
   class AppInstance < ActiveRecord::Base
-    attr_accessor :user, :pass, :options, :mode, :logins, :valid
+    after_initialize :init
+    attr_accessor :user, :pass, :options, :mode, :logins, :valid, :task_data, :last_refresh
 
-    def new_session(user, password)
-      @user = user
-      @password = password
-      response = JSON.parse(HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => user, :password => password}).body)
-      @mode = response["mode"]
+    def init
       @options = Hash.new
       @logins = Hash.new
-      response.each do |k,v|
-        if k.match(/^(.*)_login$/)
-          @logins[k] = v
-        elsif k == "options"
-          v.each do |opt|
-            @options[opt["config_name"]] = opt
-          end
-        end
+      Apartment::Migrator.migrate(self.id)
+      Apartment::Tenant.switch!(self.id)
+    end
+
+    def new_session(user, password, session = nil)
+      @user = user
+      @pass = password
+      if session.nil? || (!session.nil? && self.id != session["appInstance"].to_i) || session["#{self.id}::task_data"].blank? || ( session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
+        Rails.logger.debug("REFRESHING")
+        self.refresh(session)
+      else
+        Rails.logger.debug("REBUILDING")
+        build_task(session["#{self.id}::task_data"], session)
       end
       @valid = true
     end
@@ -25,11 +27,37 @@ module ZuoraConnect
       if @user && @pass
         return HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/application_options/#{optionId}/edit?value=#{value}",:basic_auth => auth = {:username => user, :password => password})
       else
-        puts "Username or password is nil"
         return false
       end
     end
 
+    def refresh(session = nil)
+      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => self.user, :password => self.pass})
+      if response.code == 200
+        @last_refresh = Time.now.to_i
+        build_task(JSON.parse(response.body), session)
+      else
+        raise "Unauthorized"
+      end
+    end
+
+    def build_task(task_data, session)
+      @task_data = task_data
+      @mode = @task_data["mode"]
+      @task_data.each do |k,v|
+        if k.match(/^(.*)_login$/)
+          tmp = ZuoraConnect::Login.new(v)
+          tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
+          @logins[k] = tmp
+          self.attr_builder(k, @logins[k])
+        elsif k == "options"
+          v.each do |opt|
+            @options[opt["config_name"]] = opt
+          end
+        end
+      end
+    end
+
     def send_email
 
     end
@@ -37,5 +65,10 @@ module ZuoraConnect
     def self.decrypt_response(resp)
       OpenSSL::PKey::RSA.new(ZuoraConnect.configuration.private_key).private_decrypt(resp)
     end
+
+    def attr_builder(field,val)
+      singleton_class.class_eval { attr_accessor "#{field}" }
+      send("#{field}=", val)
+    end
   end
 end

data/app/models/zuora_connect/login.rb

@@ -0,0 +1,17 @@
+module ZuoraConnect
+  class Login
+
+    def initialize (fields)
+      self.attr_builder("client",::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)) if fields["tenant_type"] == "Zuora"
+      fields.each do |k,v|
+        self.attr_builder(k,v)
+      end
+    end
+
+    def attr_builder(field,val)
+      singleton_class.class_eval { attr_accessor "#{field}" }
+      send("#{field}=", val)
+    end
+
+  end
+end

data/config/initializers/apartment.rb

@@ -47,7 +47,7 @@ Apartment.configure do |config|
   #   end
   # end
   #
-  config.tenant_names = lambda { ZuoraConnect::AppInstance.pluck :database }
+  config.tenant_names = lambda { ZuoraConnect::AppInstance.pluck :id }
   config.excluded_models = ["ZuoraConnect::AppInstance"]
 
   #
@@ -56,7 +56,7 @@ Apartment.configure do |config|
   # Specifies whether to use PostgreSQL schemas or create a new database per Tenant.
   # The default behaviour is true.
   #
-  # config.use_schemas = true
+  config.use_schemas = true
 
   # Apartment can be forced to use raw SQL dumps instead of schema.rb for creating new schemas.
   # Use this when you are using some extra features in PostgreSQL that can't be respresented in

data/lib/zuora_connect.rb

@@ -1,7 +1,7 @@
 require 'zuora_connect/configuration'
 require "zuora_connect/engine"
 require 'zuora_connect/controllers/helpers'
-
+require 'zuora_connect/views/helpers'
 module ZuoraConnect
   class << self
     attr_accessor :configuration
@@ -10,6 +10,10 @@ module ZuoraConnect
     autoload :Helpers,        'zuora_connect/controllers/helpers'
   end
 
+  module Views
+    ActionView::Base.send(:include, Helpers)
+  end
+
   def self.configuration
     @configuration ||= Configuration.new
   end

data/lib/zuora_connect/configuration.rb

@@ -1,9 +1,10 @@
 module ZuoraConnect
   class Configuration
-    attr_accessor :url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode
+    attr_accessor :url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout
 
     def initialize
-      @url = "https://connect.zuora.com"
+      @timeout = 5.minutes
+      @url = "http://localhost:3000"
       @mode = "Production"
       @dev_mode_logins = { "target_login" => {"tenant_type" => "Zuora", "username" => "user", "password" => "pass", "url" => "url"} }
       @dev_mode_options = {"name" => {"config_name" => "name", "datatype" => "type", "value" => "value"}}

data/lib/zuora_connect/controllers/helpers.rb

@@ -4,20 +4,28 @@ module ZuoraConnect
     module Helpers
       extend ActiveSupport::Concern
 
-      def authenticate_request
+
+      def authenticate_connect_app_request
         if ZuoraConnect.configuration.mode == "Production"
-          data_present = set_session
-          if !session["valid"] && data_present
-            res = HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/tasks/#{session["appInstance"]}.json",:basic_auth => auth = {:username => session["user"], :password => session["key"]})
-            if res.code == 200
-              session["valid"] = true
+          instance_id = process_encrypted_response
+
+
+          if session["appInstance"]
+            if ZuoraConnect::AppInstance.where(:id => instance_id).size == 0
+              ZuoraConnect::AppInstance.create!(:id => instance_id )
+              Apartment::Tenant.create(instance_id)
             end
-          end
-          if !session["valid"]
+            @appinstance = ZuoraConnect::AppInstance.find(instance_id)
+            begin
+              @appinstance.new_session(session["#{instance_id}::user"], session["#{instance_id}::key"], session)
+            rescue
+              puts "redirect"
+              redirect_to "/500.html"
+            end
+          else
+            puts "redirect2"
             redirect_to "/500.html"
           end
-          set_app_instance(session["appInstance"].to_i) if session["appInstance"] || ( session["appInstance"] && Apartment::Tenant.current != session["appInstance"])
-          @appinstance.new_session(session["user"], session["key"]) if @appinstance && !@appinstance.valid
         else
           dev_mode
           set_app_instance(session["appInstance"].to_i)
@@ -27,7 +35,22 @@ module ZuoraConnect
         end
       end
 
-      def set_session
+      def persist_connect_app_session
+        @appinstance.logins.each do |key, login|
+          if login.tenant_type == "Zuora"
+            session["#{@appinstance.id}::#{key}:session"] = login.client.current_session
+          end
+        end
+        session["#{@appinstance.id}::task_data"] = @appinstance.task_data
+        session["#{@appinstance.id}::last_refresh"] = @appinstance.last_refresh
+      end
+
+      def check_connect_admin
+        redirect_to "/500.html" if !session["#{@appinstance.id}::admin"]
+      end
+
+    private
+      def process_encrypted_response
         session["valid"] |= false
         if request["data"]
           values = JSON.parse(ZuoraConnect::AppInstance.decrypt_response(Base64.urlsafe_decode64(request["data"])))
@@ -36,36 +59,22 @@ module ZuoraConnect
               params[k] = v
             end
           end
-          session["user"] = values["user"]
-          session["key"] = values["key"]
-          session["valid"] = false
+          session["#{values["appInstance"]}::user"] = values["user"]
+          session["#{values["appInstance"]}::key"] = values["key"]
+          session["#{values["appInstance"]}::valid"] = false
           session["appInstance"] = values["appInstance"]
-          session["admin"] = values["admin"] ? values["admin"] : false
-          return true
+          session["#{values["appInstance"]}::admin"] = values["admin"] ? values["admin"] : false
         end
-        return false
+        return session["appInstance"]
       end
 
       def dev_mode
         session["appInstance"] = "1"
-        session["user"] = "test"
-        session["key"] = "test"
-        session["valid"] = true
+        session["1::user"] = "test"
+        session["1::key"] = "test"
+        session["1::valid"] = true
       end
 
-      def set_app_instance(id)
-        if ZuoraConnect::AppInstance.where(:id => id).size == 0
-          ZuoraConnect::AppInstance.create!(:id => id )
-          Apartment::Tenant.create(id)
-        end
-        @appinstance = ZuoraConnect::AppInstance.find(id)
-        Apartment::Migrator.migrate(@appinstance.id)
-        Apartment::Tenant.switch!(@appinstance.id)
-      end
-
-      def check_admin
-        redirect_to "/500.html" if session["admin"] != "true"
-      end
     end
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "0.0.5.6"
+  VERSION = "0.0.6.0"
 end

data/lib/zuora_connect/views/helpers.rb

@@ -0,0 +1,9 @@
+module ZuoraConnect
+  module Views
+    module Helpers
+      def is_app_admin?
+        return session["#{@appinstance.id}::admin"]
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.5.6
+  version: 0.0.6.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: zuora_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +119,7 @@ files:
 - app/helpers/zuora_connect/api/v1/app_instance_helper.rb
 - app/helpers/zuora_connect/application_helper.rb
 - app/models/zuora_connect/app_instance.rb
+- app/models/zuora_connect/login.rb
 - app/views/layouts/zuora_connect/application.html.erb
 - config/initializers/apartment.rb
 - config/routes.rb
@@ -115,6 +130,7 @@ files:
 - lib/zuora_connect/controllers/helpers.rb
 - lib/zuora_connect/engine.rb
 - lib/zuora_connect/version.rb
+- lib/zuora_connect/views/helpers.rb
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile