fix #477: add group based role grants
This commit is contained in:
devmrko
82
src/main/resources/mapper/GroupMapper.xml
Normal file
82
src/main/resources/mapper/GroupMapper.xml
Normal file
@@ -0,0 +1,82 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.cloudhandson.vpdbackoffice.mapper.GroupMapper">
|
||||
<select id="findAll" resultType="com.cloudhandson.vpdbackoffice.domain.group.AppGroup">
|
||||
SELECT group_id,
|
||||
group_code,
|
||||
group_name,
|
||||
description,
|
||||
active_yn
|
||||
FROM cb_app_group
|
||||
ORDER BY group_code
|
||||
</select>
|
||||
|
||||
<select id="findGroupUsers" resultType="com.cloudhandson.vpdbackoffice.domain.group.GroupUserView">
|
||||
SELECT g.group_id,
|
||||
g.group_code,
|
||||
g.group_name,
|
||||
u.user_id,
|
||||
u.user_name AS username
|
||||
FROM cb_user_group ug
|
||||
JOIN cb_app_group g ON g.group_id = ug.group_id
|
||||
JOIN cb_app_user u ON u.user_id = ug.user_id
|
||||
ORDER BY g.group_code, u.user_name
|
||||
</select>
|
||||
|
||||
<select id="findGroupRoles" resultType="com.cloudhandson.vpdbackoffice.domain.group.GroupRoleView">
|
||||
SELECT g.group_id,
|
||||
g.group_code,
|
||||
g.group_name,
|
||||
r.role_id,
|
||||
r.role_name
|
||||
FROM cb_group_role gr
|
||||
JOIN cb_app_group g ON g.group_id = gr.group_id
|
||||
JOIN cb_app_role r ON r.role_id = gr.role_id
|
||||
ORDER BY g.group_code, r.role_name
|
||||
</select>
|
||||
|
||||
<select id="nextGroupId" resultType="long">
|
||||
SELECT NVL(MAX(group_id), 0) + 1 FROM cb_app_group
|
||||
</select>
|
||||
|
||||
<insert id="insertGroup">
|
||||
INSERT INTO cb_app_group (
|
||||
group_id, group_code, group_name, description, active_yn
|
||||
) VALUES (
|
||||
#{groupId,jdbcType=NUMERIC},
|
||||
UPPER(#{command.groupCode,jdbcType=VARCHAR}),
|
||||
#{command.groupName,jdbcType=VARCHAR},
|
||||
#{command.description,jdbcType=VARCHAR},
|
||||
'Y'
|
||||
)
|
||||
</insert>
|
||||
|
||||
<update id="updateActive">
|
||||
UPDATE cb_app_group
|
||||
SET active_yn = #{activeYn,jdbcType=VARCHAR}
|
||||
WHERE group_id = #{groupId,jdbcType=NUMERIC}
|
||||
</update>
|
||||
|
||||
<insert id="insertGroupUser">
|
||||
INSERT INTO cb_user_group (group_id, user_id)
|
||||
VALUES (#{groupId,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC})
|
||||
</insert>
|
||||
|
||||
<delete id="deleteGroupUser">
|
||||
DELETE FROM cb_user_group
|
||||
WHERE group_id = #{groupId,jdbcType=NUMERIC}
|
||||
AND user_id = #{userId,jdbcType=NUMERIC}
|
||||
</delete>
|
||||
|
||||
<insert id="insertGroupRole">
|
||||
INSERT INTO cb_group_role (group_id, role_id)
|
||||
VALUES (#{groupId,jdbcType=NUMERIC}, #{roleId,jdbcType=NUMERIC})
|
||||
</insert>
|
||||
|
||||
<delete id="deleteGroupRole">
|
||||
DELETE FROM cb_group_role
|
||||
WHERE group_id = #{groupId,jdbcType=NUMERIC}
|
||||
AND role_id = #{roleId,jdbcType=NUMERIC}
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -243,6 +243,29 @@ function filterUserRoleDetail() {
|
||||
empty.hidden = shown !== 0;
|
||||
}
|
||||
|
||||
function filterGroupDetail(masterId) {
|
||||
const master = document.getElementById(masterId);
|
||||
const table = document.querySelector(`[data-group-detail-table="${masterId}"]`);
|
||||
if (!master || !table) {
|
||||
return;
|
||||
}
|
||||
const selected = master.value;
|
||||
let shown = 0;
|
||||
table.querySelectorAll('tbody tr[data-group-id]').forEach((row) => {
|
||||
const visible = row.dataset.groupId === selected;
|
||||
row.hidden = !visible;
|
||||
shown += visible ? 1 : 0;
|
||||
});
|
||||
let empty = table.querySelector('tbody tr.empty-group-detail-runtime');
|
||||
if (!empty) {
|
||||
empty = document.createElement('tr');
|
||||
empty.className = 'empty-group-detail-runtime';
|
||||
empty.innerHTML = `<td colspan="3" class="text-muted">${escapeHtml(table.dataset.emptyMessage || '선택한 그룹에 등록된 항목이 없습니다.')}</td>`;
|
||||
table.querySelector('tbody').appendChild(empty);
|
||||
}
|
||||
empty.hidden = shown !== 0;
|
||||
}
|
||||
|
||||
function renderRuleColumnOptions(columns) {
|
||||
document.querySelectorAll('.rule-column-select').forEach((select) => {
|
||||
const current = select.value;
|
||||
@@ -477,6 +500,10 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
master.addEventListener('change', filterUserRoleDetail);
|
||||
filterUserRoleDetail();
|
||||
}
|
||||
document.querySelectorAll('.group-master-select').forEach((select) => {
|
||||
select.addEventListener('change', () => filterGroupDetail(select.id));
|
||||
filterGroupDetail(select.id);
|
||||
});
|
||||
const objectSelect = document.querySelector('select[name="objectRef"]');
|
||||
if (objectSelect) {
|
||||
objectSelect.addEventListener('change', () => {
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
<button class="rw-menu-trigger" type="button" aria-expanded="false">권한 관리</button>
|
||||
<div class="rw-menu-panel">
|
||||
<a class="nav-link" href="/users">사용자</a>
|
||||
<a class="nav-link" href="/groups">그룹</a>
|
||||
<a class="nav-link" href="/roles">역할</a>
|
||||
<a class="nav-link" href="/permissions">권한</a>
|
||||
<a class="nav-link" href="/tokens">토큰</a>
|
||||
@@ -62,7 +63,7 @@
|
||||
<div class="architecture-step" th:classappend="${activeLayer == 'permission'} ? ' active'">
|
||||
<span class="architecture-kicker">Backoffice Tables</span>
|
||||
<strong>권한 테이블</strong>
|
||||
<p>사용자, 역할, 행 규칙, 컬럼 원문 허용을 저장합니다.</p>
|
||||
<p>사용자, 그룹, 역할, 행 규칙, 컬럼 원문 허용을 저장합니다.</p>
|
||||
</div>
|
||||
<div class="architecture-arrow">→</div>
|
||||
<div class="architecture-step" th:classappend="${activeLayer == 'vpd'} ? ' active'">
|
||||
|
||||
173
src/main/resources/templates/groups.html
Normal file
173
src/main/resources/templates/groups.html
Normal file
@@ -0,0 +1,173 @@
|
||||
<!doctype html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||
<head th:replace="~{fragments/layout :: head('그룹 관리')}"></head>
|
||||
<body>
|
||||
<nav th:replace="~{fragments/layout :: nav}"></nav>
|
||||
<main class="container py-4">
|
||||
<div class="page-title">
|
||||
<h1>그룹 관리</h1>
|
||||
<p>사용자 그룹을 만들고 그룹에 사용자와 역할을 부여합니다. 권한은 역할에 연결되고, 사용자는 직접 역할과 그룹 역할을 함께 상속합니다.</p>
|
||||
</div>
|
||||
|
||||
<div class="alert alert-success" th:if="${message}" th:text="${message}"></div>
|
||||
|
||||
<section class="content-band">
|
||||
<h2>그룹 추가</h2>
|
||||
<form method="post" action="/groups" class="form-grid">
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
|
||||
<label>
|
||||
그룹 코드
|
||||
<input class="form-control" name="groupCode" placeholder="SALES_TEAM" required>
|
||||
</label>
|
||||
<label>
|
||||
그룹명
|
||||
<input class="form-control" name="groupName" placeholder="영업팀" required>
|
||||
</label>
|
||||
<label class="span-2">
|
||||
설명
|
||||
<input class="form-control" name="description" maxlength="200">
|
||||
</label>
|
||||
<button class="btn rw-btn-primary" type="submit">추가</button>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
<section class="content-band">
|
||||
<h2>그룹 목록</h2>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm align-middle">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>코드</th>
|
||||
<th>그룹명</th>
|
||||
<th>설명</th>
|
||||
<th>상태</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="group : ${groups}">
|
||||
<td th:text="${group.groupId()}">1</td>
|
||||
<td><code th:text="${group.groupCode()}">SALES_TEAM</code></td>
|
||||
<td th:text="${group.groupName()}">영업팀</td>
|
||||
<td th:text="${group.description()}">설명</td>
|
||||
<td><span class="badge" th:classappend="${group.active()} ? ' text-bg-success' : ' text-bg-secondary'" th:text="${group.activeYn()}">Y</span></td>
|
||||
<td>
|
||||
<form method="post" action="/groups/active" class="inline-form">
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
|
||||
<input type="hidden" name="groupId" th:value="${group.groupId()}">
|
||||
<input type="hidden" name="active" th:value="${!group.active()}">
|
||||
<button class="btn btn-sm btn-outline-secondary" type="submit" th:text="${group.active()} ? '비활성화' : '활성화'">변경</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<tr th:if="${#lists.isEmpty(groups)}">
|
||||
<td colspan="6" class="text-muted">등록된 그룹이 없습니다.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="content-band">
|
||||
<h2>그룹 사용자</h2>
|
||||
<form method="post" action="/groups/users" class="form-grid">
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
|
||||
<label>
|
||||
그룹
|
||||
<select class="form-select group-master-select" id="groupUserMaster" name="groupId" required>
|
||||
<option th:each="group : ${groups}" th:value="${group.groupId()}" th:text="${group.groupCode() + ' / ' + group.groupName()}"></option>
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
추가할 사용자
|
||||
<select class="form-select" name="userId" required>
|
||||
<option th:each="user : ${users}" th:value="${user.userId()}" th:text="${user.username()}"></option>
|
||||
</select>
|
||||
</label>
|
||||
<button class="btn rw-btn-primary" type="submit">추가</button>
|
||||
</form>
|
||||
|
||||
<h2 class="mt-4">선택 그룹 사용자</h2>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm align-middle" data-group-detail-table="groupUserMaster" data-empty-message="선택한 그룹에 사용자가 없습니다.">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>그룹</th>
|
||||
<th>사용자</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="mapping : ${groupUsers}" th:attr="data-group-id=${mapping.groupId()}">
|
||||
<td><code th:text="${mapping.groupCode()}">SALES_TEAM</code></td>
|
||||
<td th:text="${mapping.username()}">agent_sales</td>
|
||||
<td>
|
||||
<form method="post" action="/groups/users/delete" class="inline-form">
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
|
||||
<input type="hidden" name="groupId" th:value="${mapping.groupId()}">
|
||||
<input type="hidden" name="userId" th:value="${mapping.userId()}">
|
||||
<button class="btn btn-sm btn-outline-danger" type="submit">해제</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<tr th:if="${#lists.isEmpty(groupUsers)}">
|
||||
<td colspan="3" class="text-muted">등록된 그룹 사용자가 없습니다.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="content-band">
|
||||
<h2>그룹 역할</h2>
|
||||
<form method="post" action="/groups/roles" class="form-grid">
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
|
||||
<label>
|
||||
그룹
|
||||
<select class="form-select group-master-select" id="groupRoleMaster" name="groupId" required>
|
||||
<option th:each="group : ${groups}" th:value="${group.groupId()}" th:text="${group.groupCode() + ' / ' + group.groupName()}"></option>
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
부여할 역할
|
||||
<select class="form-select" name="roleId" required>
|
||||
<option th:each="role : ${roles}" th:value="${role.roleId()}" th:text="${role.roleName()}"></option>
|
||||
</select>
|
||||
</label>
|
||||
<button class="btn rw-btn-primary" type="submit">부여</button>
|
||||
</form>
|
||||
|
||||
<h2 class="mt-4">선택 그룹 역할</h2>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm align-middle" data-group-detail-table="groupRoleMaster" data-empty-message="선택한 그룹에 부여된 역할이 없습니다.">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>그룹</th>
|
||||
<th>역할</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="mapping : ${groupRoles}" th:attr="data-group-id=${mapping.groupId()}">
|
||||
<td><code th:text="${mapping.groupCode()}">SALES_TEAM</code></td>
|
||||
<td th:text="${mapping.roleName()}">SALES_ROLE</td>
|
||||
<td>
|
||||
<form method="post" action="/groups/roles/delete" class="inline-form">
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
|
||||
<input type="hidden" name="groupId" th:value="${mapping.groupId()}">
|
||||
<input type="hidden" name="roleId" th:value="${mapping.roleId()}">
|
||||
<button class="btn btn-sm btn-outline-danger" type="submit">해제</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<tr th:if="${#lists.isEmpty(groupRoles)}">
|
||||
<td colspan="3" class="text-muted">등록된 그룹 역할이 없습니다.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user