Merge pull request #5 from lessonly/kylewerner/ch21748/scim-update-group-assignment

Allow the create endpoint to find and update users

Merge pull request #5 from lessonly/kylewerner/ch21748/scim-update-group-assignment
Allow the create endpoint to find and update users
WNjihia · GitHub
2 parents da794a41 54473a96
Showing 4 changed files with 23 additions and 16 deletions Show diff stats
Gemfile.lock
app/controllers/scim_rails/scim_users_controller.rb
lib/scim_rails/version.rb
spec/controllers/scim_rails/scim_users_controller_spec.rb
 PATH
   remote: .
   specs:
-    scim_rails (0.1.3)
+    scim_rails (0.1.4)
       rails (~> 5.0.0)
 GEM
@@ -56,7 +56,7 @@ GEM
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.2.0)
       concurrent-ruby (~> 1.0)
@@ -27,7 +27,13 @@ module ScimRails
     end
     def create
-      user = @company.public_send(ScimRails.config.scim_users_scope).create!(permitted_user_params)
+      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)
       update_status(user) unless put_active_param.nil?
       json_scim_response(object: user, status: :created)
     end
 module ScimRails
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end
@@ -11,7 +11,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
     context "when unauthorized" do
       it "returns scim+json content type" do
         get :index
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -37,7 +37,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
       it "returns scim+json content type" do
         get :index
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -146,7 +146,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
     context "when unauthorized" do
       it "returns scim+json content type" do
         get :show, params: { id: 1 }
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -172,7 +172,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
       it "returns scim+json content type" do
         get :show, params: { id: 1 }
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -207,7 +207,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
     context "when unauthorized" do
       it "returns scim+json content type" do
         post :create
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -305,12 +305,12 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
         expect(company.users.count).to eq 0
       end
-      it "returns 409 if user already exists" do
+      it "returns 201 if user already exists and updates user" do
         create(:user, email: "new@example.com", company: company)
         post :create, params: {
           name: {
-            givenName: "New",
+            givenName: "Not New",
             familyName: "User"
           },
           emails: [
@@ -320,8 +320,9 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
           ]
         }
-        expect(response.status).to eq 409
+        expect(response.status).to eq 201
         expect(company.users.count).to eq 1
+        expect(company.users.first.first_name).to eq "Not New"
       end
       it "creates and archives inactive user" do
@@ -355,7 +356,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
     context "when unauthorized" do
       it "returns scim+json content type" do
         put :put_update, params: { id: 1 }
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -383,7 +384,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
       it "returns scim+json content type" do
         put :put_update, params: put_params
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -450,7 +451,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
     context "when unauthorized" do
       it "returns scim+json content type" do
         patch :patch_update, params: patch_params(id: 1)
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
@@ -478,7 +479,7 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
       it "returns scim+json content type" do
         patch :patch_update, params: patch_params(id: 1)
-  
+
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
1	PATH	1	PATH
2	remote: .	2	remote: .
3	specs:	3	specs:
4	- scim_rails (0.1.3)	4	+ scim_rails (0.1.4)
5	rails (~> 5.0.0)	5	rails (~> 5.0.0)
6		6
7	GEM	7	GEM
	@@ -56,7 +56,7 @@ GEM		@@ -56,7 +56,7 @@ GEM
56	factory_bot_rails (4.11.1)	56	factory_bot_rails (4.11.1)
57	factory_bot (~> 4.11.1)	57	factory_bot (~> 4.11.1)
58	railties (>= 3.0.0)	58	railties (>= 3.0.0)
59	- globalid (0.4.1)	59	+ globalid (0.4.2)
60	activesupport (>= 4.2.0)	60	activesupport (>= 4.2.0)
61	i18n (1.2.0)	61	i18n (1.2.0)
62	concurrent-ruby (~> 1.0)	62	concurrent-ruby (~> 1.0)
1	module ScimRails	1	module ScimRails
2	- VERSION = '0.1.3'	2	+ VERSION = '0.1.4'
3	end	3	end