mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-03-16 14:11:50 +00:00
dashboard: work on guild access page
This commit is contained in:
parent
f90ee12b9f
commit
e0209d3319
6 changed files with 138 additions and 18 deletions
|
@ -7,6 +7,9 @@ import yaml, { YAMLException } from "js-yaml";
|
||||||
import { apiTokenAuthHandlers } from "./auth";
|
import { apiTokenAuthHandlers } from "./auth";
|
||||||
import { ApiPermissions } from "@shared/apiPermissions";
|
import { ApiPermissions } from "@shared/apiPermissions";
|
||||||
import { hasGuildPermission, requireGuildPermission } from "./permissions";
|
import { hasGuildPermission, requireGuildPermission } from "./permissions";
|
||||||
|
import { ApiPermissionAssignments } from "../data/ApiPermissionAssignments";
|
||||||
|
|
||||||
|
const apiPermissionAssignments = new ApiPermissionAssignments();
|
||||||
|
|
||||||
export function initGuildsAPI(app: express.Express) {
|
export function initGuildsAPI(app: express.Express) {
|
||||||
const allowedGuilds = new AllowedGuilds();
|
const allowedGuilds = new AllowedGuilds();
|
||||||
|
@ -82,5 +85,14 @@ export function initGuildsAPI(app: express.Express) {
|
||||||
ok(res);
|
ok(res);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
guildRouter.get(
|
||||||
|
"/:guildId/permissions",
|
||||||
|
requireGuildPermission(ApiPermissions.ManageAccess),
|
||||||
|
async (req: Request, res: Response) => {
|
||||||
|
const permissions = await apiPermissionAssignments.getByGuildId(req.params.guildId);
|
||||||
|
res.json(permissions);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
app.use("/guilds", guildRouter);
|
app.use("/guilds", guildRouter);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,14 @@ export class ApiPermissionAssignments extends BaseRepository {
|
||||||
this.apiPermissions = getRepository(ApiPermissionAssignment);
|
this.apiPermissions = getRepository(ApiPermissionAssignment);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getByGuildId(guildId) {
|
||||||
|
return this.apiPermissions.find({
|
||||||
|
where: {
|
||||||
|
guild_id: guildId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
getByUserId(userId) {
|
getByUserId(userId) {
|
||||||
return this.apiPermissions.find({
|
return this.apiPermissions.find({
|
||||||
where: {
|
where: {
|
||||||
|
|
|
@ -4,7 +4,10 @@
|
||||||
<p>
|
<p>
|
||||||
<img class="inline-block w-16 mr-4" style="vertical-align: -20px" src="../../img/squint.png"> Or here
|
<img class="inline-block w-16 mr-4" style="vertical-align: -20px" src="../../img/squint.png"> Or here
|
||||||
</p>
|
</p>
|
||||||
<permission-tree :tree="tree" :granted-permissions="grantedPermissions" :on-change="onChange" />
|
<div v-for="permAssignment in permissionAssignments">
|
||||||
|
<strong>{{ permAssignment.type }} {{ permAssignment.target_id }}</strong>
|
||||||
|
<permission-tree :tree="permAssignment._permissionTree" :granted-permissions="permAssignment.permissions" :on-change="onTreeUpdate.bind(null, permAssignment)" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -12,27 +15,65 @@
|
||||||
import { ApiPermissions, permissionHierarchy } from "@shared/apiPermissions";
|
import { ApiPermissions, permissionHierarchy } from "@shared/apiPermissions";
|
||||||
import PermissionTree from "./PermissionTree.vue";
|
import PermissionTree from "./PermissionTree.vue";
|
||||||
import { applyStateToPermissionHierarchy } from "./permissionTreeUtils";
|
import { applyStateToPermissionHierarchy } from "./permissionTreeUtils";
|
||||||
|
import { mapState } from "vuex";
|
||||||
|
import { GuildState } from "../../store/types";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {PermissionTree},
|
components: {PermissionTree},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tree: [],
|
managerPermissions: new Set([ApiPermissions.ManageAccess]),
|
||||||
grantedPermissions: new Set([ApiPermissions.EditConfig]),
|
|
||||||
managerPermissions: new Set([ApiPermissions.ManageAccess])
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
beforeMount() {
|
computed: {
|
||||||
this.tree = applyStateToPermissionHierarchy(permissionHierarchy, this.grantedPermissions, this.managerPermissions);
|
...mapState<GuildState>("guilds", {
|
||||||
|
canManage(guilds) {
|
||||||
|
return guilds.myPermissions[this.$route.params.guildId]?.[ApiPermissions.ManageAccess];
|
||||||
|
},
|
||||||
|
|
||||||
|
permissionAssignments(guilds) {
|
||||||
|
return (guilds.guildPermissionAssignments[this.$route.params.guildId] || []).map(permAssignment => {
|
||||||
|
return {
|
||||||
|
...permAssignment,
|
||||||
|
_permissionTree: applyStateToPermissionHierarchy(permissionHierarchy, permAssignment.permissions, this.managerPermissions),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
// beforeMount() {
|
||||||
|
// this.tree = applyStateToPermissionHierarchy(permissionHierarchy, this.grantedPermissions, this.managerPermissions);
|
||||||
|
// },
|
||||||
|
async mounted() {
|
||||||
|
await this.$store.dispatch("guilds/checkPermission", {
|
||||||
|
guildId: this.$route.params.guildId,
|
||||||
|
permission: ApiPermissions.ManageAccess,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (! this.canManage) {
|
||||||
|
this.$router.push('/dashboard');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.$store.dispatch("guilds/loadGuildPermissionAssignments", this.$route.params.guildId);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
updateTreeState() {
|
// updateTreeState() {
|
||||||
this.tree = applyStateToPermissionHierarchy(permissionHierarchy, this.grantedPermissions, this.managerPermissions);
|
// this.tree = applyStateToPermissionHierarchy(permissionHierarchy, this.grantedPermissions, this.managerPermissions);
|
||||||
},
|
// },
|
||||||
|
//
|
||||||
|
// onChange() {
|
||||||
|
// this.updateTreeState();
|
||||||
|
// }
|
||||||
|
|
||||||
onChange() {
|
onTreeUpdate(targetPermissions) {
|
||||||
console.log('changed!', this.grantedPermissions);
|
console.log('hi');
|
||||||
this.updateTreeState();
|
this.$store.dispatch("guilds/setTargetPermissions", {
|
||||||
|
guildId: this.$route.params.guildId,
|
||||||
|
targetId: targetPermissions.target_id,
|
||||||
|
type: targetPermissions.type,
|
||||||
|
permissions: targetPermissions.permissions,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,12 +74,12 @@
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState('guilds', {
|
...mapState("guilds", {
|
||||||
guild() {
|
guild(guilds) {
|
||||||
return this.$store.state.guilds.available.get(this.$route.params.guildId);
|
return guilds.available.get(this.$route.params.guildId);
|
||||||
},
|
},
|
||||||
config() {
|
config(guilds) {
|
||||||
return this.$store.state.guilds.configs[this.$route.params.guildId];
|
return guilds.configs[this.$route.params.guildId];
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
import { get, post } from "../api";
|
import { get, post } from "../api";
|
||||||
import { Module } from "vuex";
|
import { Module } from "vuex";
|
||||||
import { GuildState, LoadStatus, RootState } from "./types";
|
import { GuildState, LoadStatus, RootState } from "./types";
|
||||||
|
import { ApiPermissions } from "@shared/apiPermissions";
|
||||||
|
import Vue from "vue";
|
||||||
|
|
||||||
export const GuildStore: Module<GuildState, RootState> = {
|
export const GuildStore: Module<GuildState, RootState> = {
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
@ -9,6 +11,8 @@ export const GuildStore: Module<GuildState, RootState> = {
|
||||||
availableGuildsLoadStatus: LoadStatus.None,
|
availableGuildsLoadStatus: LoadStatus.None,
|
||||||
available: new Map(),
|
available: new Map(),
|
||||||
configs: {},
|
configs: {},
|
||||||
|
myPermissions: {},
|
||||||
|
guildPermissionAssignments: {},
|
||||||
},
|
},
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
|
@ -43,6 +47,20 @@ export const GuildStore: Module<GuildState, RootState> = {
|
||||||
async saveConfig({ commit }, { guildId, config }) {
|
async saveConfig({ commit }, { guildId, config }) {
|
||||||
await post(`guilds/${guildId}/config`, { config });
|
await post(`guilds/${guildId}/config`, { config });
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async checkPermission({ commit }, { guildId, permission }) {
|
||||||
|
const result = await post(`guilds/${guildId}/check-permission`, { permission });
|
||||||
|
commit("setMyPermission", { guildId, permission, value: result.result });
|
||||||
|
},
|
||||||
|
|
||||||
|
async loadGuildPermissionAssignments({ commit }, guildId) {
|
||||||
|
const permissionAssignments = await get(`guilds/${guildId}/permissions`);
|
||||||
|
commit("setGuildPermissionAssignments", { guildId, permissionAssignments });
|
||||||
|
},
|
||||||
|
|
||||||
|
async setTargetPermissions({ commit }, { guildId, targetId, type, permissions }) {
|
||||||
|
commit("setTargetPermissions", { guildId, targetId, type, permissions });
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
mutations: {
|
mutations: {
|
||||||
|
@ -52,10 +70,36 @@ export const GuildStore: Module<GuildState, RootState> = {
|
||||||
|
|
||||||
addGuild(state: GuildState, guild) {
|
addGuild(state: GuildState, guild) {
|
||||||
state.available.set(guild.id, guild);
|
state.available.set(guild.id, guild);
|
||||||
|
state.available = state.available;
|
||||||
},
|
},
|
||||||
|
|
||||||
setConfig(state: GuildState, { guildId, config }) {
|
setConfig(state: GuildState, { guildId, config }) {
|
||||||
state.configs[guildId] = config;
|
Vue.set(state.configs, guildId, config);
|
||||||
|
},
|
||||||
|
|
||||||
|
setMyPermission(state: GuildState, { guildId, permission, value }) {
|
||||||
|
Vue.set(state.myPermissions, guildId, state.myPermissions[guildId] || {});
|
||||||
|
Vue.set(state.myPermissions[guildId], permission, value);
|
||||||
|
},
|
||||||
|
|
||||||
|
setGuildPermissionAssignments(state: GuildState, { guildId, permissionAssignments }) {
|
||||||
|
Vue.set(
|
||||||
|
state.guildPermissionAssignments,
|
||||||
|
guildId,
|
||||||
|
permissionAssignments.map(p => ({
|
||||||
|
...p,
|
||||||
|
permissions: new Set(p.permissions),
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
setTargetPermissions(state: GuildState, { guildId, targetId, type, permissions }) {
|
||||||
|
const guildPermissionAssignments = state.guildPermissionAssignments[guildId] || [];
|
||||||
|
const itemToEdit = guildPermissionAssignments.find(p => p.target_id === targetId && p.type === type);
|
||||||
|
if (!itemToEdit) return;
|
||||||
|
|
||||||
|
itemToEdit.permissions = permissions;
|
||||||
|
state.guildPermissionAssignments = { ...state.guildPermissionAssignments };
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
import { ApiPermissions } from "@shared/apiPermissions";
|
||||||
|
import { ApiPermissionTypes } from "../../../backend/src/data/ApiPermissionAssignments";
|
||||||
|
|
||||||
export enum LoadStatus {
|
export enum LoadStatus {
|
||||||
None = 1,
|
None = 1,
|
||||||
Loading,
|
Loading,
|
||||||
|
@ -22,6 +25,18 @@ export interface GuildState {
|
||||||
configs: {
|
configs: {
|
||||||
[key: string]: string;
|
[key: string]: string;
|
||||||
};
|
};
|
||||||
|
myPermissions: {
|
||||||
|
[guildId: string]: {
|
||||||
|
[K in ApiPermissions]?: boolean;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
guildPermissionAssignments: {
|
||||||
|
[guildId: string]: Array<{
|
||||||
|
target_id: string;
|
||||||
|
type: ApiPermissionTypes;
|
||||||
|
permissions: Set<ApiPermissions>;
|
||||||
|
}>;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface StaffState {
|
export interface StaffState {
|
||||||
|
|
Loading…
Add table
Reference in a new issue