scim_rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 325745eceb9f970c505d036231d3fde95674f05d220d65e02778e346013f44c1
-  data.tar.gz: 2703cf04051e134870be167e9119ef7041b93fa5d77a5eedffb80bae2b707aff
+  metadata.gz: f2fdd85f73785a5e6f541f9d5ce4948f1881391215b55235480b398d64352c52
+  data.tar.gz: d1003817197e93ae0669250b8cdef586447890ed79cc76ebbed71ecb77308d81
 SHA512:
-  metadata.gz: 73975ecfb6499a9a8e155d0817d81c9f8bd1f8c96070b21172610a06a620a46e1bf446a40fcf734f065fa6a1bf17d4b74857ab7443ede69694592f622e8fb6be
-  data.tar.gz: caaa96d37fc4a7e11077afe889b7e0ddb1e7df1518d601552ff26fd471c94e157a7b5672a3f96eb0dae5f75fc66cedbd38b4f5b09d2b5b5365d7d4388a6fc532
+  metadata.gz: acd22821b645cf7d3aed942cdf061b0264318474c0af65aef1787c44c304cfc477b77616f527034da2e03e4cd1d3a637ce9710ea5527578e768031662b408fd2
+  data.tar.gz: dddf0587bd64c1202e9088b6967378187a595e3e2abb67ef853a7b13e02ef1505775aae0dfec436b5fbf14fe696c7173dad596f9356d9d95b56186b0c3d977f6

data/app/controllers/scim_rails/scim_users_controller.rb

@@ -27,13 +27,17 @@ module ScimRails
     end
 
     def create
-      username_key = ScimRails.config.queryable_user_attributes[:userName]
-      find_by_username = Hash.new
-      find_by_username[username_key] = permitted_user_params[username_key]
-      user = @company
-        .public_send(ScimRails.config.scim_users_scope)
-        .find_or_create_by(find_by_username)
-      user.update!(permitted_user_params)
+      if ScimRails.config.scim_user_prevent_update_on_create
+        user = @company.public_send(ScimRails.config.scim_users_scope).create!(permitted_user_params)
+      else
+        username_key = ScimRails.config.queryable_user_attributes[:userName]
+        find_by_username = Hash.new
+        find_by_username[username_key] = permitted_user_params[username_key]
+        user = @company
+          .public_send(ScimRails.config.scim_users_scope)
+          .find_or_create_by(find_by_username)
+        user.update!(permitted_user_params)
+      end
       update_status(user) unless put_active_param.nil?
       json_scim_response(object: user, status: :created)
     end

data/lib/generators/scim_rails/templates/initializer.rb

@@ -18,6 +18,10 @@ ScimRails.configure do |config|
   # authenticatable model.
   config.scim_users_scope = :users
 
+  # Determine whether the create endpoint updates users that already exist
+  # or throws an error (returning 409 Conflict in accordance with SCIM spec)
+  config.scim_user_prevent_update_on_create = false
+
   # Default sort order for pagination is by id. If you
   # use non sequential ids for user records, uncomment
   # the below line and configure a determinate order.
@@ -33,7 +37,7 @@ ScimRails.configure do |config|
   # Hash of queryable attribtues on the user model. If
   # the attribute is not listed in this hash it cannot
   # be queried by this Gem. The structure of this hash
-  # is { queryable_scim_attribute => user_attribute }. 
+  # is { queryable_scim_attribute => user_attribute }.
   config.queryable_user_attributes = {
     userName: :email,
     givenName: :first_name,
@@ -54,7 +58,7 @@ ScimRails.configure do |config|
   # for this Gem to figure out where to look in a SCIM
   # response for mutable values. This object should
   # include all attributes listed in
-  # config.mutable_user_attributes. 
+  # config.mutable_user_attributes.
   config.mutable_user_attributes_schema = {
     name: {
       givenName: :first_name,

data/lib/scim_rails/config.rb

@@ -20,11 +20,12 @@ module ScimRails
       :scim_users_list_order,
       :scim_users_model,
       :scim_users_scope,
+      :scim_user_prevent_update_on_create,
       :user_attributes,
       :user_deprovision_method,
       :user_reprovision_method,
       :user_schema
-      
+
     def initialize
       @basic_auth_model = "Company"
       @scim_users_list_order = :id

data/lib/scim_rails/version.rb

@@ -1,3 +1,3 @@
 module ScimRails
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/controllers/scim_rails/scim_users_controller_spec.rb

@@ -325,6 +325,26 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
         expect(company.users.first.first_name).to eq "Not New"
       end
 
+      it "returns 409 if user already exists and config.scim_user_prevent_update_on_create is set to true" do
+        allow(ScimRails.config).to receive(:scim_user_prevent_update_on_create).and_return(true)
+        create(:user, email: "new@example.com", company: company)
+
+        post :create, params: {
+          name: {
+            givenName: "Not New",
+            familyName: "User"
+          },
+          emails: [
+            {
+              value: "new@example.com"
+            }
+          ]
+        }
+
+        expect(response.status).to eq 409
+        expect(company.users.count).to eq 1
+      end
+
       it "creates and archives inactive user" do
         post :create, params: {
           id: 1,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scim_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Spencer Alan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,14 +178,10 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20181206184304_create_users.rb
 - spec/dummy/db/migrate/20181206184313_create_companies.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -278,12 +274,8 @@ test_files:
 - spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/db/migrate/20181206184304_create_users.rb
 - spec/dummy/db/migrate/20181206184313_create_companies.rb
-- spec/dummy/db/development.sqlite3
-- spec/dummy/log/test.log
-- spec/dummy/log/development.log
 - spec/support/factory_bot.rb
 - spec/support/auth_helper.rb
 - spec/support/scim_rails_config.rb

data/spec/dummy/log/development.log

@@ -1,37 +0,0 @@
-   (1.5ms)  CREATE TABLE "companies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar NOT NULL, "subdomain" varchar NOT NULL, "api_token" varchar NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-   (0.9ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "first_name" varchar NOT NULL, "last_name" varchar NOT NULL, "email" varchar NOT NULL, "company_id" integer, "archived_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
-   (0.1ms)  SELECT version FROM "schema_migrations"
-   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES (20181206184313)
-   (0.1ms)  select sqlite_version(*)
-   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES
-(20181206184304);
-
-
-   (1.0ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
-   (0.0ms)  begin transaction
-  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2019-04-04 18:34:57.670031"], ["updated_at", "2019-04-04 18:34:57.670031"]]
-   (0.7ms)  commit transaction
-  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
-   (0.0ms)  begin transaction
-   (0.0ms)  commit transaction
-   (0.9ms)  CREATE TABLE "companies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar NOT NULL, "subdomain" varchar NOT NULL, "api_token" varchar NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-   (1.0ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "first_name" varchar NOT NULL, "last_name" varchar NOT NULL, "email" varchar NOT NULL, "company_id" integer, "archived_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
-   (0.1ms)  SELECT version FROM "schema_migrations"
-   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES (20181206184313)
-   (0.0ms)  select sqlite_version(*)
-   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES
-(20181206184304);
-
-
-   (0.9ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
-   (0.0ms)  begin transaction
-  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2019-04-04 18:34:57.684014"], ["updated_at", "2019-04-04 18:34:57.684014"]]
-   (0.6ms)  commit transaction
-  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
-   (0.0ms)  begin transaction
-  SQL (0.2ms)  UPDATE "ar_internal_metadata" SET "value" = ?, "updated_at" = ? WHERE "ar_internal_metadata"."key" = ?  [["value", "test"], ["updated_at", "2019-04-04 18:34:57.686570"], ["key", "environment"]]
-   (0.6ms)  commit transaction