refactor: enableAccessControl to publicAccessControl

ref: ubiquity#697 (comment)
0x4007 · Sep 25, 2023 · cd3c4b2 · cd3c4b2
1 parent db3685b
commit cd3c4b2
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/src/bindings/config.ts b/src/bindings/config.ts
@@ -33,7 +33,7 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
     assistivePricing,
     registerWalletWithVerification,
     staleBountyTime,
-    enableAccessControl,
+    publicAccessControl,
     openAIKey,
     openAITokenLimit,
     newContributorGreeting,
@@ -106,7 +106,7 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
       apiKey: openAIKey,
       tokenLimit: openAITokenLimit || 0,
     },
-    accessControl: enableAccessControl,
+    publicAccessControl: publicAccessControl,
     newContributorGreeting: newContributorGreeting,
   };
 

diff --git a/src/configs/ubiquibot-config-default.ts b/src/configs/ubiquibot-config-default.ts
@@ -93,10 +93,14 @@ export const DefaultConfig: MergedConfig = {
       },
     },
   },
-  enableAccessControl: {
-    label: true,
-    organization: true,
+  publicAccessControl: {
+    setLabel: true,
+    fundExternalClosedIssue: true,
   },
+
+  // "public-access-control": {
+  // "set-label": false,
+  // "fund-external-closed-issue": false
   staleBountyTime: "0d",
   newContributorGreeting: {
     enabled: false,

diff --git a/src/handlers/access/labels-access.ts b/src/handlers/access/labels-access.ts
@@ -4,8 +4,8 @@ import { addCommentToIssue, getUserPermission, removeLabel, addLabelToIssue } fr
 import { Payload } from "../../types";
 
 export const handleLabelsAccess = async () => {
-  const { accessControl } = getBotConfig();
-  if (!accessControl.label) return true;
+  const { publicAccessControl: accessControl } = getBotConfig();
+  if (!accessControl.setLabel) return true;
 
   const context = getBotContext();
   const logger = getLogger();

diff --git a/src/handlers/payout/action.ts b/src/handlers/payout/action.ts
@@ -67,7 +67,7 @@ export const incentivesCalculation = async (): Promise<IncentivesCalculationResu
     payout: { paymentToken, rpc, permitBaseUrl, evmNetworkId, privateKey },
     mode: { incentiveMode, permitMaxPrice },
     price: { incentives, issueCreatorMultiplier, baseMultiplier },
-    accessControl,
+    publicAccessControl: accessControl,
   } = getBotConfig();
   const logger = getLogger();
   const payload = context.payload as Payload;
@@ -80,7 +80,7 @@ export const incentivesCalculation = async (): Promise<IncentivesCalculationResu
     throw new Error("Permit generation skipped because issue is undefined");
   }
 
-  if (accessControl.organization) {
+  if (accessControl.fundExternalClosedIssue) {
     const userHasPermission = await checkUserPermissionForRepoAndOrg(payload.sender.login, context);
 
     if (!userHasPermission) {

diff --git a/src/handlers/pricing/action.ts b/src/handlers/pricing/action.ts
@@ -25,7 +25,7 @@ export const pricingLabelLogic = async (): Promise<void> => {
   }
   const valid = await handleLabelsAccess();
 
-  if (!valid && config.accessControl.label) {
+  if (!valid && config.publicAccessControl.setLabel) {
     return;
   }
 

diff --git a/src/types/config.ts b/src/types/config.ts
@@ -125,12 +125,12 @@ export const WalletSchema = Type.Object({
   registerWalletWithVerification: Type.Boolean(),
 });
 
-export const AccessControlSchema = Type.Object({
-  label: Type.Boolean(),
-  organization: Type.Boolean(),
+export const PublicAccessControlSchema = Type.Object({
+  setLabel: Type.Boolean(),
+  fundExternalClosedIssue: Type.Boolean(),
 });
 
-export type AccessControl = Static<typeof AccessControlSchema>;
+export type AccessControl = Static<typeof PublicAccessControlSchema>;
 
 export const BotConfigSchema = Type.Object({
   log: LogConfigSchema,
@@ -146,7 +146,7 @@ export const BotConfigSchema = Type.Object({
   command: CommandConfigSchema,
   wallet: WalletSchema,
   ask: AskSchema,
-  accessControl: AccessControlSchema,
+  publicAccessControl: PublicAccessControlSchema,
   newContributorGreeting: NewContributorGreetingSchema,
 });
 
@@ -187,7 +187,7 @@ export const WideConfigSchema = Type.Object(
     incentives: Type.Optional(IncentivesSchema),
     defaultLabels: Type.Optional(Type.Array(Type.String())),
     registerWalletWithVerification: Type.Optional(Type.Boolean()),
-    enableAccessControl: Type.Optional(AccessControlSchema),
+    enableAccessControl: Type.Optional(PublicAccessControlSchema),
     openAIKey: Type.Optional(Type.String()),
     openAITokenLimit: Type.Optional(Type.Number()),
     staleBountyTime: Type.Optional(Type.String()),
@@ -220,7 +220,7 @@ export const MergedConfigSchema = Type.Object({
   incentives: IncentivesSchema,
   defaultLabels: Type.Array(Type.String()),
   registerWalletWithVerification: Type.Boolean(),
-  enableAccessControl: AccessControlSchema,
+  publicAccessControl: PublicAccessControlSchema,
   openAIKey: Type.Optional(Type.String()),
   openAITokenLimit: Type.Optional(Type.Number()),
   staleBountyTime: Type.String(),

diff --git a/src/utils/private.ts b/src/utils/private.ts
@@ -157,7 +157,7 @@ export const getWideConfig = async (context: Context) => {
     defaultLabels: mergedConfigData.defaultLabels,
     promotionComment: mergedConfigData.promotionComment,
     registerWalletWithVerification: mergedConfigData.registerWalletWithVerification,
-    enableAccessControl: mergedConfigData.enableAccessControl,
+    publicAccessControl: mergedConfigData.publicAccessControl,
     openAIKey: mergedConfigData.openAIKey,
     openAITokenLimit: mergedConfigData.openAITokenLimit,
     staleBountyTime: mergedConfigData.staleBountyTime,