g5_authenticatable 0.8.1.pre → 0.9.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2681284b02e32d9dc6051f38729fb16024ed6d9
-  data.tar.gz: 5154f962c52742c5c50ee2b489818a0009e7f771
+  metadata.gz: e4ea16474bb9af27d71cc19d0860500e289b1183
+  data.tar.gz: 888f2f21d3516ef5832df070d3da0c193c9bb8f8
 SHA512:
-  metadata.gz: 248b32c72eb20e0d1e112f14b02fb34b34cddfe94f6068302f33ce9803cbe777797eaae7fb5778be97226388f58ea687d3f5acb3d98603ba53d29ba844f246b5
-  data.tar.gz: d0b18a377ccd9e152ef287327151ebb45271d9f4cc6aa908a71020eb79f20a8c7846527875d2bad5ad70eccb4e5295cde7d42530dc529f7bfbdb539427ac75c9
+  metadata.gz: a1390a2a326b668987b0b1dd78a8a131b24f4a092f746776605dbfde284aabe7df899d9507d76ec170980510f293453042864183576054edc5e770e5270e05c9
+  data.tar.gz: fc5a84542730f57401d3080e6fb8682a7b5f6cac0c00bdb31281a4424ab57b37420de941cfed4d7931749d7b3e34790243934e90f5f847c158ff046356fcfd56

data/CHANGELOG.md

@@ -1,8 +1,17 @@
+## v0.9.0 (2016-11-03)
+
+* Refactor custom mapping logic into devise_g5_authenticatable callbacks
+  ([#47](https://github.com/G5/g5_authenticatable/pull/47))
+
+## v0.8.0 (2016-03-07)
+
+* Location role policies
+  ([#46](https://github.com/G5/g5_authenticatable/pull/46))
+
 ## v0.7.5.beta (2016-01-15)
 
 * Fixes bug that granted higher permissions when the resource for a scoped roles didn't exist.
 
-
 ## v0.7.4 (2015-12-09)
 
 * Adds Impersonate (Assume) Devise Strategy and Concern to handle access to session stored values

data/Gemfile

@@ -10,6 +10,7 @@ gem 'rails', '4.2.0'
 gem 'jquery-rails'
 gem 'pg'
 gem 'grape'
+gem 'active_model_serializers', '<= 0.10.0' # For compatibility with ruby 2.0.0
 
 group :test, :development do
   gem 'rspec-rails', '~> 3.1'

data/README.md

@@ -18,7 +18,7 @@ library in isolation.
 
 ## Current Version
 
-0.7.4
+0.9.0
 
 ## Requirements
 

data/app/models/g5_authenticatable/user.rb

@@ -9,25 +9,14 @@ module G5Authenticatable
 
     GLOBAL_ROLE = 'GLOBAL'
 
-    def self.new_with_session(params, session)
-      user = super(params, session)
-      auth_data = session['omniauth.auth']
-
-      if auth_data
-        user.assign_attributes(extended_auth_attributes(auth_data))
-        user.update_roles_from_auth(auth_data)
-      end
-      user
-    end
-
-    def self.find_and_update_for_g5_oauth(auth_data)
-      user = super(auth_data)
-      if user
-        user.update_attributes(extended_auth_attributes(auth_data))
-        user.update_roles_from_auth(auth_data)
-      end
-
-      user
+    def attributes_from_auth(auth_data)
+      super(auth_data).merge({
+        first_name: auth_data.info.first_name,
+        last_name: auth_data.info.last_name,
+        phone_number: auth_data.info.phone,
+        title: auth_data.extra.title,
+        organization_name: auth_data.extra.organization_name
+      })
     end
 
     def update_roles_from_auth(auth_data)
@@ -50,18 +39,6 @@ module G5Authenticatable
     end
 
     private
-
-    def self.extended_auth_attributes(auth_data)
-      h = {
-        first_name: auth_data.info.first_name,
-        last_name: auth_data.info.last_name,
-        phone_number: auth_data.info.phone,
-        title: auth_data.extra.title,
-        organization_name: auth_data.extra.organization_name
-      }
-      auth_data.uid.present? ? h.merge!(uid: auth_data.uid) : h
-    end
-
     def add_scoped_role(role)
       the_class = Object.const_get(role.type)
       resource = the_class.where(urn: role.urn).first

data/app/policies/g5_updatable/location_policy.rb

@@ -20,7 +20,7 @@ module G5Updatable
 
       def locations_from_client_roles
         G5Updatable::Location
-          .joins('INNER JOIN g5_updatable_clients as c on g5_updatable_locations.client_uid=c.uid')
+          .joins('INNER JOIN g5_updatable_clients as c on g5_updatable_locations.client_urn=c.urn')
           .joins('INNER JOIN g5_authenticatable_roles as r on r.resource_id=c.id')
           .joins('INNER JOIN g5_authenticatable_users_roles as ur on r.id=ur.role_id')
           .where('ur.user_id=?',user.id)
@@ -33,8 +33,6 @@ module G5Updatable
         location_ids = locations_from_client_roles.map(&:id) | location_roles.map(&:resource_id)
         G5Updatable::Location.where(id: location_ids)
       end
-
     end
-
   end
 end

data/g5_authenticatable.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'devise_g5_authenticatable', '~> 0.2.5.beta'
+  spec.add_dependency 'devise_g5_authenticatable', '~> 0.3.0'
   spec.add_dependency 'omniauth-g5', '~> 0.3.1'
   spec.add_dependency 'g5_authenticatable_api', '~> 0.4.1'
   spec.add_dependency 'rolify', '~> 4.0'
   spec.add_dependency 'pundit', '~> 1.0'
-  spec.add_dependency 'g5_updatable', '> 0.6.0'
+  spec.add_dependency 'g5_updatable', '~> 0.20.3.pre.1'
 end

data/lib/g5_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module G5Authenticatable
-  VERSION = '0.8.1.pre'
+  VERSION = '0.9.1-2'
 end

data/spec/dummy/db/migrate/20161122070749_add_amenities.rb

@@ -0,0 +1,25 @@
+class AddAmenities < ActiveRecord::Migration
+  def change
+    create_table :g5_updatable_hub_amenities do |t|
+      t.integer :external_id
+      t.string :name
+      t.string :icon
+      t.timestamp :external_updated_at
+      t.timestamp :external_created_at
+      t.timestamps
+    end
+
+    add_index :g5_updatable_hub_amenities, :external_id, unique: true
+
+    create_table :g5_updatable_hub_amenities_locations do |t|
+      t.belongs_to :g5_updatable_hub_amenity
+      t.belongs_to :g5_updatable_location
+    end
+
+    add_index :g5_updatable_hub_amenities_locations, :g5_updatable_hub_amenity_id, name: 'updatable_amenities_loc_amen_id'
+    add_index :g5_updatable_hub_amenities_locations, :g5_updatable_location_id, name: 'updatable_amenities_loc_loc_id'
+
+    # we need this for queries that require a location to have ALL amenities in a list
+    add_column :g5_updatable_locations, :flat_amenity_names, :string
+  end
+end

data/spec/dummy/db/migrate/20161209070749_add_client_urn_to_locations.rb

@@ -0,0 +1,6 @@
+class AddClientUrnToLocations < ActiveRecord::Migration
+  def change
+    add_column :g5_updatable_locations, :client_urn, :string
+    add_index :g5_updatable_locations, :client_urn
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150603224036) do
+ActiveRecord::Schema.define(version: 20161209070749) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -69,6 +69,26 @@ ActiveRecord::Schema.define(version: 20150603224036) do
   add_index "g5_updatable_clients", ["uid"], name: "index_g5_updatable_clients_on_uid", using: :btree
   add_index "g5_updatable_clients", ["urn"], name: "index_g5_updatable_clients_on_urn", using: :btree
 
+  create_table "g5_updatable_hub_amenities", force: :cascade do |t|
+    t.integer  "external_id"
+    t.string   "name"
+    t.string   "icon"
+    t.datetime "external_updated_at"
+    t.datetime "external_created_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "g5_updatable_hub_amenities", ["external_id"], name: "index_g5_updatable_hub_amenities_on_external_id", unique: true, using: :btree
+
+  create_table "g5_updatable_hub_amenities_locations", force: :cascade do |t|
+    t.integer "g5_updatable_hub_amenity_id"
+    t.integer "g5_updatable_location_id"
+  end
+
+  add_index "g5_updatable_hub_amenities_locations", ["g5_updatable_hub_amenity_id"], name: "updatable_amenities_loc_amen_id", using: :btree
+  add_index "g5_updatable_hub_amenities_locations", ["g5_updatable_location_id"], name: "updatable_amenities_loc_loc_id", using: :btree
+
   create_table "g5_updatable_locations", force: :cascade do |t|
     t.string   "uid"
     t.string   "urn"
@@ -77,8 +97,11 @@ ActiveRecord::Schema.define(version: 20150603224036) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name"
+    t.string   "flat_amenity_names"
+    t.string   "client_urn"
   end
 
+  add_index "g5_updatable_locations", ["client_urn"], name: "index_g5_updatable_locations_on_client_urn", using: :btree
   add_index "g5_updatable_locations", ["name"], name: "index_g5_updatable_locations_on_name", using: :btree
   add_index "g5_updatable_locations", ["uid"], name: "index_g5_updatable_locations_on_uid", using: :btree
   add_index "g5_updatable_locations", ["urn"], name: "index_g5_updatable_locations_on_urn", using: :btree

data/spec/models/g5_authenticatable/user_spec.rb

@@ -59,6 +59,71 @@ describe G5Authenticatable::User do
     expect(user.organization_name).to eq(user_attributes[:organization_name])
   end
 
+  describe '#attributes_from_auth' do
+    subject(:attributes_from_auth) { user.attributes_from_auth(auth_data) }
+
+    let(:auth_data) do
+      OmniAuth::AuthHash.new(
+        'uid' => new_user_attributes[:uid],
+        'provider' => new_user_attributes[:provider],
+        'info' => {
+          'email' => new_user_attributes[:email],
+          'name' => "#{new_user_attributes[:first_name]} #{new_user_attributes[:last_name]}",
+          'first_name' => new_user_attributes[:first_name],
+          'last_name' => new_user_attributes[:last_name],
+          'phone' => new_user_attributes[:phone_number]
+        },
+        'credentials' => {
+          'token' => new_user_attributes[:g5_access_token],
+          'expires' => true,
+          'expires_at' => Time.now + 1000
+        },
+        'extra' => {
+          'title' => new_user_attributes[:title],
+          'organization_name' => new_user_attributes[:organization_name],
+          'roles' => [
+            { 'name' => new_role_attributes[:name], 'type' => 'GLOBAL', 'urn' => nil }
+          ],
+          'raw_info' => {}
+        })
+    end
+
+    let(:new_user_attributes) { FactoryGirl.attributes_for(:g5_authenticatable_user) }
+    let(:new_role_attributes) { FactoryGirl.attributes_for(:g5_authenticatable_role) }
+
+    it 'has the correct uid' do
+      expect(attributes_from_auth[:uid]).to eq(new_user_attributes[:uid])
+    end
+
+    it 'has the correct provider' do
+      expect(attributes_from_auth[:provider]).to eq(new_user_attributes[:provider])
+    end
+
+    it 'has the correct first_name' do
+      expect(attributes_from_auth[:first_name]).to eq(new_user_attributes[:first_name])
+    end
+
+    it 'has the correct last_name' do
+      expect(attributes_from_auth[:last_name]).to eq(new_user_attributes[:last_name])
+    end
+
+    it 'has the correct email' do
+      expect(attributes_from_auth[:email]).to eq(new_user_attributes[:email])
+    end
+
+    it 'has the correct phone_number' do
+      expect(attributes_from_auth[:phone_number]).to eq(new_user_attributes[:phone_number])
+    end
+
+    it 'has the correct title' do
+      expect(attributes_from_auth[:title]).to eq(new_user_attributes[:title])
+    end
+
+    it 'has the correct organization_name' do
+      expect(attributes_from_auth[:organization_name]).to eq(new_user_attributes[:organization_name])
+    end
+  end
+
   describe '.new_with_session' do
     subject(:new_user) { G5Authenticatable::User.new_with_session(params, session) }
 
@@ -275,6 +340,7 @@ describe G5Authenticatable::User do
         {
           uid: user.uid,
           provider: user.provider,
+          email: 'updated.email@test.host',
           g5_access_token: 'updatedtoken42',
           first_name: 'Updated First Name',
           last_name: 'Updated Last Name',
@@ -302,8 +368,8 @@ describe G5Authenticatable::User do
         expect { updated_user }.to_not change { user.reload.provider }
       end
 
-      it 'should not change the email' do
-        expect { updated_user }.to_not change { user.reload.email }
+      it 'should update the email' do
+        expect { updated_user }.to change { user.reload.email }.to(updated_attributes[:email])
       end
 
       it 'should update the first name' do

data/spec/requests/default_role_authorization_spec.rb

@@ -19,17 +19,14 @@ describe 'Default role-based authorization API' do
       end
 
       it 'includes all posts' do
-        expected = {
-          'posts'=> [
-            hash_including('id' => post.id,
-                           'author_id' => post.author.id,
-                           'content' => post.content),
-            hash_including('id' => other_post.id,
-                           'author_id' => other_post.author.id,
-                           'content' => other_post.content)
-          ]
-        }
-        expect(json).to include(expected)
+        expect(json['posts']).to include(
+          hash_including('id' => post.id,
+                         'author_id' => post.author.id,
+                         'content' => post.content),
+          hash_including('id' => other_post.id,
+                         'author_id' => other_post.author.id,
+                         'content' => other_post.content)
+        )
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.8.1.pre
+  version: 0.9.1.pre.2
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5.beta
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5.beta
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: omniauth-g5
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: g5_updatable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.20.3.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.20.3.pre.1
 description: |-
   An engine that provides a basic User model,
                             authentication logic, and remote credential
@@ -216,6 +216,8 @@ files:
 - spec/dummy/db/migrate/20150603224034_remove_integration_setting.g5_updatable.rb
 - spec/dummy/db/migrate/20150603224035_add_name_to_clients_and_locations.g5_updatable.rb
 - spec/dummy/db/migrate/20150603224036_update_names.g5_updatable.rb
+- spec/dummy/db/migrate/20161122070749_add_amenities.rb
+- spec/dummy/db/migrate/20161209070749_add_client_urn_to_locations.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -274,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An authentication engine for G5 applications.
@@ -338,6 +340,8 @@ test_files:
 - spec/dummy/db/migrate/20150603224034_remove_integration_setting.g5_updatable.rb
 - spec/dummy/db/migrate/20150603224035_add_name_to_clients_and_locations.g5_updatable.rb
 - spec/dummy/db/migrate/20150603224036_update_names.g5_updatable.rb
+- spec/dummy/db/migrate/20161122070749_add_amenities.rb
+- spec/dummy/db/migrate/20161209070749_add_client_urn_to_locations.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep