Refactor handling of belongs to owner struct

danschultzer · Mar 26, 2018 · d3cef0b · d3cef0b
1 parent 1b481b8
commit d3cef0b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/lib/ex_oauth2_provider/oauth_access_grants/oauth_access_grant.ex b/lib/ex_oauth2_provider/oauth_access_grants/oauth_access_grant.ex
@@ -3,9 +3,13 @@ defmodule ExOauth2Provider.OauthAccessGrants.OauthAccessGrant do
 
   use ExOauth2Provider.Schema
   alias ExOauth2Provider.OauthApplications.OauthApplication
+  alias ExOauth2Provider.{Config, Utils}
+
+  @resource_owner_struct Config.resource_owner_struct()
+  @resource_owner_belongs_to_opts Utils.schema_belongs_to_opts(@resource_owner_struct)
 
   schema "oauth_access_grants" do
-    belongs_to :resource_owner, ExOauth2Provider.Config.resource_owner_struct(), type: ExOauth2Provider.Config.resource_owner_struct().__schema__(:type, :id)
+    belongs_to :resource_owner, @resource_owner_struct, @resource_owner_belongs_to_opts
     belongs_to :application, OauthApplication
 
     field :token,        :string,     null: false

diff --git a/lib/ex_oauth2_provider/oauth_access_tokens/oauth_access_token.ex b/lib/ex_oauth2_provider/oauth_access_tokens/oauth_access_token.ex
@@ -3,10 +3,14 @@ defmodule ExOauth2Provider.OauthAccessTokens.OauthAccessToken do
 
   use ExOauth2Provider.Schema
   alias ExOauth2Provider.OauthApplications.OauthApplication
+  alias ExOauth2Provider.{Config, Utils}
+
+  @resource_owner_struct Config.resource_owner_struct()
+  @resource_owner_belongs_to_opts Utils.schema_belongs_to_opts(@resource_owner_struct)
 
   schema "oauth_access_tokens" do
     belongs_to :application, OauthApplication, on_replace: :nilify
-    belongs_to :resource_owner, ExOauth2Provider.Config.resource_owner_struct(), type: ExOauth2Provider.Config.resource_owner_struct().__schema__(:type, :id)
+    belongs_to :resource_owner, @resource_owner_struct, @resource_owner_belongs_to_opts
 
     field :token,         :string, null: false
     field :refresh_token, :string

diff --git a/lib/ex_oauth2_provider/oauth_applications/oauth_application.ex b/lib/ex_oauth2_provider/oauth_applications/oauth_application.ex
@@ -3,18 +3,19 @@ defmodule ExOauth2Provider.OauthApplications.OauthApplication do
 
   use ExOauth2Provider.Schema
   require Logger
+  alias ExOauth2Provider.{Config, Utils}
 
   # For Phoenix integrations
   if Code.ensure_loaded?(Phoenix.Param) do
     @derive {Phoenix.Param, key: :uid}
   end
 
-  schema "oauth_applications" do
-    if is_nil(ExOauth2Provider.Config.application_owner_struct()) do
-      Logger.error("You need to set a resource_owner or application_owner in your config and recompile ex_oauth2_provider!")
-    end
+  @owner_struct Config.application_owner_struct()
+  @owner_belongs_to_opts Utils.schema_belongs_to_opts(@owner_struct)
+  if is_nil(@owner_struct), do: Logger.error("You need to set a resource_owner or application_owner in your config and recompile ex_oauth2_provider!")
 
-    belongs_to :owner, ExOauth2Provider.Config.application_owner_struct(), type: ExOauth2Provider.Config.resource_owner_struct().__schema__(:type, :id)
+  schema "oauth_applications" do
+    belongs_to :owner, @owner_struct, @owner_belongs_to_opts
 
     field :name,         :string,     null: false
     field :uid,          :string,     null: false

diff --git a/lib/ex_oauth2_provider/utils.ex b/lib/ex_oauth2_provider/utils.ex
@@ -28,4 +28,8 @@ defmodule ExOauth2Provider.Utils do
   def schema_association(module, association) do
     module.__schema__(:association, association)
   end
+
+  @spec schema_belongs_to_opts(Ecto.Schema | nil) :: Keyword.t
+  def schema_belongs_to_opts(nil), do: []
+  def schema_belongs_to_opts(module), do: [type: module.__schema__(:type, :id)]
 end