@forge/lint 2.0.1-next.1 → 2.0.1-next.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @forge/lint
 
+## 2.0.1-next.2
+
+### Patch Changes
+
+- ffa0050: Accept both deprecated scopes and granular scopes when verifying scopes required for Forge UI hooks.
+- Updated dependencies [14102be]
+  - @forge/manifest@3.1.0-next.2
+  - @forge/cli-shared@2.2.1-next.2
+
 ## 2.0.1-next.1
 
 ### Patch Changes

package/out/lint/linters/permission-linter/verifiers/ui-hook-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-hook-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/ui-hook-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAiBpF,qBAAa,cAAe,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,OAAO,EAAE,CAAC;IAC/F,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAiB1E,OAAO,CAAC,WAAW;CAepB"}
+{"version":3,"file":"ui-hook-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/ui-hook-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AA2BpF,qBAAa,cAAe,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,OAAO,EAAE,CAAC;IAC/F,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAoC1E,OAAO,CAAC,WAAW;CAepB"}

package/out/lint/linters/permission-linter/verifiers/ui-hook-verifier.js

@@ -5,17 +5,22 @@ const linter_interface_1 = require("../../../linter-interface");
 const verifier_interface_1 = require("../../verifier-interface");
 const text_1 = require("../../../text");
 const FORGE_UI_HOOK_PERMISSIONS = {
-    useContentProperty: [
-        'read:content-details:confluence',
-        'read:content.property:confluence',
-        'write:content.property:confluence'
-    ],
-    useSpaceProperty: [
-        'read:content-details:confluence',
-        'read:space.property:confluence',
-        'write:space.property:confluence'
-    ],
-    useIssueProperty: ['read:issue.property:jira']
+    useContentProperty: {
+        current: [
+            'read:content-details:confluence',
+            'read:content.property:confluence',
+            'write:content.property:confluence'
+        ],
+        deprecated: ['read:confluence-props', 'write:confluence-props']
+    },
+    useSpaceProperty: {
+        current: ['read:content-details:confluence', 'read:space.property:confluence', 'write:space.property:confluence'],
+        deprecated: ['read:confluence-props', 'write:confluence-props']
+    },
+    useIssueProperty: {
+        current: ['read:issue.property:jira'],
+        deprecated: ['read:jira-work', 'write:jira-work']
+    }
 };
 class UIHookVerifier extends verifier_interface_1.BaseLintIssueVerifier {
     getLintClass() {
@@ -23,17 +28,30 @@ class UIHookVerifier extends verifier_interface_1.BaseLintIssueVerifier {
     }
     async process(apiCalls) {
         const rules = [];
-        apiCalls.forEach((apiCall) => {
+        for (const apiCall of apiCalls) {
             const requiredPermissions = FORGE_UI_HOOK_PERMISSIONS[apiCall.hookName];
             if (!requiredPermissions)
                 return rules;
-            requiredPermissions.forEach((requiredPermission) => {
-                var _a, _b;
-                if (!((_b = (_a = this.manifest.permissions) === null || _a === void 0 ? void 0 : _a.scopes) === null || _b === void 0 ? void 0 : _b.includes(requiredPermission))) {
-                    rules.push(this.getHookRule(apiCall, requiredPermission));
-                }
-            });
-        });
+            const { current, deprecated } = requiredPermissions;
+            const missingCurrentPerms = current.filter((perm) => { var _a, _b; return !((_b = (_a = this.manifest.permissions) === null || _a === void 0 ? void 0 : _a.scopes) === null || _b === void 0 ? void 0 : _b.includes(perm)); });
+            if (!missingCurrentPerms.length)
+                continue;
+            let missingDeprecatedPerms = null;
+            if (deprecated) {
+                missingDeprecatedPerms = deprecated.filter((perm) => { var _a, _b; return !((_b = (_a = this.manifest.permissions) === null || _a === void 0 ? void 0 : _a.scopes) === null || _b === void 0 ? void 0 : _b.includes(perm)); });
+                if (!missingDeprecatedPerms.length)
+                    continue;
+            }
+            if (missingCurrentPerms.length < current.length) {
+                missingCurrentPerms.forEach((perm) => rules.push(this.getHookRule(apiCall, perm)));
+                continue;
+            }
+            if (deprecated && missingDeprecatedPerms && (missingDeprecatedPerms === null || missingDeprecatedPerms === void 0 ? void 0 : missingDeprecatedPerms.length) < deprecated.length) {
+                missingDeprecatedPerms.forEach((perm) => rules.push(this.getHookRule(apiCall, perm)));
+                continue;
+            }
+            missingCurrentPerms.forEach((perm) => rules.push(this.getHookRule(apiCall, perm)));
+        }
         return rules;
     }
     getHookRule(apiCall, permission) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/lint",
-  "version": "2.0.1-next.1",
+  "version": "2.0.1-next.2",
   "description": "Linting for forge apps",
   "main": "out/index.js",
   "license": "UNLICENSED",
@@ -15,9 +15,9 @@
     "@types/node-fetch": "^2.5.7"
   },
   "dependencies": {
-    "@forge/cli-shared": "2.2.1-next.1",
+    "@forge/cli-shared": "2.2.1-next.2",
     "@forge/csp": "1.9.0",
-    "@forge/manifest": "3.1.0-next.1",
+    "@forge/manifest": "3.1.0-next.2",
     "@typescript-eslint/typescript-estree": "^3.5.0",
     "cross-spawn": "^7.0.1",
     "node-fetch": "^2.6.1",