- def call(conn, opts) do
- with ["Bearer " <> header] <- get_req_header(conn, "authorization"),
- %Token{user_id: user_id} <- Repo.get_by(Token, token: header),
- %User{} = user <- Repo.get(User, user_id) do
+
+ def call(conn, _) do
+ token =
+ case get_req_header(conn, "authorization") do
+ ["Bearer " <> header] -> header
+ _ -> get_session(conn, :oauth_token)
+ end
+
+ with token when not is_nil(token) <- token,
+ %Token{user_id: user_id} <- Repo.get_by(Token, token: token),
+ %User{} = user <- Repo.get(User, user_id),
+ false <- !!user.info["deactivated"] do