aptible-auth 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cbb943790b2f247eba3b6dcf76ca588e5bbd28d
-  data.tar.gz: ff2172167641f191244cf8ee19274c74d0bf9b05
+  metadata.gz: ae72a74b0226dafa4fd0fcdc42c052a922ec1f2c
+  data.tar.gz: 0195bdaece29eb5dc31dc7f855f5fef1922e6386
 SHA512:
-  metadata.gz: bcf5e325bc82d3030ddfde97ab3d944724f03290eccfbe8ea64b996e8874c8eea4a254150799e437c3453ad3cbc721cbd1fb582d6a66232140c807bffc84141a
-  data.tar.gz: 63d9111dde96c48b47d192f9c12743311c812a5241a2a1db80153ee77ca7b55c1540931ad9319cd5b908e19ba4cc116b6ab147c671ae3919301dba7668bb07fe
+  metadata.gz: bc732dcfb0a6c3927464588ebfc0d7da06dba4fc61c94394637b168e58afed8f506b7ef1212ef6a4bbbf615d17fe1714eae6dc000a87d57b853e9a8649101411
+  data.tar.gz: 9e98569ee07825b3eb1f786a79df29635e378ac51830843812680d633395a1e05bc7486023ef60b9c30c679728fd4e36bfbb6287694d599bb863ff9083016324

data/lib/aptible/auth/organization.rb

@@ -5,6 +5,8 @@ module Aptible
     class Organization < Resource
       has_many :roles
       has_many :users
+      belongs_to :security_officer
+      belongs_to :billing_contact
 
       field :id
       field :name
@@ -21,6 +23,10 @@ module Aptible
       field :stripe_subscription_id
       field :stripe_subscription_status
       field :plan
+      field :security_alert_email
+      field :ops_alert_email
+      field :security_officer_id
+      field :billing_contact_id
 
       def stripe_customer
         return nil if stripe_customer_id.nil?
@@ -41,23 +47,6 @@ module Aptible
         !!stripe_subscription_id
       end
 
-      def billing_contact
-        return nil unless stripe_customer
-        return nil unless stripe_customer.metadata['billing_contact']
-
-        @billing_contact ||= User.find_by_url(
-          stripe_customer.metadata['billing_contact'], token: token
-        )
-      end
-
-      def security_officer
-        # REVIEW: Examine underlying data model for a less arbitrary solution
-        security_officers_role = roles.find do |role|
-          role.name == 'Security Officers'
-        end
-        security_officers_role.users.first if security_officers_role
-      end
-
       def accounts
         require 'aptible/api'
 

data/lib/aptible/auth/role.rb

@@ -14,6 +14,41 @@ module Aptible
       def users
         @users ||= memberships.map(&:user).uniq
       end
+
+      def set_account_permissions(account, scopes)
+        account_permissions = account_permissions(account)
+        existing_permissions = account_permissions.select do |permission|
+          permission.destroy unless scopes.include? permission.scope
+          return scopes.include? permission.scope
+        end
+
+        new_scopes = scopes - existing_permissions.map(&:scope)
+        add_account_scopes(account, new_scopes)
+      end
+
+      def account_permissions(account)
+        account.permissions.select do |permission|
+          (link = permission.links[:role]) && link.href == href
+        end
+      end
+
+      def add_account_scopes(account, scopes)
+        scopes.each { |scope| add_account_scope(account, scope) }
+      end
+
+      def add_account_scope(account, scope)
+        account.create_permission!(scope: scope, role: href)
+      end
+
+      def permissions
+        require 'aptible/api'
+
+        permissions = Aptible::Api::Permission.all(token: token,
+                                                   headers: headers)
+        permissions.select do |permission|
+          (link = permission.links[:role]) && link.href == href
+        end
+      end
     end
   end
 end

data/lib/aptible/auth/user.rb

@@ -9,6 +9,7 @@ module Aptible
       field :username
       field :verified, type: Aptible::Resource::Boolean
       field :public_key_fingerprint
+      field :ssh_public_key
       field :created_at, type: Time
       field :updated_at, type: Time
 
@@ -48,7 +49,7 @@ module Aptible
 
       # rubocop:disable PredicateName
       def is_billing_contact?(organization)
-        organization.billing_contact && organization.billing_contact.id == id
+        organization.billing_contact_id && organization.billing_contact_id == id
       end
 
       def has_role?(role)

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/spec/aptible/auth/organization_spec.rb

@@ -2,20 +2,20 @@ require 'spec_helper'
 
 describe Aptible::Auth::Organization do
   describe '#security_officer' do
-    let(:role) { double 'Aptible::Auth::Role' }
     let(:user) { double 'Aptible::Auth::User' }
 
-    before { role.stub(:name) { 'Security Officers' } }
-    before { role.stub(:users) { [user] } }
-
-    it 'should return the first member of the security officers role' do
-      subject.stub(:roles) { [role] }
+    it 'should return the security officer' do
+      subject.stub(:security_officer) { user }
       expect(subject.security_officer).to eq user
     end
+  end
+
+  describe '#billing_contact' do
+    let(:user) { double 'Aptible::Auth::User' }
 
-    it 'should return nil if there is no such role' do
-      subject.stub(:roles) { [] }
-      expect(subject.security_officer).to be_nil
+    it 'should return the security officer' do
+      subject.stub(:billing_contact) { user }
+      expect(subject.billing_contact).to eq user
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -205,3 +205,4 @@ test_files:
 - spec/aptible/auth_spec.rb
 - spec/shared/set_env.rb
 - spec/spec_helper.rb
+has_rdoc: