normalized expires and expires_in to act the same if present from a request (#78)

Author: kelostrada

lib/oauth2/access_token.ex

@@ -60,7 +60,7 @@ defmodule OAuth2.AccessToken do
     struct(AccessToken, [
       access_token:  std["access_token"],
       refresh_token: std["refresh_token"],
-      expires_at:    (std["expires_in"] |> expires_at) || (other["expires"] |> expires),
+      expires_at:    (std["expires_in"] || other["expires"]) |> expires_at,
       token_type:    std["token_type"] |> normalize_token_type(),
       other_params:  other
     ])
@@ -94,17 +94,6 @@ defmodule OAuth2.AccessToken do
   end
   def expires_at(int), do: unix_now + int
 
-  @doc """
-  Returns the expires value as an integer
-  """
-  def expires(nil), do: nil
-  def expires(val) when is_binary(val) do
-    val
-    |> Integer.parse
-    |> elem(0)
-  end
-  def expires(int), do: int
-
   defp normalize_token_type(nil), do: "Bearer"
   defp normalize_token_type("bearer"), do: "Bearer"
   defp normalize_token_type(string), do: string

test/oauth2/access_token_test.exs

@@ -2,18 +2,29 @@ defmodule OAuth2.AccessTokenTest do
   use ExUnit.Case, async: true
   doctest OAuth2.AccessToken
 
+  import OAuth2.TestHelpers, only: [unix_now: 0]
+
   alias OAuth2.{AccessToken, Response}
 
   test "new from binary token" do
     token = AccessToken.new("abc123")
     assert token.access_token == "abc123"
   end
 
+  test "new with 'expires_in' param" do
+    response = Response.new(200, [{"content-type", "application/x-www-form-urlencoded"}], "access_token=abc123&expires_in=123")
+    token = AccessToken.new(response.body)
+    assert token.access_token == "abc123"
+    assert token.expires_at == 123 + unix_now
+    assert token.token_type == "Bearer"
+    assert token.other_params == %{}
+  end
+
   test "new with 'expires' param" do
     response = Response.new(200, [{"content-type", "application/x-www-form-urlencoded"}], "access_token=abc123&expires=123")
     token = AccessToken.new(response.body)
     assert token.access_token == "abc123"
-    assert token.expires_at == 123
+    assert token.expires_at == 123 + unix_now
     assert token.token_type == "Bearer"
     assert token.other_params == %{"expires" => "123"}
   end
@@ -22,7 +33,7 @@ defmodule OAuth2.AccessTokenTest do
     response = Response.new(200, [{"content-type", "text/plain"}], "access_token=abc123&expires=123")
     token = AccessToken.new(response.body)
     assert token.access_token == "abc123"
-    assert token.expires_at == 123
+    assert token.expires_at == 123 + unix_now
     assert token.token_type == "Bearer"
     assert token.other_params == %{"expires" => "123"}
   end
@@ -39,13 +50,8 @@ defmodule OAuth2.AccessTokenTest do
 
   test "expires_in" do
     assert AccessToken.expires_at(nil) == nil
-    assert AccessToken.expires_at(3600) == OAuth2.Util.unix_now + 3600
-    assert AccessToken.expires_at("3600") == OAuth2.Util.unix_now + 3600
+    assert AccessToken.expires_at(3600) == unix_now + 3600
+    assert AccessToken.expires_at("3600") == unix_now + 3600
   end
 
-  test "expires" do
-    assert AccessToken.expires(nil) == nil
-    assert AccessToken.expires(1469725602) == 1469725602
-    assert AccessToken.expires("1469725602") == 1469725602
-  end
 end

test/support/test_helpers.ex

@@ -26,6 +26,11 @@ defmodule OAuth2.TestHelpers do
     end
   end
 
+  def unix_now do
+    {mega, sec, _micro} = :os.timestamp
+    (mega * 1_000_000) + sec
+  end
+
   defp parse_req_body(conn) do
     opts = [parsers: [:urlencoded, :json],
             pass: ["*/*"],