zuora_connect 0.0.8.7 → 0.0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ebef5be131dc140b59f694e5649d8fa2dd04d3
-  data.tar.gz: 110eacfd8172a36046b6f3e34e02a829041b9de2
+  metadata.gz: cb571a97d8681a301ca314a1d95f3549ccad57ba
+  data.tar.gz: 7d2fe3929a59033b06e2fbc6e31b0cc192160eca
 SHA512:
-  metadata.gz: b1c6e202b1a03d019b99f235609f3611089c131975c16d900161ef92e65fc3c1674788f8c1820a6186a683854b71f990c320f6e2335ce6afafbec82856de7b38
-  data.tar.gz: 04456991c5d73a8da3dcd3a9dd172e3176b5267bbf8edb6e6fcaa7b7b9b5528ab30d7294d1019903d7f3065c4f2e103461bf122bb65c2e5d8bf6944d0864908b
+  metadata.gz: cbbea8478bfe96f32c74774b472abf0f558ea3eacd1653ba39307f7f0b6371598fdf6a2b22466c242ad1d9301f2651fb62e836b419346f26160a6036098e64e9
+  data.tar.gz: b7180a6de4307a4dd42b167e0703da65fe60e444be0bb260216485515d77b1216d58025fbc22c95a420f698cd32ebdce0e01d4b5de299daf5e9b32bbbf94fc5f

data/app/models/zuora_connect/app_instance.rb

@@ -1,18 +1,32 @@
 module ZuoraConnect
   class AppInstance < ActiveRecord::Base
     after_initialize :init
-    attr_accessor :user, :pass, :options, :mode, :logins, :valid, :task_data, :last_refresh
+    attr_accessor :options, :mode, :logins, :valid, :task_data, :last_refresh, :username, :password
 
     def init
       @options = Hash.new
       @logins = Hash.new
+      @valid = false
       Apartment::Migrator.migrate(self.id)
       Apartment::Tenant.switch!(self.id)
+
+      ## DEV MODE TASK DATA MOCKUP
+      if ZuoraConnect.configuration.mode != "Production"
+        self.options = ZuoraConnect.configuration.dev_mode_options
+        ZuoraConnect.configuration.dev_mode_logins.each do |k,v|
+          tmp = ZuoraConnect::Login.new(v)
+          self.logins[k] = tmp
+          self.attr_builder(k, tmp)
+        end
+        self.mode = ZuoraConnect.configuration.dev_mode_mode
+      end
+      ###
     end
 
-    def new_session(user, password, session = {})
-      @user = user
-      @pass = password
+    def new_session(session: {}, username: self.access_token, password: self.refresh_token)
+      @username = username
+      @password = password
+      @last_refresh = session["#{self.id}::last_refresh"]
       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 - Session Nil") if session.nil?
         Rails.logger.debug("REFRESHING - AppInstance ID does not match session id") if  (!session.nil? && self.id != session["appInstance"].to_i)
@@ -40,20 +54,20 @@ module ZuoraConnect
     end
 
     def updateOption(optionId, value)
-      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})
+      if self.access_token && self.refresh_token
+        return HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/application_options/#{optionId}/edit?value=#{value}",:basic_auth => auth = {:username => self.username, :password => self.password})
       else
         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})
+      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => self.username, :password => self.password})
       if response.code == 200
         @last_refresh = Time.now.to_i
         build_task(JSON.parse(response.body), session)
       else
-        raise "Unauthorized"
+        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
     end
 

data/db/migrate/20161024162319_add_tokens_to_app_instance.rb

@@ -0,0 +1,6 @@
+class AddTokensToAppInstance < ActiveRecord::Migration
+  def change
+    add_column :zuora_connect_app_instances, :access_token, :string
+    add_column :zuora_connect_app_instances, :refresh_token, :string
+  end
+end

data/lib/zuora_connect.rb

@@ -1,7 +1,9 @@
 require 'zuora_connect/configuration'
 require "zuora_connect/engine"
+require 'zuora_connect/exceptions'
 require 'zuora_connect/controllers/helpers'
 require 'zuora_connect/views/helpers'
+
 module ZuoraConnect
   class << self
     attr_accessor :configuration

data/lib/zuora_connect/configuration.rb

@@ -10,10 +10,12 @@ module ZuoraConnect
       @invalid_app_instance_error_path = '/connect/invalid_instance'
       @url = "https://connect.zuora.com/"
       @mode = "Production"
+      @private_key = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpgIBAAKCAQEA3PlAZWUbyvBSVU9GZxQM+brbwDfecsrFXJIbEvV76LVfFuTO\nDbyMPyuM0SBEAskb79wqNsn5JD0edCwmvZ+/Kn83b8SFkFW3f1tUxA0zFdVuqKP2\nJk1vms97yvOUveDjv22gYVMJYcSAFEzg9D9fUvTRocuBWQdbTq1cyJL+LYs9bUpl\nMB4oIUZuQ5nYz66y2gLlF0yUFNAfLpaCyaJvAmN93bPWTPfaKf+PMtkWCMQJQ3w+\nGvsudynLyE0ZgLx5mfM18h08iTMl61sUawyUEYNPm71Q6er9TB7oiOt3RT7ncw9P\nN+jzdklEphPp+1RaK35joPLQZjZl3Nh/XZg5eQIDAQABAoIBAQCJB+SgPDgk/C0C\njDurdmqpfvABXmQLKaWER3KUqjjh0X+bUd5Z9F/AWMBley3R0GcLsqtW+J8QkvpM\nroiDtQm2T9fP7r2pCQ7W4otJXKoeUxHhcHQXwpOAHES3UaAes9RoBJKdaAH8Z//J\nFve1X4s8hWdufyXCUOaVfrp4A3euQ3BYkb1n6yCnaEclG/evX6VM5jYMuHSDH0AS\nRUAMotuNvoLEIweNjWIolrKBEe+ZA6Rz6UaSoOxoNl8qWWOMsQvKzWfzHOA/YMnn\n9TN3AR10XYhWVjzNWL2dN1Jh4aD3d0byzImuhnCdIsIkTmS5aogl3/iFDce+9+kF\nLnkH5PuRAoGBAPiXQZdXHu7HwuQvZdb+2kII4kVLyLRM6v81rmXZr7pBUWrdpezy\nnFDj8OumSml4cKOLDUTAj/2/Hjs1o3JVGZqD0EbVrfIF0LZ3LzHb0rAae0uoyG7S\ny+2Y8wjLP53RogdZMA+6uoozEPM7yAp04d+rVPQY8i6JwGQmRYh7xSSlAoGBAOOP\nRssUBabZX13gQQ3BsO28g4HTEiFuqgAvGG/44Xbf74IRQiOT6ZaNYELvgaZT+RW2\nbp5E+T15Qe+SHHdxJhv3wtsnAw7yno1BmHpkAs1mEjjGFbNMF84YcRWSRU09g9Pm\nORhAc4lCFxHh7LnGsI1bgcPOYuFDRSHjYEy6y6VFAoGBAOiE8kEQqEpIZy7wdp1m\nu9fQX3TZsd2TpKsaFwoFV60rs2/16mF7fGLdElgYrrmAgjs2sS6Bvy1lOm2/eiZT\nGyO/72ySKaWbcuF5EZfdOXCnFHRsZy3h1gVjbs/m7JY9owSkk6Pi0OC7aztXy4Cc\nWznPFCNNwhltl5sVgSxsOLZRAoGBAJcPOI581xegevdFc8nfB0V5+86FwCZjYQTI\nPq+uBnW0SDkOndoiSVEAvqMQfP9eBR7NwPbdkJqnUQbo9m6vtP2h5j820YfttSTO\nI5szosyY8oWvsR4Z6D+O6BrKw6h3qnhS/xnDRy8ZqVjcohnc9LyRvz2tVuR0lILf\nfsDQy3kFAoGBAOm3N39RR7BwOMWIbe0Pk/ohJJdKwzsd1t1WyuXjAHJGdhMXkjl5\n9T1UsrouUr6qr545FNwEXktjmJ0IuqwypBC7B9kezKJlNTsZxmtcl7HfIFFOade7\nvrPHAAHPHSvCRcUPcFG1PDnFno66dXFOZwMo7W2lN+xTXuO0EvBAlW9P\n-----END RSA PRIVATE KEY-----\n"
+
+      # DEV MODE OPTIONS
       @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"}}
       @dev_mode_mode = "Universal"
-      @private_key = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpgIBAAKCAQEA3PlAZWUbyvBSVU9GZxQM+brbwDfecsrFXJIbEvV76LVfFuTO\nDbyMPyuM0SBEAskb79wqNsn5JD0edCwmvZ+/Kn83b8SFkFW3f1tUxA0zFdVuqKP2\nJk1vms97yvOUveDjv22gYVMJYcSAFEzg9D9fUvTRocuBWQdbTq1cyJL+LYs9bUpl\nMB4oIUZuQ5nYz66y2gLlF0yUFNAfLpaCyaJvAmN93bPWTPfaKf+PMtkWCMQJQ3w+\nGvsudynLyE0ZgLx5mfM18h08iTMl61sUawyUEYNPm71Q6er9TB7oiOt3RT7ncw9P\nN+jzdklEphPp+1RaK35joPLQZjZl3Nh/XZg5eQIDAQABAoIBAQCJB+SgPDgk/C0C\njDurdmqpfvABXmQLKaWER3KUqjjh0X+bUd5Z9F/AWMBley3R0GcLsqtW+J8QkvpM\nroiDtQm2T9fP7r2pCQ7W4otJXKoeUxHhcHQXwpOAHES3UaAes9RoBJKdaAH8Z//J\nFve1X4s8hWdufyXCUOaVfrp4A3euQ3BYkb1n6yCnaEclG/evX6VM5jYMuHSDH0AS\nRUAMotuNvoLEIweNjWIolrKBEe+ZA6Rz6UaSoOxoNl8qWWOMsQvKzWfzHOA/YMnn\n9TN3AR10XYhWVjzNWL2dN1Jh4aD3d0byzImuhnCdIsIkTmS5aogl3/iFDce+9+kF\nLnkH5PuRAoGBAPiXQZdXHu7HwuQvZdb+2kII4kVLyLRM6v81rmXZr7pBUWrdpezy\nnFDj8OumSml4cKOLDUTAj/2/Hjs1o3JVGZqD0EbVrfIF0LZ3LzHb0rAae0uoyG7S\ny+2Y8wjLP53RogdZMA+6uoozEPM7yAp04d+rVPQY8i6JwGQmRYh7xSSlAoGBAOOP\nRssUBabZX13gQQ3BsO28g4HTEiFuqgAvGG/44Xbf74IRQiOT6ZaNYELvgaZT+RW2\nbp5E+T15Qe+SHHdxJhv3wtsnAw7yno1BmHpkAs1mEjjGFbNMF84YcRWSRU09g9Pm\nORhAc4lCFxHh7LnGsI1bgcPOYuFDRSHjYEy6y6VFAoGBAOiE8kEQqEpIZy7wdp1m\nu9fQX3TZsd2TpKsaFwoFV60rs2/16mF7fGLdElgYrrmAgjs2sS6Bvy1lOm2/eiZT\nGyO/72ySKaWbcuF5EZfdOXCnFHRsZy3h1gVjbs/m7JY9owSkk6Pi0OC7aztXy4Cc\nWznPFCNNwhltl5sVgSxsOLZRAoGBAJcPOI581xegevdFc8nfB0V5+86FwCZjYQTI\nPq+uBnW0SDkOndoiSVEAvqMQfP9eBR7NwPbdkJqnUQbo9m6vtP2h5j820YfttSTO\nI5szosyY8oWvsR4Z6D+O6BrKw6h3qnhS/xnDRy8ZqVjcohnc9LyRvz2tVuR0lILf\nfsDQy3kFAoGBAOm3N39RR7BwOMWIbe0Pk/ohJJdKwzsd1t1WyuXjAHJGdhMXkjl5\n9T1UsrouUr6qr545FNwEXktjmJ0IuqwypBC7B9kezKJlNTsZxmtcl7HfIFFOade7\nvrPHAAHPHSvCRcUPcFG1PDnFno66dXFOZwMo7W2lN+xTXuO0EvBAlW9P\n-----END RSA PRIVATE KEY-----\n"
     end
   end
 end

data/lib/zuora_connect/controllers/helpers.rb

@@ -4,90 +4,100 @@ module ZuoraConnect
     module Helpers
       extend ActiveSupport::Concern
 
+      def instance_data_lookup(id = nil, user = nil)
+        return session.blank? ? {} : session
+      end
+
+      def authenticate_app_api_request
+        authenticate_or_request_with_http_basic do |username, password|
+          @appinstance = ZuoraConnect::AppInstance.find(params[:instance_id])
+          @appinstance.new_session(:session => {}, :username => username, :password => password)
+          return @appinstance.valid
+        end
+      end
 
       def authenticate_connect_app_request
         if ZuoraConnect.configuration.mode == "Production"
-          instance_id = process_encrypted_response
-          if session["appInstance"]
-            if ZuoraConnect::AppInstance.where(:id => instance_id).size == 0
-              Apartment::Tenant.switch!("public")
-              Apartment::Tenant.create(instance_id)
-              ZuoraConnect::AppInstance.create!(:id => instance_id )
-            end
-            @appinstance = ZuoraConnect::AppInstance.find(instance_id)
-            begin
-              @appinstance.new_session(session["#{instance_id}::user"], session["#{instance_id}::key"], session)
-              I18n.locale = session["#{instance_id}::user::locale"] ?  session["#{instance_id}::user::locale"] : ZuoraConnect.configuration.default_locale
-              Time.zone = session["#{instance_id}::user::timezone"] ? session["#{instance_id}::user::timezone"] : ZuoraConnect.configuration.default_time_zone
-            rescue
-              redirect_to ZuoraConnect.configuration.session_error_path
-            end
+          if request["data"]
+            setup_instance_via_data
           else
-            redirect_to ZuoraConnect.configuration.invalid_app_instance_error_path
+            setup_instance_via_session
           end
+          @appinstance.new_session(:session =>instance_data_lookup(@appinstance.id, @appinstance.access_token))
+          I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : ZuoraConnect.configuration.default_locale
+          Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : ZuoraConnect.configuration.default_time_zone
         else
-          dev_mode
-          instance_id = session["appInstance"].to_i
-          if session["appInstance"]
-            if ZuoraConnect::AppInstance.where(:id => instance_id).size == 0
-              Apartment::Tenant.switch!("public")
-              Apartment::Tenant.create(instance_id)
-              ZuoraConnect::AppInstance.create!(:id => instance_id )
-            end
-            @appinstance = ZuoraConnect::AppInstance.find(instance_id)
-          else
-            redirect_to "/500.html"
-          end
-          @appinstance.options = ZuoraConnect.configuration.dev_mode_options
-          ZuoraConnect.configuration.dev_mode_logins.each do |k,v|
-            tmp = ZuoraConnect::Login.new(v)
-            tmp.client.current_session = session["#{@appinstance.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{@appinstance.id}::#{k}:session"]
-            @appinstance.logins[k] = tmp
-            @appinstance.attr_builder(k, tmp)
-          end
-          @appinstance.mode = ZuoraConnect.configuration.dev_mode_mode
+          setup_instance_via_dev_mode
+          I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : ZuoraConnect.configuration.default_locale
+          Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : ZuoraConnect.configuration.default_time_zone
         end
+        Thread.current[:appinstance] = @appinstance
       end
 
       def persist_connect_app_session
         session.merge!(@appinstance.save_data)
       end
 
+      def check_connect_admin!
+        raise ZuoraConnect::Exceptions::AccessDenied.new("User is not an authorized admin for this application") if !session["#{@appinstance.id}::admin"]
+      end
+
       def check_connect_admin
-        redirect_to "/500.html" if !session["#{@appinstance.id}::admin"]
+        return session["#{@appinstance.id}::admin"]
       end
 
     private
-      def process_encrypted_response
+      def setup_instance_via_data
         session["valid"] |= false
-        if request["data"]
-          reset_session
-          values = JSON.parse(ZuoraConnect::AppInstance.decrypt_response(Base64.urlsafe_decode64(request["data"])))
-          if values["param_data"]
-            values["param_data"].each do |k ,v|
-              params[k] = v
-            end
-          end
-          session["#{values["appInstance"]}::destroy"] = values["destroy"]
-          session["#{values["appInstance"]}::user"] = values["user"]
-          session["#{values["appInstance"]}::key"] = values["key"]
-          session["#{values["appInstance"]}::valid"] = false
-          session["appInstance"] = values["appInstance"]
-          if values["current_user"]
-            session["#{values["appInstance"]}::admin"] = values["current_user"]["admin"] ? values["current_user"]["admin"] : false
-            session["#{values["appInstance"]}::user::timezone"] = values["current_user"]["timezone"]
-            session["#{values["appInstance"]}::user::locale"] = values["current_user"]["locale"]
-            session["#{values["appInstance"]}::user::email"] = values["current_user"]["email"]
+        reset_session
+        values = JSON.parse(ZuoraConnect::AppInstance.decrypt_response(Base64.urlsafe_decode64(request["data"])))
+        if values["param_data"]
+          values["param_data"].each do |k ,v|
+            params[k] = v
           end
         end
-        return session["appInstance"]
+        session["#{values["appInstance"]}::destroy"] = values["destroy"]
+        session["#{values["appInstance"]}::valid"] = false
+        session["appInstance"] = values["appInstance"]
+        if values["current_user"]
+          session["#{values["appInstance"]}::admin"] = values["current_user"]["admin"] ? values["current_user"]["admin"] : false
+          session["#{values["appInstance"]}::user::timezone"] = values["current_user"]["timezone"]
+          session["#{values["appInstance"]}::user::locale"] = values["current_user"]["locale"]
+          session["#{values["appInstance"]}::user::email"] = values["current_user"]["email"]
+        end
+
+        @appinstance = ZuoraConnect::AppInstance.where(:id => values["appInstance"].to_i).first
+        if @appinstance.blank?
+          Apartment::Tenant.switch!("public")
+          Apartment::Tenant.create(values["appInstance"].to_i)
+          @appinstance = ZuoraConnect::AppInstance.create!(:id => values["appInstance"].to_i, :access_token => values["user"], :refresh_token => values["key"])
+        end
+        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank?
+          @appinstance.update_attributes(:access_token =>  values["user"], :refresh_token =>  values["key"])
+        end
+      end
+
+      def setup_instance_via_session
+        if !session["appInstance"].blank?
+          @appinstance = ZuoraConnect::AppInstance.where(:id => session["appInstance"]).first
+        else
+          raise ZuoraConnect::Exceptions::SessionInvalid.new("Session Blank -- Relaunch Application")
+        end
       end
 
-      def dev_mode
+      def setup_instance_via_dev_mode
         session["appInstance"] = "1"
-        session["1::user"] = "test"
-        session["1::key"] = "test"
-        session["1::valid"] = true
+        session["valid"] = true
+        values = {:user => "test" , :key => "test"}
+        @appinstance = ZuoraConnect::AppInstance.where(:id => values["appInstance"].to_i).first
+        if @appinstance.blank?
+          Apartment::Tenant.switch!("public")
+          Apartment::Tenant.create(values["appInstance"].to_i)
+          @appinstance = ZuoraConnect::AppInstance.create!(:id => values["appInstance"].to_i, :access_token => "test", :refresh_token => "test")
+        end
+        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank?
+          @appinstance.update_attributes(:access_token =>  values["user"], :refresh_token =>  values["key"])
+        end
       end
 
     end

data/lib/zuora_connect/exceptions.rb

@@ -0,0 +1,48 @@
+module ZuoraConnect
+  module Exceptions
+    class Error < StandardError; end
+    class AuthorizationNotPerformed < Error; end
+
+    class SessionInvalid < Error
+      attr_writer :default_message
+
+      def initialize(message = nil)
+        @message = message
+        @default_message = "Session data invalid."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
+    class ConnectCommunicationError < Error
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message = nil,response=nil, code =nil)
+        @code = code
+        @message = message
+        @response = response
+        @default_message = "Error communication with Connect."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
+    class AccessDenied < Error
+      attr_writer :default_message
+
+      def initialize(message = nil)
+        @message = message
+        @default_message = "You are not authorized to access this page."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+  end
+end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "0.0.8.7"
+  VERSION = "0.0.8.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.8.7
+  version: 0.0.8.8
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -127,11 +127,13 @@ files:
 - config/initializers/apartment.rb
 - config/routes.rb
 - db/migrate/20160718151733_create_connect_app_instances.rb
+- db/migrate/20161024162319_add_tokens_to_app_instance.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb
 - lib/zuora_connect/controllers/helpers.rb
 - lib/zuora_connect/engine.rb
+- lib/zuora_connect/exceptions.rb
 - lib/zuora_connect/version.rb
 - lib/zuora_connect/views/helpers.rb
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb