Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add role array support #1098

Merged
merged 2 commits into from
Mar 23, 2025
Merged

feat: add role array support #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67a71fb
feat: add role array support
AppIe314 Mar 16, 2025
48a5fe4
style: format code using Prettier
AppIe314 Mar 23, 2025
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
25 changes: 14 additions & 11 deletions packages/config/lib/mutations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,49 +277,52 @@ const applyMutations = (config) => {
const aliasObj = Object.fromEntries(
config.authentication.aliases.map((alias) => [alias.name, alias.role]),
)
/** @param {string} role */
const replaceAliases = (role) => aliasObj[role] ?? role
/** @param {string | string[]} role */
const replaceAliases = (role) =>
Array.isArray(role)
? role.flatMap((r) => aliasObj[r] ?? r)
: (aliasObj[role] ?? role)

const replaceBothAliases = (incomingObj) => ({
...incomingObj,
discordRoles: Array.isArray(incomingObj.discordRoles)
? incomingObj.discordRoles.map(replaceAliases)
? incomingObj.discordRoles.flatMap(replaceAliases)
: undefined,
telegramGroups: Array.isArray(incomingObj.telegramGroups)
? incomingObj.telegramGroups.map(replaceAliases)
? incomingObj.telegramGroups.flatMap(replaceAliases)
: undefined,
})

Object.keys(config.authentication.perms).forEach((perm) => {
config.authentication.perms[perm].roles =
config.authentication.perms[perm].roles.map(replaceAliases)
config.authentication.perms[perm].roles.flatMap(replaceAliases)
})

config.authentication.areaRestrictions =
config.authentication.areaRestrictions.map(({ roles, areas }) => ({
roles: roles.map(replaceAliases),
roles: roles.flatMap(replaceAliases),
areas,
}))

config.authentication.strategies = config.authentication.strategies.map(
(strategy) => ({
...strategy,
allowedGuilds: Array.isArray(strategy.allowedGuilds)
? strategy.allowedGuilds.map(replaceAliases)
? strategy.allowedGuilds.flatMap(replaceAliases)
: [],
blockedGuilds: Array.isArray(strategy.blockedGuilds)
? strategy.blockedGuilds.map(replaceAliases)
? strategy.blockedGuilds.flatMap(replaceAliases)
: [],
groups: Array.isArray(strategy.groups)
? strategy.groups.map(replaceAliases)
? strategy.groups.flatMap(replaceAliases)
: [],
allowedUsers: Array.isArray(strategy.allowedUsers)
? strategy.allowedUsers.map(replaceAliases)
? strategy.allowedUsers.flatMap(replaceAliases)
: [],
trialPeriod: {
...strategy.trialPeriod,
roles: Array.isArray(strategy?.trialPeriod?.roles)
? strategy.trialPeriod.roles.map(replaceAliases)
? strategy.trialPeriod.roles.flatMap(replaceAliases)
: [],
},
}),
Expand Down
2 changes: 1 addition & 1 deletion packages/types/lib/config.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export type Config<Client extends boolean = false> = DeepMerge<
// alwaysEnabledPerms: (keyof BaseConfig['authentication']['perms'])[]
excludeFromTutorial: string[]
alwaysEnabledPerms: string[]
aliases: { role: string; name: string }[]
aliases: { role: string | string[]; name: string }[]
methods: Strategy[]
strategies: {
type: Strategy
Expand Down