@forge/lint 2.0.1-next.2 → 2.1.0-fix.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/CHANGELOG.md +11 -20
  2. package/out/lint/linters/permission-linter/permission-linter.d.ts +1 -0
  3. package/out/lint/linters/permission-linter/permission-linter.d.ts.map +1 -1
  4. package/out/lint/linters/permission-linter/permission-linter.js +19 -4
  5. package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts +6 -1
  6. package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts.map +1 -1
  7. package/out/lint/linters/permission-linter/verifiers/content-property-verifier.js +66 -16
  8. package/out/lint/linters/permission-linter/verifiers/product-verifier.d.ts +1 -0
  9. package/out/lint/linters/permission-linter/verifiers/product-verifier.d.ts.map +1 -1
  10. package/out/lint/linters/permission-linter/verifiers/product-verifier.js +28 -6
  11. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,30 +1,21 @@
1
1
  # @forge/lint
2
2
 
3
- ## 2.0.1-next.2
3
+ ## 2.1.0-fix.0
4
4
 
5
- ### Patch Changes
6
-
7
- - ffa0050: Accept both deprecated scopes and granular scopes when verifying scopes required for Forge UI hooks.
8
- - Updated dependencies [14102be]
9
- - @forge/manifest@3.1.0-next.2
10
- - @forge/cli-shared@2.2.1-next.2
11
-
12
- ## 2.0.1-next.1
13
-
14
- ### Patch Changes
15
-
16
- - Updated dependencies [8ee1c58]
17
- - @forge/manifest@3.1.0-next.1
18
- - @forge/cli-shared@2.2.1-next.1
5
+ ### Minor Changes
19
6
 
20
- ## 2.0.1-next.0
7
+ - 23a68cf: Adding environment variables to override production swagger with local files.
21
8
 
22
9
  ### Patch Changes
23
10
 
24
- - Updated dependencies [813f8f3]
25
- - Updated dependencies [5152239]
26
- - @forge/manifest@3.1.0-next.0
27
- - @forge/cli-shared@2.2.1-next.0
11
+ - cf6b98b: Accept both deprecated scopes and granular scopes when verifying scopes required for Forge UI hooks.
12
+ - ab8af10: Fix unhandled error when invalid method used for Product REST API endpoint.
13
+ - 7cd92e9: Accept both deprecated scopes and granular scopes when verifying scopes required for REST product endpoints.
14
+ - c2cecf3: Accept both granular and deprecated scopes when verifying scopes required for Content Properties.
15
+ - Updated dependencies [0954b2f]
16
+ - Updated dependencies [2c77951]
17
+ - @forge/manifest@3.0.1-fix.0
18
+ - @forge/cli-shared@2.2.1-fix.0
28
19
 
29
20
  ## 2.0.0
30
21
 
package/out/lint/linters/permission-linter/permission-linter.d.ts CHANGED
@@ -32,6 +32,7 @@ export declare class PermissionLinter extends BaseLinter<ApiCall, PermissionLint
32
32
  protected getFixer(): ((errors: LintResultRule[], warnings: LintResultRule[], state: LintFixState) => Promise<LintFixState>) | undefined;
33
33
  protected addLintCriteriaMatch(apiCall: ApiCall, filepath: string): void;
34
34
  getProductPaths(cacheKey: string, url: string): Promise<SwaggerFormat>;
35
+ getProductPathsFile(url: string): Promise<SwaggerFormat>;
35
36
  private processPaths;
36
37
  }
37
38
  export {};
package/out/lint/linters/permission-linter/permission-linter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AAE/E,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,eAAe,EACf,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,WAAW,EAGZ,MAAM,aAAa,CAAC;AASrB,UAAU,aAAa;IACrB,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAKhD,eAAO,MAAM,sBAAsB,WACzB,cAAc,EAAE,YACd,cAAc,EAAE,mBACT,mBAAmB,GAAG,gCAAgC,GAAG,+BAA+B,uCAExG,GAAG,CAAC,MAAM,CAkBZ,CAAC;AAEF,eAAO,MAAM,qBAAqB,WACxB,cAAc,EAAE,YACd,cAAc,EAAE,SACnB,YAAY,KAClB,OAAO,CAAC,YAAY,CAsEtB,CAAC;AAEF,UAAU,6BAA6B;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC;IAQhE,OAAO,CAAC,QAAQ;IAPjD,MAAM,CAAC,cAAc,SAAgC;IACrD,MAAM,CAAC,oBAAoB,SAAsC;IAEjE,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAC,CAA0B;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAa;gBAEf,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAIlE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCvC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAajD,SAAS,CAAC,QAAQ,IACd,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,GACtG,SAAS;IAIb,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsB3D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWnF,OAAO,CAAC,YAAY;CAarB"}
1
+ {"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AAE/E,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,eAAe,EACf,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,WAAW,EAGZ,MAAM,aAAa,CAAC;AAUrB,UAAU,aAAa;IACrB,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAKhD,eAAO,MAAM,sBAAsB,WACzB,cAAc,EAAE,YACd,cAAc,EAAE,mBACT,mBAAmB,GAAG,gCAAgC,GAAG,+BAA+B,uCAExG,GAAG,CAAC,MAAM,CAkBZ,CAAC;AAEF,eAAO,MAAM,qBAAqB,WACxB,cAAc,EAAE,YACd,cAAc,EAAE,SACnB,YAAY,KAClB,OAAO,CAAC,YAAY,CAsEtB,CAAC;AAEF,UAAU,6BAA6B;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC;IAQhE,OAAO,CAAC,QAAQ;IAPjD,MAAM,CAAC,cAAc,SAAgC;IACrD,MAAM,CAAC,oBAAoB,SAAsC;IAEjE,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAC,CAA0B;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAa;gBAEf,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAIlE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CvC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAajD,SAAS,CAAC,QAAQ,IACd,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,GACtG,SAAS;IAIb,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsB3D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWtE,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKrE,OAAO,CAAC,YAAY;CAarB"}
package/out/lint/linters/permission-linter/permission-linter.js CHANGED
@@ -8,6 +8,7 @@ const base_linter_1 = tslib_1.__importDefault(require("../../base-linter"));
8
8
  const api_call_interface_1 = require("./api-call-interface");
9
9
  const verifiers_1 = require("./verifiers");
10
10
  const visitors_1 = require("./visitors");
11
+ const fs_1 = tslib_1.__importDefault(require("fs"));
11
12
  exports.NON_FWD_SLASH_REGEX = '[^\\/\\s]*';
12
13
  const CACHE_KEY = 'PERMISSIONS_LINTER';
13
14
  const ONE_HOUR_MS = 1000 * 60 * 60;
@@ -81,10 +82,20 @@ class PermissionLinter extends base_linter_1.default {
81
82
  }
82
83
  async bootstrap() {
83
84
  this.cache = cli_shared_1.CachedConf.getCache(CACHE_KEY);
84
- const [jira, confluence] = await Promise.all([
85
- this.getProductPaths(PermissionLinter.JIRA_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/platform/swagger-v3.v3.json'),
86
- this.getProductPaths(PermissionLinter.CONFLUENCE_CACHE_KEY, 'https://developer.atlassian.com/cloud/confluence/swagger.v3.json')
87
- ]);
85
+ const LOCAL_CONF_SWAGGER = process.env.LOCAL_CONF_SWAGGER;
86
+ const LOCAL_JIRA_SWAGGER = process.env.LOCAL_JIRA_SWAGGER;
87
+ const USE_LOCAL_SWAGGER = process.env.USE_LOCAL_SWAGGER;
88
+ let swaggerFiles;
89
+ if (USE_LOCAL_SWAGGER && LOCAL_CONF_SWAGGER && LOCAL_JIRA_SWAGGER) {
90
+ swaggerFiles = [this.getProductPathsFile(LOCAL_JIRA_SWAGGER), this.getProductPathsFile(LOCAL_CONF_SWAGGER)];
91
+ }
92
+ else {
93
+ swaggerFiles = [
94
+ this.getProductPaths(PermissionLinter.JIRA_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/platform/swagger-v3.v3.json'),
95
+ this.getProductPaths(PermissionLinter.CONFLUENCE_CACHE_KEY, 'https://developer.atlassian.com/cloud/confluence/swagger.v3.json')
96
+ ];
97
+ }
98
+ const [jira, confluence] = await Promise.all(swaggerFiles);
88
99
  this.jira = this.processPaths(jira.paths);
89
100
  this.confluence = this.processPaths(confluence.paths);
90
101
  this.nodeVisitors = [
@@ -150,6 +161,10 @@ class PermissionLinter extends base_linter_1.default {
150
161
  }
151
162
  return cached;
152
163
  }
164
+ async getProductPathsFile(url) {
165
+ const response = fs_1.default.readFileSync(url);
166
+ return JSON.parse(response.toString());
167
+ }
153
168
  processPaths(paths) {
154
169
  const pathMap = new Map();
155
170
  Object.keys(paths).forEach((path) => {
package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts CHANGED
@@ -1,10 +1,15 @@
1
1
  import { LintClass, LintResultRule } from '../../../linter-interface';
2
2
  import { BaseLintIssueVerifier, LintIssueVerifier } from '../../verifier-interface';
3
3
  import { ContentPropertyApiCall } from '../api-call-interface';
4
- export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, string[]>>;
4
+ declare type ContentPropertyPermissions = {
5
+ current: string[];
6
+ deprecated: string[];
7
+ };
8
+ export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, ContentPropertyPermissions>>;
5
9
  export declare class ContentPropertyVerifier extends BaseLintIssueVerifier implements LintIssueVerifier<ContentPropertyApiCall[]> {
6
10
  protected getLintClass(): LintClass;
7
11
  process(apiCalls: ContentPropertyApiCall[]): Promise<LintResultRule[]>;
8
12
  private getMissingScopes;
9
13
  }
14
+ export {};
10
15
  //# sourceMappingURL=content-property-verifier.d.ts.map
package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -7,24 +7,60 @@ const text_1 = require("../../../text");
7
7
  const verifier_interface_1 = require("../../verifier-interface");
8
8
  exports.CONTENT_PROPERTY_PERMISSIONS_MAP = {
9
9
  onJiraIssue: {
10
- get: ['read:jira-work'],
11
- set: ['write:jira-work'],
12
- delete: ['write:jira-work']
10
+ get: {
11
+ current: ['read:issue.property:jira'],
12
+ deprecated: ['read:jira-work']
13
+ },
14
+ set: {
15
+ current: ['write:issue.property:jira'],
16
+ deprecated: ['write:jira-work']
17
+ },
18
+ delete: {
19
+ current: ['delete:issue.property:jira'],
20
+ deprecated: ['write:jira-work']
21
+ }
13
22
  },
14
23
  onJiraProject: {
15
- get: ['read:jira-work'],
16
- set: ['manage:jira-project'],
17
- delete: ['manage:jira-project']
24
+ get: {
25
+ current: ['read:project.property:jira'],
26
+ deprecated: ['read:jira-work']
27
+ },
28
+ set: {
29
+ current: ['write:project.property:jira'],
30
+ deprecated: ['manage:jira-project']
31
+ },
32
+ delete: {
33
+ current: ['delete:project.property:jira'],
34
+ deprecated: ['manage:jira-project']
35
+ }
18
36
  },
19
37
  onConfluencePage: {
20
- get: ['read:confluence-props'],
21
- set: ['read:confluence-props', 'write:confluence-props'],
22
- delete: ['write:confluence-props']
38
+ get: {
39
+ current: ['read:content-details:confluence'],
40
+ deprecated: ['read:confluence-props']
41
+ },
42
+ set: {
43
+ current: ['read:content.property:confluence', 'write:content.property:confluence'],
44
+ deprecated: ['read:confluence-props', 'write:confluence-props']
45
+ },
46
+ delete: {
47
+ current: ['write:content.property:confluence'],
48
+ deprecated: ['write:confluence-props']
49
+ }
23
50
  },
24
51
  onConfluenceSpace: {
25
- get: ['read:confluence-props'],
26
- set: ['read:confluence-props', 'write:confluence-props'],
27
- delete: ['write:confluence-props']
52
+ get: {
53
+ current: ['read:content-details:confluence'],
54
+ deprecated: ['read:confluence-props']
55
+ },
56
+ set: {
57
+ current: ['read:space.property:confluence', 'write:space.property:confluence'],
58
+ deprecated: ['read:confluence-props', 'write:confluence-props']
59
+ },
60
+ delete: {
61
+ current: ['write:space.property:confluence'],
62
+ deprecated: ['write:confluence-props']
63
+ }
28
64
  }
29
65
  };
30
66
  class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier {
@@ -50,10 +86,24 @@ class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier
50
86
  getMissingScopes({ context, method }) {
51
87
  var _a, _b;
52
88
  const existingScopes = (_b = (_a = this.manifest) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.scopes;
53
- const requiredScopes = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method];
54
- if (!existingScopes)
55
- return requiredScopes;
56
- return requiredScopes.filter((requiredScope) => !existingScopes.includes(requiredScope));
89
+ const requiredScopesCurrent = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['current'];
90
+ const requiredScopesDeprecated = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['deprecated'];
91
+ const missingCurrentPerms = requiredScopesCurrent.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
92
+ if (missingCurrentPerms.length == 0)
93
+ return [];
94
+ let missingDeprecatedPerms = null;
95
+ if (requiredScopesDeprecated) {
96
+ missingDeprecatedPerms = requiredScopesDeprecated.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
97
+ if (missingDeprecatedPerms.length == 0)
98
+ return [];
99
+ }
100
+ if (missingCurrentPerms.length < requiredScopesCurrent.length) {
101
+ return missingCurrentPerms;
102
+ }
103
+ if (missingDeprecatedPerms && missingDeprecatedPerms.length < requiredScopesDeprecated.length) {
104
+ return missingDeprecatedPerms;
105
+ }
106
+ return requiredScopesCurrent;
57
107
  }
58
108
  }
59
109
  exports.ContentPropertyVerifier = ContentPropertyVerifier;
package/out/lint/linters/permission-linter/verifiers/product-verifier.d.ts CHANGED
@@ -27,6 +27,7 @@ export declare class ProductVerifier extends BaseLintIssueVerifier implements Li
27
27
  private lookupApiCall;
28
28
  private getMissingPermissionScopes;
29
29
  private getRequiredScopes;
30
+ private getRequiredDeprecatedScopes;
30
31
  }
31
32
  export {};
32
33
  //# sourceMappingURL=product-verifier.d.ts.map
package/out/lint/linters/permission-linter/verifiers/product-verifier.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"product-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/product-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGpF,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAE7D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,MAAM,EAAE,MAAM,GAAG;QAChB,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC1B,2BAA2B,CAAC,EAAE,qBAAqB,EAAE,CAAC;KACvD,CAAC;CACH;AAED,UAAU,aAAa;IACrB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC9B;AAED,oBAAY,uBAAuB,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEjE,qBAAa,eAAgB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,OAAO,EAAE,CAAC;IAI9F,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHxB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EACD,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,MAAM;IAKlC,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAoC3E,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,iBAAiB;CAoB1B"}
1
+ {"version":3,"file":"product-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/product-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGpF,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAE7D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,MAAM,EAAE,MAAM,GAAG;QAChB,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC1B,2BAA2B,CAAC,EAAE,qBAAqB,EAAE,CAAC;KACvD,CAAC;CACH;AAED,UAAU,aAAa;IACrB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC9B;AAED,oBAAY,uBAAuB,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEjE,qBAAa,eAAgB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,OAAO,EAAE,CAAC;IAI9F,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHxB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EACD,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,MAAM;IAKlC,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAoC3E,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,0BAA0B;IA8BlC,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,2BAA2B;CAWpC"}
package/out/lint/linters/permission-linter/verifiers/product-verifier.js CHANGED
@@ -53,24 +53,46 @@ class ProductVerifier extends verifier_interface_1.BaseLintIssueVerifier {
53
53
  }
54
54
  getMissingPermissionScopes(apiCall) {
55
55
  var _a, _b, _c;
56
- const requiredScopes = this.getRequiredScopes(apiCall);
56
+ const currentScopes = this.getRequiredScopes(apiCall);
57
+ const deprecatedScopes = this.getRequiredDeprecatedScopes(apiCall);
57
58
  if (!((_c = (_b = (_a = this.manifest) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.scopes) === null || _c === void 0 ? void 0 : _c.length)) {
58
- return requiredScopes;
59
+ return currentScopes;
59
60
  }
60
- return requiredScopes.filter((scope) => { 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(scope)); });
61
+ const missingCurrentScopes = currentScopes.filter((scope) => { 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(scope)); });
62
+ if (!missingCurrentScopes.length)
63
+ return [];
64
+ const missingDeprecatedScopes = deprecatedScopes.filter((scope) => { 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(scope)); });
65
+ if (deprecatedScopes.length && !missingDeprecatedScopes.length)
66
+ return [];
67
+ if (missingCurrentScopes.length < currentScopes.length) {
68
+ return missingCurrentScopes;
69
+ }
70
+ if (missingDeprecatedScopes.length < deprecatedScopes.length) {
71
+ return missingDeprecatedScopes;
72
+ }
73
+ return missingCurrentScopes;
61
74
  }
62
75
  getRequiredScopes({ regex, method }) {
63
- var _a, _b, _c;
76
+ var _a, _b, _c, _d;
64
77
  if (!regex)
65
78
  return [];
66
- const oAuth2Scopes = (_a = this.pathMap.get(regex)) === null || _a === void 0 ? void 0 : _a.methods[method]['x-atlassian-oauth2-scopes'];
79
+ const oAuth2Scopes = (_b = (_a = this.pathMap.get(regex)) === null || _a === void 0 ? void 0 : _a.methods[method]) === null || _b === void 0 ? void 0 : _b['x-atlassian-oauth2-scopes'];
67
80
  if (oAuth2Scopes) {
68
81
  return array_prototype_flatmap_1.default(oAuth2Scopes.filter((scope) => scope.state === 'Current').map((scope) => scope.scopes), (x) => x);
69
82
  }
70
- const swaggerEntries = (_c = (_b = this.pathMap.get(regex)) === null || _b === void 0 ? void 0 : _b.methods[method]) === null || _c === void 0 ? void 0 : _c.security;
83
+ const swaggerEntries = (_d = (_c = this.pathMap.get(regex)) === null || _c === void 0 ? void 0 : _c.methods[method]) === null || _d === void 0 ? void 0 : _d.security;
71
84
  if (!swaggerEntries)
72
85
  return [];
73
86
  return swaggerEntries === null || swaggerEntries === void 0 ? void 0 : swaggerEntries.reduce((prev, curr) => [...prev, ...(curr['OAuth2'] || []), ...(curr['oAuthDefinitions'] || [])], []);
74
87
  }
88
+ getRequiredDeprecatedScopes({ regex, method }) {
89
+ var _a, _b;
90
+ if (!regex)
91
+ return [];
92
+ const oAuth2Scopes = (_b = (_a = this.pathMap.get(regex)) === null || _a === void 0 ? void 0 : _a.methods[method]) === null || _b === void 0 ? void 0 : _b['x-atlassian-oauth2-scopes'];
93
+ if (!oAuth2Scopes)
94
+ return [];
95
+ return array_prototype_flatmap_1.default(oAuth2Scopes.filter((scope) => scope.state === 'Deprecated').map((scope) => scope.scopes), (x) => x);
96
+ }
75
97
  }
76
98
  exports.ProductVerifier = ProductVerifier;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/lint",
3
- "version": "2.0.1-next.2",
3
+ "version": "2.1.0-fix.0",
4
4
  "description": "Linting for forge apps",
5
5
  "main": "out/index.js",
6
6
  "license": "UNLICENSED",
@@ -15,9 +15,9 @@
15
15
  "@types/node-fetch": "^2.5.7"
16
16
  },
17
17
  "dependencies": {
18
- "@forge/cli-shared": "2.2.1-next.2",
18
+ "@forge/cli-shared": "2.2.1-fix.0",
19
19
  "@forge/csp": "1.9.0",
20
- "@forge/manifest": "3.1.0-next.2",
20
+ "@forge/manifest": "3.0.1-fix.0",
21
21
  "@typescript-eslint/typescript-estree": "^3.5.0",
22
22
  "cross-spawn": "^7.0.1",
23
23
  "node-fetch": "^2.6.1",