Skip to content

Commit b9cd900

Browse files
begedinbegedin
authored
Merge pull request #1068 from landongrindheim/remove-ja-resource-and-canary
Removed ja_resource and canary from Donation Goal controller Removed ja_resource and canary from project Alphabetized clauses in policy.ex
2 parents 13de440 + 76fc605 commit b9cd900

File tree

9 files changed

+115
-195
lines changed

9 files changed

+115
-195
lines changed

‎config/config.exs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ config :guardian, Guardian,
3838
secret_key: System.get_env("GUARDIAN_SECRET_KEY"),
3939
serializer: CodeCorpsWeb.GuardianSerializer
4040

41-
config :canary, repo: CodeCorps.Repo
42-
config :canary, unauthorized_handler: {CodeCorpsWeb.AuthenticationHelpers, :handle_unauthorized}
43-
config :canary, not_found_handler: {CodeCorpsWeb.AuthenticationHelpers, :handle_not_found}
44-
4541
# Configures ex_aws with credentials
4642
config :ex_aws, :code_corps,
4743
access_key_id: [System.get_env("AWS_ACCESS_KEY_ID"), :instance_role],
@@ -86,9 +82,6 @@ config :sentry,
8682
included_environments: ~w(prod staging)a,
8783
use_error_logger: true
8884

89-
config :ja_resource,
90-
repo: CodeCorps.Repo
91-
9285
# Import environment specific config. This must remain at the bottom
9386
# of this file so it overrides the configuration defined above.
9487
import_config "#{Mix.env}.exs"

‎lib/code_corps/policy/donation_goal.ex‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ defmodule CodeCorps.Policy.DonationGoal do
33
import CodeCorps.Policy.Helpers, only: [get_project: 1, owned_by?: 2]
44

55
alias CodeCorps.{DonationGoal, User}
6-
alias Ecto.Changeset
76

8-
def create?(%User{} = user, %Changeset{} = changeset),
9-
do: changeset |> get_project |> owned_by?(user)
7+
@spec create?(User.t, map) :: boolean
8+
def create?(%User{} = user, %{} = params),
9+
do: params |> get_project |> owned_by?(user)
1010

11-
def update?(%User{} = user, %DonationGoal{} = donation_goal), do:
12-
donation_goal |> get_project |> owned_by?(user)
11+
@spec update?(User.t, DonationGoal.t) :: boolean
12+
def update?(%User{} = user, %DonationGoal{} = donation_goal),
13+
do: donation_goal |> get_project |> owned_by?(user)
1314

14-
def delete?(%User{} = user, %DonationGoal{} = donation_goal), do:
15-
donation_goal |> get_project |> owned_by?(user)
15+
@spec delete?(User.t, DonationGoal.t) :: boolean
16+
def delete?(%User{} = user, %DonationGoal{} = donation_goal),
17+
do: donation_goal |> get_project |> owned_by?(user)
1618
end

‎lib/code_corps/policy/github_app_installation.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ defmodule CodeCorps.Policy.GithubAppInstallation do
44
"""
55
import CodeCorps.Policy.Helpers, only: [get_project: 1, owned_by?: 2]
66

7-
alias CodeCorps.{GithubAppInstallation, User}
7+
alias CodeCorps.User
88

9+
@spec create?(User.t, map) :: boolean
910
def create?(%User{} = user, params), do: params |> get_project |> owned_by?(user)
10-
1111
end

‎lib/code_corps/policy/policy.ex‎

Lines changed: 34 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ defmodule CodeCorps.Policy do
66
alias CodeCorps.{Category, Comment, DonationGoal, GithubAppInstallation, Organization, OrganizationInvite, OrganizationGithubAppInstallation, Preview, Project, ProjectCategory, ProjectGithubRepo, ProjectSkill, ProjectUser, Role, RoleSkill, Skill, StripeConnectAccount, StripeConnectPlan, StripeConnectSubscription, StripePlatformCard, StripePlatformCustomer, Task, TaskSkill, User, UserCategory, UserRole, UserSkill, UserTask}
77

88
alias CodeCorps.Policy
9-
alias Ecto.Changeset
109

1110
@doc ~S"""
1211
Determines if the specified user can perform the specified action on the
@@ -28,36 +27,40 @@ defmodule CodeCorps.Policy do
2827
defp can?(%User{} = current_user, :update, %Category{}, %{}), do: Policy.Category.update?(current_user)
2928
defp can?(%User{} = current_user, :create, %Comment{}, %{} = params), do: Policy.Comment.create?(current_user, params)
3029
defp can?(%User{} = current_user, :update, %Comment{} = comment, %{}), do: Policy.Comment.update?(current_user, comment)
30+
defp can?(%User{} = current_user, :create, %DonationGoal{}, %{} = params), do: Policy.DonationGoal.create?(current_user, params)
31+
defp can?(%User{} = current_user, :update, %DonationGoal{} = donation_goal, %{}), do: Policy.DonationGoal.update?(current_user, donation_goal)
32+
defp can?(%User{} = current_user, :delete, %DonationGoal{} = donation_goal, %{}), do: Policy.DonationGoal.delete?(current_user, donation_goal)
33+
defp can?(%User{} = current_user, :create, %GithubAppInstallation{}, %{} = params), do: Policy.GithubAppInstallation.create?(current_user, params)
3134
defp can?(%User{} = current_user, :create, %Organization{}, %{}), do: Policy.Organization.create?(current_user)
3235
defp can?(%User{} = current_user, :update, %Organization{} = organization, %{}), do: Policy.Organization.update?(current_user, organization)
33-
defp can?(%User{} = current_user, :update, %User{} = user, %{}), do: Policy.User.update?(current_user, user)
34-
defp can?(%User{} = current_user, :create, %Task{}, %{} = params), do: Policy.Task.create?(current_user, params)
35-
defp can?(%User{} = current_user, :update, %Task{} = task, %{}), do: Policy.Task.update?(current_user, task)
36-
defp can?(%User{} = current_user, :create, %UserTask{}, %{} = params), do: Policy.UserTask.create?(current_user, params)
37-
defp can?(%User{} = current_user, :update, %UserTask{} = user_task, %{}), do: Policy.UserTask.update?(current_user, user_task)
38-
defp can?(%User{} = current_user, :delete, %UserTask{} = user_task, %{}), do: Policy.UserTask.delete?(current_user, user_task)
39-
defp can?(%User{} = current_user, :create, %Project{}, %{} = params), do: Policy.Project.create?(current_user, params)
40-
defp can?(%User{} = current_user, :update, %Project{} = project, %{}), do: Policy.Project.update?(current_user, project)
41-
defp can?(%User{} = current_user, :create, %ProjectSkill{}, %{} = params), do: Policy.ProjectSkill.create?(current_user, params)
42-
defp can?(%User{} = current_user, :delete, %ProjectSkill{} = project_skill, %{}), do: Policy.ProjectSkill.delete?(current_user, project_skill)
43-
defp can?(%User{} = current_user, :create, %ProjectUser{}, %{} = params), do: Policy.ProjectUser.create?(current_user, params)
44-
defp can?(%User{} = current_user, :update, %ProjectUser{} = project_user, %{} = params), do: Policy.ProjectUser.update?(current_user, project_user, params)
45-
defp can?(%User{} = current_user, :delete, %ProjectUser{} = project_user, %{}), do: Policy.ProjectUser.delete?(current_user, project_user)
36+
defp can?(%User{} = current_user, :delete, %OrganizationGithubAppInstallation{} = organization_github_app_installation, %{}),
37+
do: Policy.OrganizationGithubAppInstallation.delete?(current_user, organization_github_app_installation)
38+
defp can?(%User{} = current_user, :create, %OrganizationGithubAppInstallation{}, %{} = params), do: Policy.OrganizationGithubAppInstallation.create?(current_user, params)
4639
defp can?(%User{} = current_user, :create, %OrganizationInvite{}, %{}), do: Policy.OrganizationInvite.create?(current_user)
47-
defp can?(%User{} = current_user, :update, %OrganizationInvite{} = _invite, %{}), do: Policy.OrganizationInvite.update?(current_user)
48-
defp can?(%User{} = user, :delete,
49-
%OrganizationGithubAppInstallation{} = organization_github_app_installation, %{}),
50-
do: Policy.OrganizationGithubAppInstallation.delete?(user, organization_github_app_installation)
51-
defp can?(%User{} = user, :create, %OrganizationGithubAppInstallation{}, %{} = params), do: Policy.OrganizationGithubAppInstallation.create?(user, params)
40+
defp can?(%User{} = current_user, :update, %OrganizationInvite{}, %{}), do: Policy.OrganizationInvite.update?(current_user)
5241
defp can?(%User{} = current_user, :create, %Preview{}, %{} = params), do: Policy.Preview.create?(current_user, params)
42+
defp can?(%User{} = current_user, :create, %Project{}, %{} = params), do: Policy.Project.create?(current_user, params)
43+
defp can?(%User{} = current_user, :update, %Project{} = project, %{}), do: Policy.Project.update?(current_user, project)
5344
defp can?(%User{} = current_user, :create, %ProjectCategory{}, %{} = params), do: Policy.ProjectCategory.create?(current_user, params)
5445
defp can?(%User{} = current_user, :delete, %ProjectCategory{} = project_category, %{}), do: Policy.ProjectCategory.delete?(current_user, project_category)
5546
defp can?(%User{} = current_user, :create, %ProjectGithubRepo{}, %{} = params), do: Policy.ProjectGithubRepo.create?(current_user, params)
5647
defp can?(%User{} = current_user, :delete, %ProjectGithubRepo{} = project_github_repo, %{}),
5748
do: Policy.ProjectGithubRepo.delete?(current_user, project_github_repo)
49+
defp can?(%User{} = current_user, :create, %ProjectSkill{}, %{} = params), do: Policy.ProjectSkill.create?(current_user, params)
50+
defp can?(%User{} = current_user, :delete, %ProjectSkill{} = project_skill, %{}), do: Policy.ProjectSkill.delete?(current_user, project_skill)
51+
defp can?(%User{} = current_user, :create, %ProjectUser{}, %{} = params), do: Policy.ProjectUser.create?(current_user, params)
52+
defp can?(%User{} = current_user, :update, %ProjectUser{} = project_user, %{} = params), do: Policy.ProjectUser.update?(current_user, project_user, params)
53+
defp can?(%User{} = current_user, :delete, %ProjectUser{} = project_user, %{}), do: Policy.ProjectUser.delete?(current_user, project_user)
5854
defp can?(%User{} = current_user, :create, %Role{}, %{}), do: Policy.Role.create?(current_user)
5955
defp can?(%User{} = current_user, :create, %RoleSkill{}, %{}), do: Policy.RoleSkill.create?(current_user)
6056
defp can?(%User{} = current_user, :delete, %RoleSkill{}, %{}), do: Policy.RoleSkill.delete?(current_user)
57+
defp can?(%User{} = current_user, :create, %Skill{}, %{}), do: Policy.Skill.create?(current_user)
58+
defp can?(%User{} = current_user, :show, %StripeConnectAccount{} = stripe_connect_account, %{}),
59+
do: Policy.StripeConnectAccount.show?(current_user, stripe_connect_account)
60+
defp can?(%User{} = current_user, :create, %StripeConnectAccount{}, %{} = params),
61+
do: Policy.StripeConnectAccount.create?(current_user, params)
62+
defp can?(%User{} = current_user, :update, %StripeConnectAccount{} = stripe_connect_account, %{}),
63+
do: Policy.StripeConnectAccount.update?(current_user, stripe_connect_account)
6164
defp can?(%User{} = current_user, :show, %StripeConnectPlan{} = stripe_connect_plan, %{}),
6265
do: Policy.StripeConnectPlan.show?(current_user, stripe_connect_plan)
6366
defp can?(%User{} = current_user, :create, %StripeConnectPlan{}, %{} = params),
@@ -66,45 +69,26 @@ defmodule CodeCorps.Policy do
6669
do: Policy.StripeConnectSubscription.show?(current_user, stripe_connect_subscription)
6770
defp can?(%User{} = current_user, :create, %StripeConnectSubscription{}, %{} = params),
6871
do: Policy.StripeConnectSubscription.create?(current_user, params)
69-
defp can?(%User{} = current_user, :create, %Skill{}, %{}), do: Policy.Skill.create?(current_user)
7072
defp can?(%User{} = current_user, :show, %StripePlatformCard{} = stripe_platform_card, %{}),
7173
do: Policy.StripePlatformCard.show?(current_user, stripe_platform_card)
7274
defp can?(%User{} = current_user, :create, %StripePlatformCard{}, %{} = params),
7375
do: Policy.StripePlatformCard.create?(current_user, params)
76+
defp can?(%User{} = current_user, :create, %StripePlatformCustomer{}, %{} = params),
77+
do: Policy.StripePlatformCustomer.create?(current_user, params)
78+
defp can?(%User{} = current_user, :show, %StripePlatformCustomer{} = stripe_platform_customer, %{}),
79+
do: Policy.StripePlatformCustomer.show?(current_user, stripe_platform_customer)
80+
defp can?(%User{} = current_user, :create, %Task{}, %{} = params), do: Policy.Task.create?(current_user, params)
81+
defp can?(%User{} = current_user, :update, %Task{} = task, %{}), do: Policy.Task.update?(current_user, task)
7482
defp can?(%User{} = current_user, :create, %TaskSkill{}, %{} = params), do: Policy.TaskSkill.create?(current_user, params)
7583
defp can?(%User{} = current_user, :delete, %TaskSkill{} = task_skill, %{}), do: Policy.TaskSkill.delete?(current_user, task_skill)
84+
defp can?(%User{} = current_user, :update, %User{} = user, %{}), do: Policy.User.update?(current_user, user)
7685
defp can?(%User{} = current_user, :create, %UserCategory{} = user_category, %{}), do: Policy.UserCategory.create?(current_user, user_category)
7786
defp can?(%User{} = current_user, :delete, %UserCategory{} = user_category, %{}), do: Policy.UserCategory.delete?(current_user, user_category)
78-
defp can?(%User{} = current_user, :create, %UserSkill{}, %{} = params), do: Policy.UserSkill.create?(current_user, params)
79-
defp can?(%User{} = current_user, :delete, %UserSkill{} = user_skill, %{}), do: Policy.UserSkill.delete?(current_user, user_skill)
8087
defp can?(%User{} = current_user, :create, %UserRole{} = user_role, %{}), do: Policy.UserRole.create?(current_user, user_role)
8188
defp can?(%User{} = current_user, :delete, %UserRole{} = user_role, %{}), do: Policy.UserRole.delete?(current_user, user_role)
82-
defp can?(%User{} = user, :show, %StripeConnectAccount{} = stripe_connect_account, %{}), do: Policy.StripeConnectAccount.show?(user, stripe_connect_account)
83-
defp can?(%User{} = user, :create, %StripeConnectAccount{}, %{} = params), do: Policy.StripeConnectAccount.create?(user, params)
84-
defp can?(%User{} = user, :update, %StripeConnectAccount{} = stripe_connect_account, %{}), do: Policy.StripeConnectAccount.update?(user, stripe_connect_account)
85-
defp can?(%User{} = current_user, :create, %StripePlatformCustomer{}, %{} = params),
86-
do: Policy.StripePlatformCustomer.create?(current_user, params)
87-
defp can?(%User{} = current_user, :show, %StripePlatformCustomer{} = stripe_platform_customer, %{}),
88-
do: Policy.StripePlatformCustomer.show?(current_user, stripe_platform_customer)
89-
defp can?(%User{} = user, :create, %GithubAppInstallation{}, %{} = params), do: Policy.GithubAppInstallation.create?(user, params)
90-
91-
defimpl Canada.Can, for: User do
92-
# NOTE: Canary sets an :unauthorized and a :not_found handler on a config level
93-
# The problem is, it will still go through the authorization process first and only call the
94-
# not found handler after the unauthorized handler does its thing. This means that our
95-
# unauthorized handler will halt the connection and respond, so the not_found handler
96-
# will never do anything
97-
#
98-
# The only solution is to have a catch_all match for the resource being nil, which returns true
99-
100-
# NOTE: other tests are using the User policy for the time being.
101-
def can?(%User{}, _action, nil), do: true
102-
103-
def can?(%User{} = user, :create, %Changeset{data: %DonationGoal{}} = changeset), do: Policy.DonationGoal.create?(user, changeset)
104-
def can?(%User{} = user, :update, %DonationGoal{} = comment), do: Policy.DonationGoal.update?(user, comment)
105-
def can?(%User{} = user, :delete, %DonationGoal{} = comment), do: Policy.DonationGoal.delete?(user, comment)
106-
107-
108-
def can?(%User{} = user, :create, Role), do: Policy.Role.create?(user)
109-
end
89+
defp can?(%User{} = current_user, :create, %UserSkill{}, %{} = params), do: Policy.UserSkill.create?(current_user, params)
90+
defp can?(%User{} = current_user, :delete, %UserSkill{} = user_skill, %{}), do: Policy.UserSkill.delete?(current_user, user_skill)
91+
defp can?(%User{} = current_user, :create, %UserTask{}, %{} = params), do: Policy.UserTask.create?(current_user, params)
92+
defp can?(%User{} = current_user, :update, %UserTask{} = user_task, %{}), do: Policy.UserTask.update?(current_user, user_task)
93+
defp can?(%User{} = current_user, :delete, %UserTask{} = user_task, %{}), do: Policy.UserTask.delete?(current_user, user_task)
11094
end

‎lib/code_corps_web.ex‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ defmodule CodeCorpsWeb do
3838
import CodeCorpsWeb.Router.Helpers
3939
import CodeCorpsWeb.Gettext
4040

41-
import Canary.Plugs
42-
import CodeCorpsWeb.AuthenticationHelpers, only: [load_and_authorize_changeset: 2]
43-
4441
alias CodeCorps.{Repo, Policy}
4542
alias Plug.Conn
4643
end

‎lib/code_corps_web/controllers/donation_goal_controller.ex‎

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,54 @@
11
defmodule CodeCorpsWeb.DonationGoalController do
22
use CodeCorpsWeb, :controller
3-
use JaResource
43

5-
import CodeCorps.Helpers.Query, only: [id_filter: 2]
6-
7-
alias CodeCorps.DonationGoal
84
alias CodeCorps.Services.DonationGoalsService
5+
alias CodeCorps.{DonationGoal, User, Helpers.Query}
96

10-
plug :load_and_authorize_changeset, model: DonationGoal, only: [:create]
11-
plug :load_and_authorize_resource, model: DonationGoal, only: [:update, :delete]
12-
plug JaResource
7+
action_fallback CodeCorpsWeb.FallbackController
8+
plug CodeCorpsWeb.Plug.DataToAttributes
9+
plug CodeCorpsWeb.Plug.IdsToIntegers
1310

14-
@spec model :: module
15-
def model, do: CodeCorps.DonationGoal
11+
@spec index(Conn.t, map) :: Conn.t
12+
def index(%Conn{} = conn, %{} = params) do
13+
with donation_goals <- DonationGoal |> Query.id_filter(params) |> Repo.all do
14+
conn |> render("index.json-api", data: donation_goals)
15+
end
16+
end
1617

17-
def filter(_conn, query, "id", id_list), do: id_filter(query, id_list)
18+
@spec show(Conn.t, map) :: Conn.t
19+
def show(%Conn{} = conn, %{"id" => id}) do
20+
with %DonationGoal{} = donation_goal <- DonationGoal |> Repo.get(id) do
21+
conn |> render("show.json-api", data: donation_goal)
22+
end
23+
end
24+
25+
@spec create(Plug.Conn.t, map) :: Conn.t
26+
def create(%Conn{} = conn, %{} = params) do
27+
with %User{} = current_user <- conn |> Guardian.Plug.current_resource,
28+
{:ok, :authorized} <- current_user |> Policy.authorize(:create, %DonationGoal{}, params),
29+
{:ok, %DonationGoal{} = donation_goal} <- DonationGoalsService.create(params) do
30+
conn |> put_status(:created) |> render("show.json-api", data: donation_goal)
31+
end
32+
end
1833

19-
def handle_create(_conn, attributes) do
20-
attributes |> DonationGoalsService.create
34+
@spec delete(Conn.t, map) :: Conn.t
35+
def delete(%Conn{} = conn, %{"id" => id} = _params) do
36+
with %DonationGoal{} = donation_goal <- DonationGoal |> Repo.get(id),
37+
%User{} = current_user <- conn |> Guardian.Plug.current_resource,
38+
{:ok, :authorized} <- current_user |> Policy.authorize(:delete, donation_goal),
39+
{:ok, %DonationGoal{} = _donation_goal} <- donation_goal |> Repo.delete
40+
do
41+
conn |> Conn.assign(:donation_goal, donation_goal) |> send_resp(:no_content, "")
42+
end
2143
end
2244

23-
def handle_update(_conn, record, attributes) do
24-
record |> DonationGoalsService.update(attributes)
45+
@spec update(Conn.t, map) :: Conn.t
46+
def update(%Conn{} = conn, %{"id" => id} = params) do
47+
with %DonationGoal{} = donation_goal <- DonationGoal |> Repo.get(id),
48+
%User{} = current_user <- conn |> Guardian.Plug.current_resource,
49+
{:ok, :authorized} <- current_user |> Policy.authorize(:update, donation_goal),
50+
{:ok, %DonationGoal{} = updated_donation_goal} <- donation_goal |> DonationGoalsService.update(params) do
51+
conn |> render("show.json-api", data: updated_donation_goal)
52+
end
2553
end
2654
end

0 commit comments

Comments
 (0)