🐛 fix(schema): 修正 config schema 验证器的问题 #18

arvinxx · Jan 23, 2021 · 889d0a5 · 889d0a5
1 parent b84061f
commit 889d0a5
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 78 deletions.
diff --git a/example/.umirc.ts b/example/.umirc.ts
@@ -16,7 +16,7 @@ export default defineConfig({
     },
     optionsUI: '@/pages/options',
     popupUI: '@/pages/index',
-    permissions: [],
+    permissions: ['http://*/*', 'https://*/*'],
     background: {
       scripts: ['@/background/index'],
       persistent: true,

diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "api:build": "yarn api:clean && typedoc",
     "api:clean": "rm -rf document/docs/api",
     "---------   ": "",
+    "postinstall": "umi generate tmp",
     "clean": "rm -rf es lib example/dist document/dist example/.umi*/ document/.umi*/ coverage .eslintcache",
     "lint": "npm run lint-eslint",
     "tsc": "tsc -p tsconfig-check.json",

diff --git a/src/functions/configSchema.ts b/src/functions/configSchema.ts
@@ -65,85 +65,84 @@ export default (api: IApi) => {
             .valid('document_idle', 'document_start', 'document_end'),
         });
 
+        const knownPermissions = joi
+          .string()
+          .valid(
+            'activeTab',
+            'alarms',
+            'background',
+            'bookmarks',
+            'browsingData',
+            'certificateProvider',
+            'clipboardRead',
+            'clipboardWrite',
+            'contentSettings',
+            'contextMenus',
+            'cookies',
+            'debugger',
+            'declarativeContent',
+            'declarativeNetRequest',
+            'declarativeNetRequestFeedback',
+            'declarativeWebRequest',
+            'desktopCapture',
+            'displaySource',
+            'dns',
+            'documentScan',
+            'downloads',
+            'enterprise.deviceAttributes',
+            'enterprise.hardwarePlatform',
+            'enterprise.networkingAttributes',
+            'enterprise.platformKeys',
+            'experimental',
+            'fileBrowserHandler',
+            'fileSystemProvider',
+            'fontSettings',
+            'gcm',
+            'geolocation',
+            'history',
+            'identity',
+            'idle',
+            'idltest',
+            'login',
+            'loginScreenStorage',
+            'loginState',
+            'management',
+            'nativeMessaging',
+            'notifications',
+            'pageCapture',
+            'platformKeys',
+            'power',
+            'printerProvider',
+            'printing',
+            'printingMetrics',
+            'privacy',
+            'processes',
+            'proxy',
+            'scripting',
+            'search',
+            'sessions',
+            'signedInDevices',
+            'storage',
+            'system.cpu',
+            'system.display',
+            'system.memory',
+            'system.storage',
+            'tabCapture',
+            'tabGroups',
+            'tabs',
+            'topSites',
+            'tts',
+            'ttsEngine',
+            'unlimitedStorage',
+            'vpnProvider',
+            'wallpaper',
+            'webNavigation',
+            'webRequest',
+            'webRequestBlocking',
+          );
         const permissions = joi
           .array()
-          .items(
-            joi
-              .string()
-              .valid(
-                'activeTab',
-                'alarms',
-                'background',
-                'bookmarks',
-                'browsingData',
-                'certificateProvider',
-                'clipboardRead',
-                'clipboardWrite',
-                'contentSettings',
-                'contextMenus',
-                'cookies',
-                'debugger',
-                'declarativeContent',
-                'declarativeNetRequest',
-                'declarativeNetRequestFeedback',
-                'declarativeWebRequest',
-                'desktopCapture',
-                'displaySource',
-                'dns',
-                'documentScan',
-                'downloads',
-                'enterprise.deviceAttributes',
-                'enterprise.hardwarePlatform',
-                'enterprise.networkingAttributes',
-                'enterprise.platformKeys',
-                'experimental',
-                'fileBrowserHandler',
-                'fileSystemProvider',
-                'fontSettings',
-                'gcm',
-                'geolocation',
-                'history',
-                'identity',
-                'idle',
-                'idltest',
-                'login',
-                'loginScreenStorage',
-                'loginState',
-                'management',
-                'nativeMessaging',
-                'notifications',
-                'pageCapture',
-                'platformKeys',
-                'power',
-                'printerProvider',
-                'printing',
-                'printingMetrics',
-                'privacy',
-                'processes',
-                'proxy',
-                'scripting',
-                'search',
-                'sessions',
-                'signedInDevices',
-                'storage',
-                'system.cpu',
-                'system.display',
-                'system.memory',
-                'system.storage',
-                'tabCapture',
-                'tabGroups',
-                'tabs',
-                'topSites',
-                'tts',
-                'ttsEngine',
-                'unlimitedStorage',
-                'vpnProvider',
-                'wallpaper',
-                'webNavigation',
-                'webRequest',
-                'webRequestBlocking',
-              ),
-          );
+          .items(joi.alternatives(knownPermissions, joi.string()));
 
         return joi.object({
           name: joi.string(),