spacecruft/farmbot_os
spacecruft/farmbot_os
1
0
Fork 0
Code Issues Pull requests Releases Activity

Make sure api public_key path gets checked properly

Browse source
This commit is contained in:
connor rigby 2018-01-04 15:23:52 -08:00
parent 00e8faeeb4
commit a0d2e651bd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/farmbot/bootstrap/authorization.ex
View file

@ -34,7 +34,7 @@ defmodule Farmbot.Bootstrap.Authorization do
def authorize(email, pw_or_secret, server) do
case get_config_value(:bool, "settings", "first_boot") do
true ->
with {:ok, rsa_key} <- fetch_rsa_key(server),
with {:ok, {:RSAPublicKey, _, _} = rsa_key} <- fetch_rsa_key(server),
{:ok, payload} <- build_payload(email, pw_or_secret, rsa_key),
{:ok, resp} <- request_token(server, payload),
{:ok, body} <- Poison.decode(resp),
@ -78,7 +78,7 @@ defmodule Farmbot.Bootstrap.Authorization do
end
end
defp fetch_rsa_key(server) do
def fetch_rsa_key(server) do
url_char_list = '#{server}/api/public_key'
with {:ok, {{_, 200, _}, _, body}} <- :httpc.request(url_char_list) do
r = body |> to_string() |> RSA.decode_key()