aptible-rails 0.6.13 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28cb0873976e088fd11afe512af9a7f959e3cbd
-  data.tar.gz: 4739e33daa19441251a0dd9a830a0e1634ac94aa
+  metadata.gz: 2c8dc1d684786ad45a025fc08834c374dbdbc6bb
+  data.tar.gz: 1968ca83e38e726bf13a141b2af1e62a785d3290
 SHA512:
-  metadata.gz: 1f6363260c22720e41faab63e75e1856404c6f6434310f6a374049779d061adc0cb4a6b9eba821b89fabdc74e9709200fee583d613bcff066f9d5c08088edee2
-  data.tar.gz: dad98350604c78e7f10b5b916d3d9d53d1d0040aa68891c18e942cb28022c8ecaceff237e2ab01724f317af65fbef3ce0059693308ee008ed808f80d6bd01131
+  metadata.gz: ce87fae770f383724c238363b355832ee9a6b85153645a880be4e0fca2824eca943fae82ad9f6d0fad0c15776b87435b4716c5bb48a8ffca891f8fc37f76ecca
+  data.tar.gz: 397804731e86db0a48e1244741050e7f251b3a62c71eaae197161774833ef0d371fb12059ae3faa6323a36af849115fc7e7b954115d49b2b5a95cc0753612201

data/lib/aptible/rails/controller.rb

@@ -27,8 +27,11 @@ module Aptible
       def current_organization
         return @current_organization if @current_organization
         url = read_shared_cookie(:organization_url)
-        @current_organization = Aptible::Auth::Organization.find_by_url(
-                                url, token: session_token) if url
+        if url
+          @current_organization = Aptible::Auth::Organization.find_by_url(
+            url, token: session_token
+          )
+        end
         @current_organization ||= default_organization
 
       rescue HyperResource::ClientError => e
@@ -42,7 +45,7 @@ module Aptible
 
       def production_apps
         return @production_apps if @production_apps
-        accounts = Aptible::Api::Account.all(token: service_token)
+        accounts = Aptible::Api::Account.all(token: session_token)
         accounts = accounts.select do |account|
           next unless account.type == 'production'
           next unless account.organization == current_organization
@@ -74,11 +77,6 @@ module Aptible
         redirect_to Aptible::Rails.configuration.login_url unless current_user
       end
 
-      # before_action :ensure_service_token
-      def ensure_service_token
-        redirect_to aptible_login_url unless service_token
-      end
-
       # before_action :ensure_compliance_plan
       def ensure_compliance_plan
         unless current_organization &&
@@ -97,7 +95,7 @@ module Aptible
 
       def criteria
         @criteria ||= Aptible::Gridiron::Criterion.where(
-          token: service_token,
+          token: session_token,
           organization: current_organization
         )
       end
@@ -105,46 +103,9 @@ module Aptible
       def compliance_alerts
         return @compliance_alerts if @compliance_alerts
         @compliance_alerts = ComplianceAlertCollection.new(
-                               criteria, production_apps, organization_users
-                             ).all
-      end
-
-      def service_token
-        return unless session_token && session_token.session
-        return @service_token if @service_token
-
-        @service_token = cached_service_token(session_token)
-        if Fridge::AccessToken.new(@service_token).valid?
-          @service_token
-        else
-          @service_token = cached_service_token(session_token,
-                                                force: true) || session_token
-        end
-      end
-
-      def cached_service_token(session_token, options = {})
-        fail 'Token must be a service token' unless session_token.session
-        cache_key = "service_token:#{session_token.session}"
-        ::Rails.cache.fetch(cache_key, options) do
-          swap_session_token(session_token)
-        end
-      end
-
-      # rubocop:disable MethodLength
-      def swap_session_token(session_token)
-        Aptible::Auth::Token.create(
-          client_id: Aptible::Rails.configuration.client_id,
-          client_secret: Aptible::Rails.configuration.client_secret,
-          subject: session_token.serialize
-        ).access_token
-      rescue OAuth2::Error => e
-        if e.code == 'unauthorized'
-          nil
-        else
-          raise 'Could not swap session token, check Client#privileged?'
-        end
+          criteria, production_apps, organization_users
+        ).all
       end
-      # rubocop:enable MethodLength
 
       def organization_url(id)
         "#{dashboard_url}/organizations/#{id}"
@@ -157,7 +118,7 @@ module Aptible
       def criterion_by_handle(handle)
         Aptible::Gridiron::Criterion.where(
           handle: handle.to_s,
-          token: service_token,
+          token: session_token,
           organization: current_organization
         ).first
       end

data/lib/aptible/rails/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Rails
-    VERSION = '0.6.13'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.7.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails helpers for Aptible service applications