Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/mix/tasks/hex.organization.ex
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,14 @@ defmodule Mix.Tasks.Hex.Organization do
permissions = [%{"domain" => "repository", "resource" => organization}]
auth = Mix.Tasks.Hex.auth_info(:write)

case Mix.Tasks.Hex.generate_organization_key(organization, key_name, permissions, auth) do
{:ok, key} -> key
:error -> nil
case Hex.API.Key.new(key_name, permissions, auth) do
{:ok, {201, _, body}} ->
body["secret"]

other ->
Mix.shell().error("Generation of key failed")
Hex.Utils.print_error_result(other)
nil
end
end

Expand Down
4 changes: 2 additions & 2 deletions test/mix/tasks/hex.organization_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defmodule Mix.Tasks.Hex.OrganizationTest do

{:ok, hostname} = :inet.gethostname()
name = "#{hostname}-repository-myorgauth"
assert {:ok, {200, _, body}} = Hex.API.Key.Organization.get("myorgauth", auth)
assert {:ok, {200, _, body}} = Hex.API.Key.get(auth)
assert name in Enum.map(body, & &1["name"])
end)
end
Expand Down Expand Up @@ -54,7 +54,7 @@ defmodule Mix.Tasks.Hex.OrganizationTest do
assert myorg.url == "http://localhost:4043/repo/repos/myorgauthwithkeyname"
assert is_binary(myorg.auth_key)

assert {:ok, {200, _, body}} = Hex.API.Key.Organization.get("myorgauthwithkeyname", auth)
assert {:ok, {200, _, body}} = Hex.API.Key.get(auth)
assert "orgauthkeyname-repository-myorgauthwithkeyname" in Enum.map(body, & &1["name"])
end)
end
Expand Down
Loading