Merge pull request tractionguest#25 from tractionguest/unscope-people

WORKAROUND: ignore default scopes on user model

Author: Scotty Hagan

Gemfile.lock

@@ -1,130 +1,130 @@
 PATH
   remote: .
   specs:
-    scim_rails (0.3.0)
+    scim_rails (0.3.1)
       jwt (>= 1.5, < 3.0)
       rails (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (5.2.5)
+      actionpack (= 5.2.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
+    actionmailer (5.2.5)
+      actionpack (= 5.2.5)
+      actionview (= 5.2.5)
+      activejob (= 5.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.5)
+      actionview (= 5.2.5)
+      activesupport (= 5.2.5)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.5)
+      activesupport (= 5.2.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activejob (5.2.5)
+      activesupport (= 5.2.5)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activemodel (5.2.5)
+      activesupport (= 5.2.5)
+    activerecord (5.2.5)
+      activemodel (= 5.2.5)
+      activesupport (= 5.2.5)
       arel (>= 9.0)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    activestorage (5.2.5)
+      actionpack (= 5.2.5)
+      activerecord (= 5.2.5)
+      marcel (~> 1.0.0)
+    activesupport (5.2.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    awesome_print (1.8.0)
+    awesome_print (1.9.2)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
-    diff-lcs (1.4.1)
-    docile (1.3.2)
-    erubi (1.9.0)
-    factory_bot (6.0.2)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    erubi (1.10.0)
+    factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.0.0)
-      factory_bot (~> 6.0.0)
+    factory_bot_rails (6.1.0)
+      factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faker (2.12.0)
+    faker (2.17.0)
       i18n (>= 1.6, < 2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.4)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     interception (0.5)
-    json (2.4.0)
-    jwt (2.2.1)
-    loofah (2.6.0)
+    json (2.5.1)
+    jwt (2.2.2)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    pry (0.13.1)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
+    nio4r (2.5.7)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-rescue (1.5.1)
+    pry-rescue (1.5.2)
       interception (>= 0.5)
       pry (>= 0.12.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails (5.2.5)
+      actioncable (= 5.2.5)
+      actionmailer (= 5.2.5)
+      actionpack (= 5.2.5)
+      actionview (= 5.2.5)
+      activejob (= 5.2.5)
+      activemodel (= 5.2.5)
+      activerecord (= 5.2.5)
+      activestorage (= 5.2.5)
+      activesupport (= 5.2.5)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
+      railties (= 5.2.5)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    railties (5.2.5)
+      actionpack (= 5.2.5)
+      activesupport (= 5.2.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
-    rspec-core (3.9.2)
+    rake (13.0.3)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -138,7 +138,7 @@ GEM
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+    rspec-support (3.9.4)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -148,14 +148,14 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)

app/controllers/scim_rails/scim_groups_controller.rb

@@ -33,12 +33,12 @@ def create
       if ScimRails.config.scim_group_prevent_update_on_create
         group = @company.public_send(ScimRails.config.scim_groups_scope).create!(group_attributes)
       else
-        username_key = ScimRails.config.queryable_group_attributes[:userName]
-        find_by_username = {}
-        find_by_username[username_key] = group_attributes[username_key]
+        display_name_key = ScimRails.config.queryable_group_attributes[:displayName]
+        find_by_display_name = {}
+        find_by_display_name[display_name_key] = group_attributes[display_name_key]
         group = @company
           .public_send(ScimRails.config.scim_groups_scope)
-          .find_or_create_by(find_by_username)
+          .find_or_create_by(find_by_display_name)
         group.update!(group_attributes)
       end
 

app/controllers/scim_rails/scim_users_controller.rb

@@ -40,12 +40,14 @@ def create
       else
         username_key = ScimRails.config.queryable_user_attributes[:userName]
 
-        find_by_username = Hash.new
+        find_by_params = Hash.new
 
-        find_by_username[username_key] = user_params[username_key]
-        user = @company
-          .public_send(ScimRails.config.scim_users_scope)
-          .find_or_create_by(find_by_username)
+        find_by_params[username_key] = user_params[username_key]
+        find_by_params[ScimRails.config.basic_auth_model.to_s.underscore] = @company
+
+        user = ScimRails.config.scim_users_model
+          .unscoped # Specific to our use case and should be changed back after we remove the default_scope from our "User" model
+          .find_or_initialize_by(find_by_params)
         user.update!(user_params)
       end
       update_status(user) unless params[:active].nil?

lib/scim_rails/version.rb

@@ -1,3 +1,3 @@
 module ScimRails
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

spec/controllers/scim_rails/scim_users_controller_spec.rb

@@ -347,6 +347,24 @@
         expect(company.users.count).to eq 1
       end
 
+      it 'returns 201 if the user has a default_scope attribute' do
+        create(:user, email: "new@example.com", company: company, scoped_attribute: false)
+        post :create, params: {
+          name: {
+            givenName: "Not New",
+            familyName: "User"
+          },
+          emails: [
+            {
+              value: "new@example.com"
+            }
+          ]
+        }
+        expect(response.status).to eq 201
+        expect(User.unscoped.where(company: company).count).to eq 1
+        expect(User.unscoped.where(company: company).first.first_name).to eq "Not New"
+      end
+
       it "creates and archives inactive user" do
         post :create, params: {
           id: 1,

spec/dummy/app/models/user.rb

@@ -4,6 +4,8 @@ class User < ApplicationRecord
   has_many :groups_users
   has_many :groups, through: :groups_users
 
+  default_scope { where(scoped_attribute: true) }
+
   validates \
     :first_name,
     :last_name,

spec/dummy/db/migrate/20210331202326_add_scoped_attribute.rb

@@ -0,0 +1,5 @@
+class AddScopedAttribute < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :scoped_attribute, :boolean, default: true
+  end
+end

spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_04_08_164220) do
+ActiveRecord::Schema.define(version: 2021_03_31_202326) do
 
   create_table "companies", force: :cascade do |t|
     t.string "name", null: false
@@ -50,6 +50,7 @@
     t.datetime "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "scoped_attribute", default: true
   end
 
 end

spec/factories/user.rb

@@ -7,6 +7,7 @@
     sequence(:email) { |n| "#{n}@example.com" }
 
     test_attribute { Faker::Games::Pokemon.name }
+    scoped_attribute { true }
     alternate_email { Faker::Internet.email }
   end
 end

spec/spec_helper.rb

@@ -21,4 +21,6 @@
  config.use_transactional_fixtures = true
  config.infer_base_class_for_anonymous_controllers = false
  config.order = "random"
+ config.filter_run :focus
+ config.run_all_when_everything_filtered = true
 end