From 306dabea6b28f46fe96b534244ebcacca425a138 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Thu, 22 Aug 2019 20:58:08 -0500 Subject: [PATCH] fix: breaking blizzard APIs --- docker-push.sh | 0 lib/myapp/battle_net/user.ex | 9 +++++++-- postgres-compose.yml | 13 +++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) mode change 100644 => 100755 docker-push.sh create mode 100644 postgres-compose.yml diff --git a/docker-push.sh b/docker-push.sh old mode 100644 new mode 100755 diff --git a/lib/myapp/battle_net/user.ex b/lib/myapp/battle_net/user.ex index 1bb7853..1649697 100644 --- a/lib/myapp/battle_net/user.ex +++ b/lib/myapp/battle_net/user.ex @@ -1,6 +1,7 @@ defmodule MyApp.BattleNet.User do - def api_url(region), do: "https://#{region}.api.battle.net" + def api_url(region), do: "https://#{region}.api.blizzard.com" + def api_url_non_api(region), do: "https://#{region}.battle.net" def cache_key(user_id, region), do: "usr_char:#{user_id}:#{region}" @@ -8,7 +9,7 @@ defmodule MyApp.BattleNet.User do @spec get_user(%{"access_token": String.t, "expires_in": integer}, String.t) :: {:ok, map} | {:error, any} def get_user(data, region) when is_map(data) do data["access_token"] - |> resource_url("account/user", region) + |> resource_url_non_api("oauth/userinfo", region) |> HTTPoison.get |> parse_user_response(data) end @@ -61,4 +62,8 @@ defmodule MyApp.BattleNet.User do "#{api_url(region)}/#{path}?access_token=#{access_token}" end + defp resource_url_non_api(access_token, path, region) do + "#{api_url_non_api(region)}/#{path}?access_token=#{access_token}" + end + end diff --git a/postgres-compose.yml b/postgres-compose.yml new file mode 100644 index 0000000..cadbfc1 --- /dev/null +++ b/postgres-compose.yml @@ -0,0 +1,13 @@ +# used for dev + +version: '2' + +services: + cwf-postgres: + image: postgres + environment: + - POSTGRES_PASSWORD=postgres + ports: + - 5432:5432 + volumes: + - ./backups:/home/backups