@redocly/cli 2.1.2 → 2.1.3

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.
@@ -1,6 +1,7 @@
1
1
  export declare class RedoclyOAuthClient {
2
- static readonly CREDENTIALS_FILE = "credentials";
3
- private readonly dir;
2
+ readonly credentialsFolderPath: string;
3
+ readonly credentialsFilePath: string;
4
+ readonly credentialsFileName: string;
4
5
  private readonly key;
5
6
  private readonly iv;
6
7
  constructor();
@@ -8,7 +9,6 @@ export declare class RedoclyOAuthClient {
8
9
  logout(): Promise<void>;
9
10
  isAuthorized(reuniteUrl: string, apiKey?: string): Promise<boolean>;
10
11
  getAccessToken: (reuniteUrl: string) => Promise<string | null>;
11
- private get credentialsPath();
12
12
  private saveCredentials;
13
13
  private readCredentials;
14
14
  private removeCredentials;
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-client.d.ts","sourceRoot":"","sources":["../../src/auth/oauth-client.ts"],"names":[],"mappings":"AAWA,qBAAa,kBAAkB;IAC7B,gBAAuB,gBAAgB,iBAAiB;IAExD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAS;;IAYf,KAAK,CAAC,OAAO,EAAE,MAAM;IAUrB,MAAM;IAQN,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWzE,cAAc,eAAsB,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsBxE;IAEF,OAAO,KAAK,eAAe,GAE1B;YAEa,eAAe;YASf,eAAe;YAaf,iBAAiB;IAM/B,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,kBAAkB;CAS3B"}
1
+ {"version":3,"file":"oauth-client.d.ts","sourceRoot":"","sources":["../../src/auth/oauth-client.ts"],"names":[],"mappings":"AAWA,qBAAa,kBAAkB;IAC7B,SAAgB,qBAAqB,EAAE,MAAM,CAAC;IAC9C,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAC5C,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAE5C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAS;;IAef,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrC,MAAM;IAQN,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWzE,cAAc,eAAsB,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsBxE;YAEY,eAAe;YASf,eAAe;YAaf,iBAAiB;IAM/B,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,kBAAkB;CAS3B"}
@@ -5,7 +5,7 @@ import crypto from 'node:crypto';
5
5
  import { Buffer } from 'node:buffer';
6
6
  import { logger } from '@redocly/openapi-core';
7
7
  import { RedoclyOAuthDeviceFlow } from './device-flow.js';
8
- const SALT = '4618dbc9-8aed-4e27-aaf0-225f4603e5a4';
8
+ const CREDENTIAL_SALT = '4618dbc9-8aed-4e27-aaf0-225f4603e5a4';
9
9
  const CRYPTO_ALGORITHM = 'aes-256-cbc';
10
10
  export class RedoclyOAuthClient {
11
11
  constructor() {
@@ -29,10 +29,12 @@ export class RedoclyOAuthClient {
29
29
  }
30
30
  };
31
31
  const homeDirPath = homedir();
32
- this.dir = path.join(homeDirPath, '.redocly');
33
- mkdirSync(this.dir, { recursive: true });
34
- this.key = crypto.createHash('sha256').update(`${homeDirPath}${SALT}`).digest(); // 32-byte key
35
- this.iv = crypto.createHash('md5').update(homeDirPath).digest(); // 16-byte IV
32
+ this.credentialsFolderPath = path.join(homeDirPath, '.redocly');
33
+ this.credentialsFileName = 'credentials';
34
+ this.credentialsFilePath = path.join(this.credentialsFolderPath, this.credentialsFileName);
35
+ this.key = crypto.createHash('sha256').update(`${homeDirPath}${CREDENTIAL_SALT}`).digest();
36
+ this.iv = crypto.createHash('md5').update(homeDirPath).digest();
37
+ mkdirSync(this.credentialsFolderPath, { recursive: true });
36
38
  }
37
39
  async login(baseUrl) {
38
40
  const deviceFlow = new RedoclyOAuthDeviceFlow(baseUrl);
@@ -58,24 +60,21 @@ export class RedoclyOAuthClient {
58
60
  const accessToken = await this.getAccessToken(reuniteUrl);
59
61
  return Boolean(accessToken);
60
62
  }
61
- get credentialsPath() {
62
- return path.join(this.dir, RedoclyOAuthClient.CREDENTIALS_FILE);
63
- }
64
63
  async saveCredentials(credentials) {
65
64
  try {
66
65
  const encryptedCredentials = this.encryptCredentials(credentials);
67
- writeFileSync(this.credentialsPath, encryptedCredentials, 'utf8');
66
+ writeFileSync(this.credentialsFilePath, encryptedCredentials, 'utf8');
68
67
  }
69
68
  catch (error) {
70
69
  logger.error(`Failed to save credentials: ${error.message}`);
71
70
  }
72
71
  }
73
72
  async readCredentials() {
74
- if (!existsSync(this.credentialsPath)) {
73
+ if (!existsSync(this.credentialsFilePath)) {
75
74
  return null;
76
75
  }
77
76
  try {
78
- const encryptedCredentials = readFileSync(this.credentialsPath, 'utf8');
77
+ const encryptedCredentials = readFileSync(this.credentialsFilePath, 'utf8');
79
78
  return this.decryptCredentials(encryptedCredentials);
80
79
  }
81
80
  catch {
@@ -83,8 +82,8 @@ export class RedoclyOAuthClient {
83
82
  }
84
83
  }
85
84
  async removeCredentials() {
86
- if (existsSync(this.credentialsPath)) {
87
- rmSync(this.credentialsPath);
85
+ if (existsSync(this.credentialsFilePath)) {
86
+ rmSync(this.credentialsFilePath);
88
87
  }
89
88
  }
90
89
  encryptCredentials(credentials) {
@@ -104,5 +103,4 @@ export class RedoclyOAuthClient {
104
103
  return JSON.parse(decrypted.toString('utf8'));
105
104
  }
106
105
  }
107
- RedoclyOAuthClient.CREDENTIALS_FILE = 'credentials';
108
106
  //# sourceMappingURL=oauth-client.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-client.js","sourceRoot":"","sources":["../../src/auth/oauth-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth-client.js","sourceRoot":"","sources":["../../src/auth/oauth-client.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,8 @@ export declare const REUNITE_URLS: {
4
4
  readonly eu: "https://app.cloud.eu.redocly.com";
5
5
  };
6
6
  export declare function getDomain(): string;
7
- export declare function getReuniteUrl(config: Config | undefined, residencyOption?: string): string;
7
+ export declare const getReuniteUrl: (config: Config | undefined, residencyOption?: string | undefined) => string;
8
+ export declare class InvalidReuniteUrlError extends Error {
9
+ constructor();
10
+ }
8
11
  //# sourceMappingURL=domains.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"domains.d.ts","sourceRoot":"","sources":["../../../src/reunite/api/domains.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAoB1F"}
1
+ {"version":3,"file":"domains.d.ts","sourceRoot":"","sources":["../../../src/reunite/api/domains.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,eAAO,MAAM,aAAa,8EAsBzB,CAAC;AAcF,qBAAa,sBAAuB,SAAQ,KAAK;;CAIhD"}
@@ -5,7 +5,7 @@ export const REUNITE_URLS = {
5
5
  export function getDomain() {
6
6
  return process.env.REDOCLY_DOMAIN || REUNITE_URLS.us;
7
7
  }
8
- export function getReuniteUrl(config, residencyOption) {
8
+ export const getReuniteUrl = withHttpsValidation((config, residencyOption) => {
9
9
  try {
10
10
  const residency = residencyOption || config?.resolvedConfig.residency;
11
11
  if (isLegacyResidency(residency)) {
@@ -14,13 +14,27 @@ export function getReuniteUrl(config, residencyOption) {
14
14
  if (residency) {
15
15
  return new URL(residency).origin;
16
16
  }
17
- if (config?.resolvedConfig.reunite?.projectUrl) {
18
- return new URL(config.resolvedConfig.reunite.projectUrl).origin;
17
+ if (config?.resolvedConfig.scorecard?.fromProjectUrl) {
18
+ return new URL(config.resolvedConfig.scorecard.fromProjectUrl).origin;
19
19
  }
20
20
  return REUNITE_URLS.us;
21
21
  }
22
22
  catch {
23
- throw new Error('Invalid Reunite URL');
23
+ throw new InvalidReuniteUrlError();
24
+ }
25
+ });
26
+ function withHttpsValidation(fn) {
27
+ return (...args) => {
28
+ const url = fn(...args);
29
+ if (!url.startsWith('https://')) {
30
+ throw new InvalidReuniteUrlError();
31
+ }
32
+ return url;
33
+ };
34
+ }
35
+ export class InvalidReuniteUrlError extends Error {
36
+ constructor() {
37
+ super('Invalid Reunite URL');
24
38
  }
25
39
  }
26
40
  function isLegacyResidency(value) {
@@ -1 +1 @@
1
- {"version":3,"file":"domains.js","sourceRoot":"","sources":["../../../src/reunite/api/domains.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,EAAE,EAAE,+BAA+B;IACnC,EAAE,EAAE,kCAAkC;CAC9B,CAAC;AAEX,MAAM,UAAU,SAAS;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,YAAY,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAA0B,EAAE,eAAwB;IAChF,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,eAAe,IAAI,MAAM,EAAE,cAAc,CAAC,SAAS,CAAC;QAEtE,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QACnC,CAAC;QAED,IAAI,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;YAC/C,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;QAClE,CAAC;QAED,OAAO,YAAY,CAAC,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,YAAY,CAAC;AAC5D,CAAC"}
1
+ {"version":3,"file":"domains.js","sourceRoot":"","sources":["../../../src/reunite/api/domains.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,EAAE,EAAE,+BAA+B;IACnC,EAAE,EAAE,kCAAkC;CAC9B,CAAC;AAEX,MAAM,UAAU,SAAS;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,YAAY,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAC9C,CAAC,MAA0B,EAAE,eAAwB,EAAU,EAAE;IAC/D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,eAAe,IAAI,MAAM,EAAE,cAAc,CAAC,SAAS,CAAC;QAEtE,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QACnC,CAAC;QAED,IAAI,MAAM,EAAE,cAAc,CAAC,SAAS,EAAE,cAAc,EAAE,CAAC;YACrD,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;QACxE,CAAC;QAED,OAAO,YAAY,CAAC,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,sBAAsB,EAAE,CAAC;IACrC,CAAC;AACH,CAAC,CACF,CAAC;AAEF,SAAS,mBAAmB,CAAwC,EAAM;IACxE,OAAO,CAAC,GAAG,IAAoB,EAAE,EAAE;QACjC,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,sBAAsB,EAAE,CAAC;QACrC,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC/C;QACE,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC/B,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,YAAY,CAAC;AAC5D,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redocly/cli",
3
- "version": "2.1.2",
3
+ "version": "2.1.3",
4
4
  "description": "",
5
5
  "license": "MIT",
6
6
  "bin": {
@@ -42,8 +42,8 @@
42
42
  "@opentelemetry/resources": "2.0.1",
43
43
  "@opentelemetry/sdk-trace-node": "2.0.1",
44
44
  "@opentelemetry/semantic-conventions": "1.34.0",
45
- "@redocly/openapi-core": "2.1.2",
46
- "@redocly/respect-core": "2.1.2",
45
+ "@redocly/openapi-core": "2.1.3",
46
+ "@redocly/respect-core": "2.1.3",
47
47
  "abort-controller": "^3.0.0",
48
48
  "chokidar": "^3.5.1",
49
49
  "colorette": "^1.2.0",
@@ -62,7 +62,7 @@
62
62
  "set-cookie-parser": "^2.3.5",
63
63
  "simple-websocket": "^9.0.0",
64
64
  "styled-components": "^6.0.7",
65
- "undici": "^6.21.1",
65
+ "undici": "^6.21.3",
66
66
  "yargs": "17.0.1"
67
67
  },
68
68
  "devDependencies": {