Merge pull request #1260 from vishaldeepak/1230-organization-policy-modify

Add ability to create Organization for users other than admin

Author: joshsmith

lib/code_corps/policy/helpers.ex

@@ -6,6 +6,7 @@ defmodule CodeCorps.Policy.Helpers do
 
   alias CodeCorps.{
     Organization,
+    OrganizationInvite,
     ProjectUser,
     Project,
     ProjectUser,
@@ -66,6 +67,15 @@ defmodule CodeCorps.Policy.Helpers do
 
   def get_organization(_), do: nil
 
+  @doc """
+  Retrieves an organiation invite from a struct, containing a `code` field
+  Returns `CodeCorps.OrganizationInvite` or nil
+  """
+  @spec get_organization_invite(struct) :: OrganizationInvite.t() | nil
+  def get_organization_invite(%{"code" => code}),
+    do: OrganizationInvite |> Repo.get_by(code: code, fulfilled: false)
+  def get_organization_invite(%{}), do: nil
+
   @doc """
   Retrieves a project record, from a model struct, or an `Ecto.Changeset`
   containing a `project_id` field

lib/code_corps/policy/organization.ex

@@ -1,14 +1,20 @@
 defmodule CodeCorps.Policy.Organization do
   @moduledoc ~S"""
   Authorization policies for performing actions on `Organization` records
-  """  
+  """
   import CodeCorps.Policy.Helpers,
-    only: [owned_by?: 2]
+    only: [owned_by?: 2, get_organization_invite: 1]
 
   alias CodeCorps.{Organization, User}
 
-  def create?(%User{admin: true}), do: true
-  def create?(%User{admin: false}), do: false
+  def create?(%User{admin: true}, %{}), do: true
+  def create?(%User{}, %{} = params) do
+    case get_organization_invite(params) do
+      nil -> false
+      _ -> true
+    end
+  end
+  def create?(%{}, %{}), do: false
 
   def update?(%User{admin: true}, %Organization{}), do: true
   def update?(%User{} = user, %Organization{} = organization), do: organization |> owned_by?(user)

lib/code_corps/policy/policy.ex

@@ -49,7 +49,7 @@ defmodule CodeCorps.Policy do
   defp can?(%User{} = current_user, :update, %GithubRepo{} = github_repo, %{} = params), do: Policy.GithubRepo.update?(current_user, github_repo, params)
 
   # Organization
-  defp can?(%User{} = current_user, :create, %Organization{}, %{}), do: Policy.Organization.create?(current_user)
+  defp can?(%User{} = current_user, :create, %Organization{}, %{} = params), do: Policy.Organization.create?(current_user, params)
   defp can?(%User{} = current_user, :update, %Organization{} = organization, %{}), do: Policy.Organization.update?(current_user, organization)
 
   # OrganizationGithubAppInstallation

test/lib/code_corps/policy/organization_test.exs

@@ -1,17 +1,33 @@
 defmodule CodeCorps.Policy.OrganizationTest do
   use CodeCorps.PolicyCase
 
-  import CodeCorps.Policy.Organization, only: [create?: 1, update?: 2]
+  import CodeCorps.Policy.Organization, only: [create?: 2, update?: 2]
 
   describe "create" do
     test "returns true when user is an admin" do
       user = build(:user, admin: true)
-      assert create?(user)
+      assert create?(user, %{})
     end
 
-    test "returns false when user is not an admin" do
+    test "returns true when there is correct code" do
       user = build(:user, admin: false)
-      refute create?(user)
+      organization_invite = insert(:organization_invite)
+      params = %{"code" => organization_invite.code}
+      assert create?(user, params)
+    end
+
+    test "returns false when code is incorrect" do
+      user = build(:user, admin: false)
+      insert(:organization_invite)
+      params = %{"code" => "incorrect"}
+      refute create?(user, params)
+    end
+
+    test "returns false when code is correct but OrganizationInvite is fulfilled" do
+      user = build(:user, admin: false)
+      organization_invite = insert(:organization_invite, fulfilled: true)
+      params = %{"code" => organization_invite.code}
+      refute create?(user, params)
     end
   end