Merge pull request #2 from DefactoSoftware/maarten/refresh-token-when…

…-expires-within-5-minutes

Always regenerate a new token on valid client credentials

lib/ex_oauth2_provider/access_tokens/access_tokens.ex

@@ -90,26 +90,6 @@ defmodule ExOauth2Provider.AccessTokens do
     |> load_matching_token_for(application, scopes, config)
   end
 
-  @doc """
-  Gets the most recent, acccessible, matching access token for an application.
-
-  ## Examples
-
-      iex> get_application_token_for(application, "read write", otp_app: :my_app)
-      %OauthAccessToken{}
-
-      iex> get_application_token_for(application, "read invalid", otp_app: :my_app)
-      nil
-  """
-  @spec get_application_token_for(Application.t(), binary(), keyword()) :: AccessToken.t() | nil
-  def get_application_token_for(application, scopes, config \\ []) do
-    config
-    |> Config.access_token()
-    |> scope_belongs_to(:resource_owner_id, nil)
-    |> scope_belongs_to(:application_id, application)
-    |> load_matching_token_for(application, scopes, config)
-  end
-
   defp load_matching_token_for(queryable, application, scopes, config) do
     now =
       config

lib/ex_oauth2_provider/oauth2/token/strategy/client_credentials.ex

@@ -38,13 +38,7 @@ defmodule ExOauth2Provider.Token.ClientCredentials do
       scopes: scopes
     }
 
-    application
-    |> AccessTokens.get_application_token_for(scopes, config)
-    |> case do
-      nil          -> AccessTokens.create_application_token(application, token_params, config)
-      access_token -> {:ok, access_token}
-    end
-    |> case do
+    case AccessTokens.create_application_token(application, token_params, config) do
       {:ok, access_token} -> {:ok, Map.merge(params, %{access_token: access_token})}
       {:error, error}     -> Error.add_error({:ok, params}, error)
     end

test/ex_oauth2_provider/access_tokens/access_tokens_test.exs

@@ -116,20 +116,6 @@ defmodule ExOauth2Provider.AccessTokensTest do
     end
   end
 
-  describe "get_application_token_for/3" do
-    test "fetches", %{application: application} do
-      {:ok, access_token1} = AccessTokens.create_application_token(application, %{}, otp_app: :ex_oauth2_provider)
-      inserted_at = QueryHelpers.timestamp(OauthAccessToken, :inserted_at, seconds: -1)
-      QueryHelpers.change!(access_token1, inserted_at: inserted_at)
-      {:ok, access_token2} = AccessTokens.create_application_token(application, %{}, otp_app: :ex_oauth2_provider)
-
-      assert %OauthAccessToken{id: id} = AccessTokens.get_application_token_for(application, nil, otp_app: :ex_oauth2_provider)
-      assert id == access_token2.id
-
-      refute AccessTokens.get_application_token_for(Fixtures.application(uid: "application-2"), nil, otp_app: :ex_oauth2_provider)
-    end
-  end
-
   test "get_authorized_tokens_for/2", %{user: user, application: application} do
     {:ok, access_token} = AccessTokens.create_token(user, %{application: application}, otp_app: :ex_oauth2_provider)