Commit 9340dcda3ebbdb53a471c4a0d4fba0af33c93f44
2021-11-21T20:00:52
add and remove users from repo
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301
diff --git a/lib/kmxgit/repository_manager.ex b/lib/kmxgit/repository_manager.ex
index c1f8159..5ff2673 100644
--- a/lib/kmxgit/repository_manager.ex
+++ b/lib/kmxgit/repository_manager.ex
@@ -6,6 +6,7 @@ defmodule Kmxgit.RepositoryManager do
alias Kmxgit.Repo
alias Kmxgit.RepositoryManager.Repository
alias Kmxgit.SlugManager.Slug
+ alias Kmxgit.UserManager
alias Kmxgit.UserManager.User
def list_repositories do
@@ -66,7 +67,33 @@ defmodule Kmxgit.RepositoryManager do
user: :slug]
end
- def delete_repository(%Repository{} = repository) do
- Repo.delete(repository)
+ def add_member(%Repository{} = repo, login) do
+ user = UserManager.get_user_by_slug(login)
+ if user do
+ members = [user | repo.members]
+ repo
+ |> Repository.changeset(%{})
+ |> Ecto.Changeset.put_assoc(:members, members)
+ |> Repo.update()
+ else
+ {:error, :not_found}
+ end
+ end
+
+ def remove_member(%Repository{} = repo, login) do
+ user = UserManager.get_user_by_slug(login)
+ if user do
+ members = Enum.reject(repo.members, &(&1.id == user.id))
+ repo
+ |> Repository.changeset(%{})
+ |> Ecto.Changeset.put_assoc(:members, members)
+ |> Repo.update()
+ else
+ {:error, :not_found}
+ end
+ end
+
+ def delete_repository(%Repository{} = repo) do
+ Repo.delete(repo)
end
end
diff --git a/lib/kmxgit/repository_manager/repository.ex b/lib/kmxgit/repository_manager/repository.ex
index ded6b49..cdfa9c8 100644
--- a/lib/kmxgit/repository_manager/repository.ex
+++ b/lib/kmxgit/repository_manager/repository.ex
@@ -11,7 +11,7 @@ defmodule Kmxgit.RepositoryManager.Repository do
belongs_to :organisation, Organisation
field :slug, :string, unique: true
belongs_to :user, User
- many_to_many :members, User, join_through: "users_repositories"
+ many_to_many :members, User, join_through: "users_repositories", on_replace: :delete
timestamps()
end
diff --git a/lib/kmxgit/user_manager.ex b/lib/kmxgit/user_manager.ex
index fdc3228..ab8321a 100644
--- a/lib/kmxgit/user_manager.ex
+++ b/lib/kmxgit/user_manager.ex
@@ -36,12 +36,13 @@ defmodule Kmxgit.UserManager do
def get_user_by_slug(slug) do
Repo.one from u in User,
join: s in Slug,
- on: s.id == u.slug_id,
+ on: s.user_id == u.id,
where: fragment("lower(?)", s.slug) == ^String.downcase(slug),
limit: 1,
preload: [:slug,
organisations: :slug,
- owned_repositories: [organisation: :slug, user: :slug]]
+ owned_repositories: [organisation: :slug,
+ user: :slug]]
end
def create_user(attrs \\ %{}) do
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index 306405e..8aa674b 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -97,11 +97,13 @@ defmodule KmxgitWeb.RepositoryController do
repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
if repo do
org = repo.organisation
+ user = repo.user
conn
|> assign_current_organisation(org)
|> assign(:current_repository, repo)
|> assign(:repo, repo)
|> assign(:members, Repository.members(repo))
+ |> assign(:owner, org || user)
|> render("show.html")
else
not_found(conn)
@@ -158,6 +160,104 @@ defmodule KmxgitWeb.RepositoryController do
end
end
+ def add_user(conn, params) do
+ current_user = conn.assigns.current_user
+ slug = Enum.join(params["slug"], "/")
+ repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
+ if repo do
+ org = repo.organisation
+ if org && Enum.find(org.users, &(&1.id == current_user.id)) || repo.user_id == current_user.id do
+ changeset = RepositoryManager.change_repository(repo)
+ conn
+ |> assign(:action, Routes.repository_path(conn, :add_user_post, params["owner"], Repository.splat(repo)))
+ |> assign(:changeset, changeset)
+ |> assign_current_organisation(org)
+ |> assign(:current_repository, repo)
+ |> assign(:repo, repo)
+ |> render("add_user.html")
+ else
+ not_found(conn)
+ end
+ else
+ not_found(conn)
+ end
+ end
+
+ def add_user_post(conn, params) do
+ current_user = conn.assigns.current_user
+ login = params["repository"]["login"]
+ slug = Enum.join(params["slug"], "/")
+ repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
+ if repo do
+ org = repo.organisation
+ if org && Enum.find(org.users, &(&1.id == current_user.id)) || repo.user_id == current_user.id do
+ case RepositoryManager.add_member(repo, login) do
+ {:ok, repo} ->
+ conn
+ |> redirect(to: Routes.repository_path(conn, :show, params["owner"], Repository.splat(repo)))
+ {:error, _} ->
+ conn
+ |> assign(:action, Routes.repository_path(conn, :add_user_post, params["owner"], Repository.splat(repo)))
+ |> assign_current_organisation(org)
+ |> assign(:current_repository, repo)
+ |> assign(:repo, repo)
+ |> render("add_user.html")
+ end
+ end
+ else
+ not_found(conn)
+ end
+ end
+
+ def remove_user(conn, params) do
+ current_user = conn.assigns.current_user
+ slug = Enum.join(params["slug"], "/")
+ repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
+ if repo do
+ org = repo.organisation
+ if org && Enum.find(org.users, &(&1.id == current_user.id)) || repo.user_id == current_user.id do
+ changeset = RepositoryManager.change_repository(repo)
+ conn
+ |> assign(:action, Routes.repository_path(conn, :remove_user_post, params["owner"], Repository.splat(repo)))
+ |> assign(:changeset, changeset)
+ |> assign_current_organisation(org)
+ |> assign(:current_repository, repo)
+ |> assign(:repo, repo)
+ |> render("remove_user.html")
+ else
+ not_found(conn)
+ end
+ else
+ not_found(conn)
+ end
+ end
+
+ def remove_user_post(conn, params) do
+ current_user = conn.assigns.current_user
+ login = params["repository"]["login"]
+ slug = Enum.join(params["slug"], "/")
+ repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
+ if repo do
+ org = repo.organisation
+ if org && Enum.find(org.users, &(&1.id == current_user.id)) || repo.user_id == current_user.id do
+ case RepositoryManager.remove_member(repo, login) do
+ {:ok, repo} ->
+ conn
+ |> redirect(to: Routes.repository_path(conn, :show, params["owner"], Repository.splat(repo)))
+ {:error, _} ->
+ conn
+ |> assign(:action, Routes.repository_path(conn, :remove_user_post, params["owner"], Repository.splat(repo)))
+ |> assign_current_organisation(org)
+ |> assign(:current_repository, repo)
+ |> assign(:repo, repo)
+ |> render("remove_user.html")
+ end
+ end
+ else
+ not_found(conn)
+ end
+ end
+
def delete(conn, params) do
current_user = conn.assigns.current_user
slug = Enum.join(params["slug"], "/")
diff --git a/lib/kmxgit_web/router.ex b/lib/kmxgit_web/router.ex
index e4b0b3e..ac9c3e9 100644
--- a/lib/kmxgit_web/router.ex
+++ b/lib/kmxgit_web/router.ex
@@ -67,6 +67,16 @@ defmodule KmxgitWeb.Router do
put "/:owner/*slug", RepositoryController, :update
end
+ scope "/_add_user/" do
+ get "/:owner/*slug", RepositoryController, :add_user
+ post "/:owner/*slug", RepositoryController, :add_user_post
+ end
+
+ scope "/_remove_user/" do
+ get "/:owner/*slug", RepositoryController, :remove_user
+ post "/:owner/*slug", RepositoryController, :remove_user_post
+ end
+
scope "/admin", Admin, as: "admin" do
pipe_through :admin
get "/", DashboardController, :index
diff --git a/lib/kmxgit_web/templates/repository/add_user.html.heex b/lib/kmxgit_web/templates/repository/add_user.html.heex
new file mode 100644
index 0000000..557ea9d
--- /dev/null
+++ b/lib/kmxgit_web/templates/repository/add_user.html.heex
@@ -0,0 +1,17 @@
+<div class="container-fluid">
+
+ <h1><%= gettext "Add user to %{repo}", repo: Repository.full_slug(@repo) %></h1>
+
+ <%= form_for :repository, @action, fn f -> %>
+
+ <div class="mb-3">
+ <%= label f, :login, class: "form-label" %>
+ <%= text_input f, :login, class: "form=control" %>
+ </div>
+
+ <div class="mb-3">
+ <%= submit gettext("Submit"), class: "btn btn-primary" %>
+ </div>
+
+ <% end %>
+</div>
diff --git a/lib/kmxgit_web/templates/repository/remove_user.html.heex b/lib/kmxgit_web/templates/repository/remove_user.html.heex
new file mode 100644
index 0000000..6b7a494
--- /dev/null
+++ b/lib/kmxgit_web/templates/repository/remove_user.html.heex
@@ -0,0 +1,17 @@
+<div class="container-fluid">
+
+ <h1><%= gettext "Remove user from %{repo}", repo: Repository.full_slug(@repo) %></h1>
+
+ <%= form_for :repository, @action, fn f -> %>
+
+ <div class="mb-3">
+ <%= label f, :login, class: "form-label" %>
+ <%= text_input f, :login, class: "form=control" %>
+ </div>
+
+ <div class="mb-3">
+ <%= submit gettext("Submit"), class: "btn btn-primary" %>
+ </div>
+
+ <% end %>
+</div>
diff --git a/lib/kmxgit_web/templates/repository/show.html.heex b/lib/kmxgit_web/templates/repository/show.html.heex
index 5422a28..4e3f81b 100644
--- a/lib/kmxgit_web/templates/repository/show.html.heex
+++ b/lib/kmxgit_web/templates/repository/show.html.heex
@@ -33,6 +33,12 @@
<%= for user <- @members do %>
<%= link user.slug.slug, to: Routes.slug_path(@conn, :show, user.slug.slug) %>
<% end %>
+ <%= link "-",
+ to: Routes.repository_path(@conn, :remove_user, @owner.slug.slug, Repository.splat(@repo)),
+ class: "btn btn-danger btn-sm" %>
+ <%= link "+",
+ to: Routes.repository_path(@conn, :add_user, @owner.slug.slug, Repository.splat(@repo)),
+ class: "btn btn-primary btn-sm" %>
</td>
</tr>
</table>
diff --git a/lib/kmxgit_web/templates/user/show.html.heex b/lib/kmxgit_web/templates/user/show.html.heex
index 671846a..7d955ed 100644
--- a/lib/kmxgit_web/templates/user/show.html.heex
+++ b/lib/kmxgit_web/templates/user/show.html.heex
@@ -54,7 +54,7 @@
<%= link(org.name || org.slug.slug, to: Routes.slug_path(@conn, :show, org.slug.slug), class: "org") %>
<% end %>
<%= if @user == @current_user do %>
- <%= link("+", to: Routes.organisation_path(@conn, :new), class: "btn btn-primary") %>
+ <%= link("+", to: Routes.organisation_path(@conn, :new), class: "btn btn-primary btn-sm") %>
<% end %>
</td>
</tr>