@forge/lint 2.0.1-next.3 → 2.0.1-next.4

package/CHANGELOG.md

@@ -1,10 +1,22 @@
 # @forge/lint
 
+## 2.0.1-next.4
+
+### Patch Changes
+
+- 2e70a0b: Accept both granular and deprecated scopes when verifying scopes required for Content Properties.
+- Updated dependencies [d3ccc04]
+  - @forge/manifest@3.1.0-next.4
+  - @forge/cli-shared@2.2.1-next.4
+
 ## 2.0.1-next.3
 
 ### Patch Changes
 
 - 1f7c428: Accept both deprecated scopes and granular scopes when verifying scopes required for REST product endpoints.
+- Updated dependencies [debe251]
+  - @forge/manifest@3.1.0-next.3
+  - @forge/cli-shared@2.2.1-next.3
 
 ## 2.0.1-next.2
 

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts

@@ -1,10 +1,15 @@
 import { LintClass, LintResultRule } from '../../../linter-interface';
 import { BaseLintIssueVerifier, LintIssueVerifier } from '../../verifier-interface';
 import { ContentPropertyApiCall } from '../api-call-interface';
-export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, string[]>>;
+declare type ContentPropertyPermissions = {
+    current: string[];
+    deprecated: string[];
+};
+export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, ContentPropertyPermissions>>;
 export declare class ContentPropertyVerifier extends BaseLintIssueVerifier implements LintIssueVerifier<ContentPropertyApiCall[]> {
     protected getLintClass(): LintClass;
     process(apiCalls: ContentPropertyApiCall[]): Promise<LintResultRule[]>;
     private getMissingScopes;
 }
+export {};
 //# sourceMappingURL=content-property-verifier.d.ts.map

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-property-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/content-property-verifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAqBrF,CAAC;AAEF,qBAAa,uBACX,SAAQ,qBACR,YAAW,iBAAiB,CAAC,sBAAsB,EAAE,CAAC;IACtD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAuBnF,OAAO,CAAC,gBAAgB;CAQzB"}
+{"version":3,"file":"content-property-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/content-property-verifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,aAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAyDvG,CAAC;AAEF,qBAAa,uBACX,SAAQ,qBACR,YAAW,iBAAiB,CAAC,sBAAsB,EAAE,CAAC;IACtD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAuBnF,OAAO,CAAC,gBAAgB;CAyBzB"}

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.js

@@ -7,24 +7,60 @@ const text_1 = require("../../../text");
 const verifier_interface_1 = require("../../verifier-interface");
 exports.CONTENT_PROPERTY_PERMISSIONS_MAP = {
     onJiraIssue: {
-        get: ['read:jira-work'],
-        set: ['write:jira-work'],
-        delete: ['write:jira-work']
+        get: {
+            current: ['read:issue.property:jira'],
+            deprecated: ['read:jira-work']
+        },
+        set: {
+            current: ['write:issue.property:jira'],
+            deprecated: ['write:jira-work']
+        },
+        delete: {
+            current: ['delete:issue.property:jira'],
+            deprecated: ['write:jira-work']
+        }
     },
     onJiraProject: {
-        get: ['read:jira-work'],
-        set: ['manage:jira-project'],
-        delete: ['manage:jira-project']
+        get: {
+            current: ['read:project.property:jira'],
+            deprecated: ['read:jira-work']
+        },
+        set: {
+            current: ['write:project.property:jira'],
+            deprecated: ['manage:jira-project']
+        },
+        delete: {
+            current: ['delete:project.property:jira'],
+            deprecated: ['manage:jira-project']
+        }
     },
     onConfluencePage: {
-        get: ['read:confluence-props'],
-        set: ['read:confluence-props', 'write:confluence-props'],
-        delete: ['write:confluence-props']
+        get: {
+            current: ['read:content-details:confluence'],
+            deprecated: ['read:confluence-props']
+        },
+        set: {
+            current: ['read:content.property:confluence', 'write:content.property:confluence'],
+            deprecated: ['read:confluence-props', 'write:confluence-props']
+        },
+        delete: {
+            current: ['write:content.property:confluence'],
+            deprecated: ['write:confluence-props']
+        }
     },
     onConfluenceSpace: {
-        get: ['read:confluence-props'],
-        set: ['read:confluence-props', 'write:confluence-props'],
-        delete: ['write:confluence-props']
+        get: {
+            current: ['read:content-details:confluence'],
+            deprecated: ['read:confluence-props']
+        },
+        set: {
+            current: ['read:space.property:confluence', 'write:space.property:confluence'],
+            deprecated: ['read:confluence-props', 'write:confluence-props']
+        },
+        delete: {
+            current: ['write:space.property:confluence'],
+            deprecated: ['write:confluence-props']
+        }
     }
 };
 class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier {
@@ -50,10 +86,24 @@ class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier
     getMissingScopes({ context, method }) {
         var _a, _b;
         const existingScopes = (_b = (_a = this.manifest) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.scopes;
-        const requiredScopes = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method];
-        if (!existingScopes)
-            return requiredScopes;
-        return requiredScopes.filter((requiredScope) => !existingScopes.includes(requiredScope));
+        const requiredScopesCurrent = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['current'];
+        const requiredScopesDeprecated = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['deprecated'];
+        const missingCurrentPerms = requiredScopesCurrent.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
+        if (missingCurrentPerms.length == 0)
+            return [];
+        let missingDeprecatedPerms = null;
+        if (requiredScopesDeprecated) {
+            missingDeprecatedPerms = requiredScopesDeprecated.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
+            if (missingDeprecatedPerms.length == 0)
+                return [];
+        }
+        if (missingCurrentPerms.length < requiredScopesCurrent.length) {
+            return missingCurrentPerms;
+        }
+        if (missingDeprecatedPerms && missingDeprecatedPerms.length < requiredScopesDeprecated.length) {
+            return missingDeprecatedPerms;
+        }
+        return requiredScopesCurrent;
     }
 }
 exports.ContentPropertyVerifier = ContentPropertyVerifier;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/lint",
-  "version": "2.0.1-next.3",
+  "version": "2.0.1-next.4",
   "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.2",
+    "@forge/cli-shared": "2.2.1-next.4",
     "@forge/csp": "1.9.0",
-    "@forge/manifest": "3.1.0-next.2",
+    "@forge/manifest": "3.1.0-next.4",
     "@typescript-eslint/typescript-estree": "^3.5.0",
     "cross-spawn": "^7.0.1",
     "node-fetch": "^2.6.1",