refresh raindrop token when it is expired

lib/radiator/accounts/raindrop_client.ex

@@ -2,6 +2,8 @@ defmodule Radiator.Accounts.RaindropClient do
   @moduledoc """
     Client for Raindrop API
   """
+  require Logger
+
   alias Radiator.Accounts
 
   def config, do: Application.fetch_env!(:radiator, :raindrop)
@@ -44,6 +46,7 @@ defmodule Radiator.Accounts.RaindropClient do
     service =
       user_id
       |> Accounts.get_raindrop_tokens()
+      |> refresh_token_if()
 
     if is_nil(service) do
       {:error, :unauthorized}
@@ -60,6 +63,83 @@ defmodule Radiator.Accounts.RaindropClient do
     end
   end
 
+  @doc """
+    first time fetching access token and storing it as webservice entry
+  """
+  def init_and_store_access_token(user_id, code) do
+    {:ok, response} =
+      [
+        method: :post,
+        url: "https://raindrop.io/oauth/access_token",
+        json: %{
+          client_id: config()[:client_id],
+          client_secret: config()[:client_secret],
+          grant_type: "authorization_code",
+          code: code,
+          redirect_uri: redirect_uri()
+        }
+      ]
+      |> Keyword.merge(config()[:options])
+      |> Req.request()
+
+    Logger.error("Response from raindrop: #{inspect(response)}")
+
+    parse_access_token_response(response, user_id)
+  end
+
+  defp refresh_token_if(service) do
+    if DateTime.before?(service.data.expires_at, DateTime.utc_now()) do
+      {:ok, response} =
+        [
+          method: :post,
+          url: "https://raindrop.io/oauth/access_token",
+          headers: [
+            {"Content-Type", "application/json"}
+          ],
+          json: %{
+            client_id: config()[:client_id],
+            client_secret: config()[:client_secret],
+            grant_type: "refresh_token",
+            refresh_token: refresh_token
+          }
+        ]
+        |> Req.request()
+
+      parse_access_token_response(response, user_id)
+    else
+      service
+    end
+  end
+
+  defp parse_access_token_response(
+         {:ok,
+          %Req.Response{
+            body: %{
+              "access_token" => access_token,
+              "refresh_token" => refresh_token,
+              "expires_in" => expires_in
+            }
+          }},
+         user_id
+       ) do
+    expires_at =
+      DateTime.now!("Etc/UTC")
+      |> DateTime.shift(second: response.body["expires_in"])
+      |> DateTime.truncate(:second)
+
+    Accounts.update_raindrop_tokens(
+      user_id,
+      response.body["access_token"],
+      response.body["refresh_token"],
+      expires_at
+    )
+  end
+
+  defp parse_access_token_response(response_tuple, _user_id) do
+    Logger.error("Error fetching access token: #{inspect(response_tuple)}")
+    {:error, :unauthorized}
+  end
+
   defp parse_collection_response({:ok, %Req.Response{status: 401}}) do
     {:error, :unauthorized}
   end

lib/radiator_web/controllers/api/raindrop_controller.ex

@@ -1,7 +1,6 @@
 defmodule RadiatorWeb.Api.RaindropController do
   use RadiatorWeb, :controller
 
-  alias Radiator.Accounts
   alias Radiator.Accounts.RaindropClient
   require Logger
 
@@ -10,36 +9,7 @@ defmodule RadiatorWeb.Api.RaindropController do
       "Raindrop auth redirect code: #{code}, redirect_uri: #{RaindropClient.redirect_uri()}"
     )
 
-    {:ok, response} =
-      [
-        method: :post,
-        url: "https://raindrop.io/oauth/access_token",
-        json: %{
-          client_id: RaindropClient.config()[:client_id],
-          client_secret: RaindropClient.config()[:client_secret],
-          grant_type: "authorization_code",
-          code: code,
-          redirect_uri: RaindropClient.redirect_uri()
-        }
-      ]
-      |> Keyword.merge(RaindropClient.config()[:options])
-      |> Req.request()
-
-    Logger.error("Response from raindrop: #{inspect(response)}")
-
-    if response.body != "Unauthorized" && !is_nil(response.body["access_token"]) do
-      expires_at =
-        DateTime.now!("Etc/UTC")
-        |> DateTime.shift(second: response.body["expires_in"])
-        |> DateTime.truncate(:second)
-
-      Accounts.update_raindrop_tokens(
-        user_id,
-        response.body["access_token"],
-        response.body["refresh_token"],
-        expires_at
-      )
-    end
+    RaindropClient.init_and_store_access_token(user_id, code)
 
     conn
     |> put_resp_content_type("application/json")