Merge pull request #4 from lessonly/spenceralan/ch20969/scim-gem-put-deprovisioning-bug-fix

fix PUT deprovisioning bug

Merge pull request #4 from lessonly/spenceralan/ch20969/scim-gem-put-deprovisioning-bug-fix
fix PUT deprovisioning bug
Spencer Alan · GitHub
2 parents e7dfbe7a 63eb6e56
Showing 2 changed files with 40 additions and 29 deletions Show diff stats
app/controllers/scim_rails/scim_users_controller.rb
spec/controllers/scim_rails/scim_users_controller_spec.rb
@@ -98,7 +98,9 @@ module ScimRails
     end
     def active?
-      active = put_active_param || patch_active_param
+      active = put_active_param
+      active = patch_active_param if active.nil?
+
       case active
       when true, "true", 1
         true
@@ -382,41 +382,33 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
       end
       it "returns scim+json content type" do
-        put :put_update, params: {
-          id: 1,
-          userName: "test@example.com",
-          name: {
-            givenName: "Test",
-            familyName: "User"
-          },
-          emails: [
-            {
-              value: "test@example.com"
-            },
-          ],
-          active: "true"
-        }
+        put :put_update, params: put_params
         expect(response.content_type).to eq "application/scim+json, application/json"
       end
       it "is successful with with valid credentials" do
-        put :put_update, params: {
-          id: 1,
-          userName: "test@example.com",
-          name: {
-            givenName: "Test",
-            familyName: "User"
-          },
-          emails: [
-            {
-              value: "test@example.com"
-            },
-          ],
-          active: "true"
-        }
+        put :put_update, params: put_params
+
+        expect(response.status).to eq 200
+      end
+
+      it "deprovisions an active record" do
+        request.content_type = "application/scim+json"
+        put :put_update, params: put_params(active: false)
+
+        expect(response.status).to eq 200
+        expect(user.reload.active?).to eq false
+      end
+
+      it "reprovisions an inactive record" do
+        user.archive!
+        expect(user.reload.active?).to eq false
+        request.content_type = "application/scim+json"
+        put :put_update, params: put_params(active: true)
         expect(response.status).to eq 200
+        expect(user.reload.active?).to eq true
       end
       it "returns :not_found for id that cannot be found" do
@@ -572,4 +564,21 @@ RSpec.describe ScimRails::ScimUsersController, type: :controller do
       ]
     }
   end
+
+  def put_params(active: true)
+    {
+      id: 1,
+      userName: "test@example.com",
+      name: {
+        givenName: "Test",
+        familyName: "User"
+      },
+      emails: [
+        {
+          value: "test@example.com"
+        },
+      ],
+      active: active
+    }
+  end
 end