@teambit/cloud 0.0.501 → 0.0.502

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,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="0" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.cloud/cloud@0.0.501" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.cloud/cloud@0.0.502" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
@@ -7634,7 +7634,7 @@
7634
7634
  "componentId": {
7635
7635
  "scope": "teambit.cloud",
7636
7636
  "name": "cloud",
7637
- "version": "0.0.501"
7637
+ "version": "0.0.502"
7638
7638
  },
7639
7639
  "taggedModuleExports": []
7640
7640
  }
@@ -13,13 +13,14 @@ export declare class LoginCmd implements Command {
13
13
  private port?;
14
14
  constructor(cloud: CloudMain, _port?: number);
15
15
  report([]: Iterable<any>, // eslint-disable-line no-empty-pattern
16
- { cloudDomain, port, suppressBrowserLaunch, noBrowser, machineName, skipConfigUpdate, }: {
16
+ { cloudDomain, port, suppressBrowserLaunch, noBrowser, machineName, skipConfigUpdate, refreshToken, }: {
17
17
  cloudDomain?: string;
18
18
  port: string;
19
19
  suppressBrowserLaunch?: boolean;
20
20
  noBrowser?: boolean;
21
21
  machineName?: string;
22
22
  skipConfigUpdate?: boolean;
23
+ refreshToken?: boolean;
23
24
  }): Promise<string>;
24
25
  json([]: Iterable<any>, // eslint-disable-line no-empty-pattern,
25
26
  { cloudDomain, port, suppressBrowserLaunch, noBrowser, machineName, skipConfigUpdate, }: {
package/dist/login.cmd.js CHANGED
@@ -29,7 +29,7 @@ class LoginCmd {
29
29
  _defineProperty(this, "description", 'log in to Bit cloud');
30
30
  _defineProperty(this, "group", 'general');
31
31
  _defineProperty(this, "alias", '');
32
- _defineProperty(this, "options", [['', 'skip-config-update', 'skip writing to the .npmrc file'], ['d', 'cloud-domain <domain>', 'login cloud domain (default bit.cloud)'], ['p', 'port <port>', 'port number to open for localhost server (default 8085)'], ['', 'no-browser', 'do not open a browser for authentication'], ['', 'machine-name <name>', 'specify machine-name to pair with the token (useful for CI to avoid accidentally revoking the token)'], ['', 'suppress-browser-launch', 'DEPRECATE. use --no-browser instead']]);
32
+ _defineProperty(this, "options", [['', 'skip-config-update', 'skip writing to the .npmrc file'], ['', 'refresh-token', 'force refresh token even when logged in'], ['d', 'cloud-domain <domain>', 'login cloud domain (default bit.cloud)'], ['p', 'port <port>', 'port number to open for localhost server (default 8085)'], ['', 'no-browser', 'do not open a browser for authentication'], ['', 'machine-name <name>', 'specify machine-name to pair with the token (useful for CI to avoid accidentally revoking the token)'], ['', 'suppress-browser-launch', 'DEPRECATE. use --no-browser instead']]);
33
33
  _defineProperty(this, "loader", true);
34
34
  _defineProperty(this, "remoteOp", true);
35
35
  _defineProperty(this, "skipWorkspace", true);
@@ -44,12 +44,28 @@ class LoginCmd {
44
44
  suppressBrowserLaunch,
45
45
  noBrowser,
46
46
  machineName,
47
- skipConfigUpdate
47
+ skipConfigUpdate,
48
+ refreshToken
48
49
  }) {
49
50
  noBrowser = noBrowser || suppressBrowserLaunch;
51
+ if (refreshToken) {
52
+ this.cloud.logout();
53
+ }
54
+ const isLoggedIn = this.cloud.isLoggedIn();
55
+ if (isLoggedIn) {
56
+ this.cloud.logger.clearStatusLine();
57
+ const reLoginPrompt = _chalk().default.yellow('You are already logged in. Do you want to re-login to refresh your access token? [yes(y)/no(n)]');
58
+ const ok = await (0, _yesno().default)({
59
+ question: reLoginPrompt
60
+ });
61
+ if (!ok) {
62
+ return _chalk().default.green(`Logged in as ${this.cloud.getUsername()}`);
63
+ }
64
+ this.cloud.logout();
65
+ }
50
66
  const result = await this.cloud.login(port || this.port, noBrowser, machineName, cloudDomain, undefined, skipConfigUpdate);
51
67
  let message = _chalk().default.green(`Logged in as ${result?.username}`);
52
- if (result?.isAlreadyLoggedIn || skipConfigUpdate) {
68
+ if (skipConfigUpdate) {
53
69
  return message;
54
70
  }
55
71
  const conflicts = result?.npmrcUpdateResult?.conflicts;
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_yesno","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","r","e","Symbol","toPrimitive","call","TypeError","String","Number","LoginCmd","constructor","cloud","_port","port","toString","report","cloudDomain","suppressBrowserLaunch","noBrowser","machineName","skipConfigUpdate","result","login","undefined","message","chalk","green","username","isAlreadyLoggedIn","conflicts","npmrcUpdateResult","length","handleNpmrcConflicts","getNpmrcUpdateMessage","error","json","token","successfullyUpdatedNpmrc","configUpdates","logger","clearStatusLine","conflictDetails","map","conflict","index","yellow","red","original","modifications","join","question","ok","yesno","generateNpmrc","force","bold","exports"],"sources":["login.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport yesno from 'yesno';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { CloudMain } from './cloud.main.runtime';\n\nexport class LoginCmd implements Command {\n name = 'login';\n description = 'log in to Bit cloud';\n group = 'general';\n alias = '';\n options = [\n ['', 'skip-config-update', 'skip writing to the .npmrc file'],\n ['d', 'cloud-domain <domain>', 'login cloud domain (default bit.cloud)'],\n ['p', 'port <port>', 'port number to open for localhost server (default 8085)'],\n ['', 'no-browser', 'do not open a browser for authentication'],\n [\n '',\n 'machine-name <name>',\n 'specify machine-name to pair with the token (useful for CI to avoid accidentally revoking the token)',\n ],\n ['', 'suppress-browser-launch', 'DEPRECATE. use --no-browser instead'],\n ] as CommandOptions;\n loader = true;\n remoteOp = true;\n skipWorkspace = true;\n\n private port?: string;\n\n constructor(private cloud: CloudMain, _port?: number) {\n this.port = _port?.toString();\n }\n\n async report(\n [], // eslint-disable-line no-empty-pattern\n {\n cloudDomain,\n port,\n suppressBrowserLaunch,\n noBrowser,\n machineName,\n skipConfigUpdate,\n }: {\n cloudDomain?: string;\n port: string;\n suppressBrowserLaunch?: boolean;\n noBrowser?: boolean;\n machineName?: string;\n skipConfigUpdate?: boolean;\n }\n ): Promise<string> {\n noBrowser = noBrowser || suppressBrowserLaunch;\n\n const result = await this.cloud.login(\n port || this.port,\n noBrowser,\n machineName,\n cloudDomain,\n undefined,\n skipConfigUpdate\n );\n let message = chalk.green(`Logged in as ${result?.username}`);\n\n if (result?.isAlreadyLoggedIn || skipConfigUpdate) {\n return message;\n }\n\n const conflicts = result?.npmrcUpdateResult?.conflicts;\n if (conflicts && conflicts.length > 0) {\n message += await this.handleNpmrcConflicts(conflicts);\n } else {\n message += this.getNpmrcUpdateMessage(result?.npmrcUpdateResult?.error);\n }\n\n return message;\n }\n\n async json(\n [], // eslint-disable-line no-empty-pattern,\n {\n cloudDomain,\n port,\n suppressBrowserLaunch,\n noBrowser,\n machineName,\n skipConfigUpdate,\n }: {\n cloudDomain?: string;\n port: string;\n suppressBrowserLaunch?: boolean;\n noBrowser?: boolean;\n machineName?: string;\n skipConfigUpdate?: boolean;\n }\n ): Promise<{ username?: string; token?: string; successfullyUpdatedNpmrc?: boolean }> {\n if (suppressBrowserLaunch) {\n noBrowser = true;\n }\n const result = await this.cloud.login(port, noBrowser, machineName, cloudDomain, undefined, skipConfigUpdate);\n return {\n username: result?.username,\n token: result?.token,\n successfullyUpdatedNpmrc: !!result?.npmrcUpdateResult?.configUpdates,\n };\n }\n\n async handleNpmrcConflicts(conflicts): Promise<string> {\n this.cloud.logger.clearStatusLine();\n const conflictDetails = conflicts\n .map(\n (conflict, index) =>\n `${chalk.yellow(`Conflict #${index + 1}:`)}\nOriginal: ${chalk.red(conflict.original)}\nModification: ${chalk.green(conflict.modifications)}`\n )\n .join('\\n\\n');\n\n const question = `\\n${chalk.yellow(\n 'Conflict detected in .npmrc file with the following configurations:'\n )}\\n${conflictDetails}\\n${chalk.yellow(\n 'Do you want to override these configurations and continue? [yes(y)/no(n)]'\n )}`;\n\n const ok = await yesno({ question });\n if (!ok) {\n return chalk.red(' but updating .npmrc was aborted due to conflicts.');\n }\n\n try {\n await this.cloud.generateNpmrc({ force: true });\n return chalk.green(' and .npmrc updated successfully after resolving conflicts.');\n } catch (e) {\n return `${chalk.red(' but failed to update .npmrc after resolving conflicts.')} Visit ${chalk.bold(\n 'https://bit.dev/reference/packages/npmrc'\n )} for instructions on how to update it manually.`;\n }\n }\n\n getNpmrcUpdateMessage(error): string {\n if (!error) {\n return chalk.green(' and .npmrc updated.');\n }\n return chalk.red(\n ` but failed to update .npmrc. Visit ${chalk.bold(\n 'https://bit.dev/reference/packages/npmrc'\n )} for instructions on how to update it manually.`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_yesno","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","r","e","Symbol","toPrimitive","call","TypeError","String","Number","LoginCmd","constructor","cloud","_port","port","toString","report","cloudDomain","suppressBrowserLaunch","noBrowser","machineName","skipConfigUpdate","refreshToken","logout","isLoggedIn","logger","clearStatusLine","reLoginPrompt","chalk","yellow","ok","yesno","question","green","getUsername","result","login","undefined","message","username","conflicts","npmrcUpdateResult","length","handleNpmrcConflicts","getNpmrcUpdateMessage","error","json","token","successfullyUpdatedNpmrc","configUpdates","conflictDetails","map","conflict","index","red","original","modifications","join","generateNpmrc","force","bold","exports"],"sources":["login.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport yesno from 'yesno';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { CloudMain } from './cloud.main.runtime';\n\nexport class LoginCmd implements Command {\n name = 'login';\n description = 'log in to Bit cloud';\n group = 'general';\n alias = '';\n options = [\n ['', 'skip-config-update', 'skip writing to the .npmrc file'],\n ['', 'refresh-token', 'force refresh token even when logged in'],\n ['d', 'cloud-domain <domain>', 'login cloud domain (default bit.cloud)'],\n ['p', 'port <port>', 'port number to open for localhost server (default 8085)'],\n ['', 'no-browser', 'do not open a browser for authentication'],\n [\n '',\n 'machine-name <name>',\n 'specify machine-name to pair with the token (useful for CI to avoid accidentally revoking the token)',\n ],\n ['', 'suppress-browser-launch', 'DEPRECATE. use --no-browser instead'],\n ] as CommandOptions;\n loader = true;\n remoteOp = true;\n skipWorkspace = true;\n\n private port?: string;\n\n constructor(private cloud: CloudMain, _port?: number) {\n this.port = _port?.toString();\n }\n\n async report(\n [], // eslint-disable-line no-empty-pattern\n {\n cloudDomain,\n port,\n suppressBrowserLaunch,\n noBrowser,\n machineName,\n skipConfigUpdate,\n refreshToken,\n }: {\n cloudDomain?: string;\n port: string;\n suppressBrowserLaunch?: boolean;\n noBrowser?: boolean;\n machineName?: string;\n skipConfigUpdate?: boolean;\n refreshToken?: boolean;\n }\n ): Promise<string> {\n noBrowser = noBrowser || suppressBrowserLaunch;\n\n if (refreshToken) {\n this.cloud.logout();\n }\n\n const isLoggedIn = this.cloud.isLoggedIn();\n\n if (isLoggedIn) {\n this.cloud.logger.clearStatusLine();\n const reLoginPrompt = chalk.yellow(\n 'You are already logged in. Do you want to re-login to refresh your access token? [yes(y)/no(n)]'\n );\n const ok = await yesno({ question: reLoginPrompt });\n if (!ok) {\n return chalk.green(`Logged in as ${this.cloud.getUsername()}`);\n }\n this.cloud.logout();\n }\n\n const result = await this.cloud.login(\n port || this.port,\n noBrowser,\n machineName,\n cloudDomain,\n undefined,\n skipConfigUpdate\n );\n\n let message = chalk.green(`Logged in as ${result?.username}`);\n\n if (skipConfigUpdate) {\n return message;\n }\n\n const conflicts = result?.npmrcUpdateResult?.conflicts;\n if (conflicts && conflicts.length > 0) {\n message += await this.handleNpmrcConflicts(conflicts);\n } else {\n message += this.getNpmrcUpdateMessage(result?.npmrcUpdateResult?.error);\n }\n\n return message;\n }\n\n async json(\n [], // eslint-disable-line no-empty-pattern,\n {\n cloudDomain,\n port,\n suppressBrowserLaunch,\n noBrowser,\n machineName,\n skipConfigUpdate,\n }: {\n cloudDomain?: string;\n port: string;\n suppressBrowserLaunch?: boolean;\n noBrowser?: boolean;\n machineName?: string;\n skipConfigUpdate?: boolean;\n }\n ): Promise<{ username?: string; token?: string; successfullyUpdatedNpmrc?: boolean }> {\n if (suppressBrowserLaunch) {\n noBrowser = true;\n }\n const result = await this.cloud.login(port, noBrowser, machineName, cloudDomain, undefined, skipConfigUpdate);\n return {\n username: result?.username,\n token: result?.token,\n successfullyUpdatedNpmrc: !!result?.npmrcUpdateResult?.configUpdates,\n };\n }\n\n async handleNpmrcConflicts(conflicts): Promise<string> {\n this.cloud.logger.clearStatusLine();\n const conflictDetails = conflicts\n .map(\n (conflict, index) =>\n `${chalk.yellow(`Conflict #${index + 1}:`)}\nOriginal: ${chalk.red(conflict.original)}\nModification: ${chalk.green(conflict.modifications)}`\n )\n .join('\\n\\n');\n\n const question = `\\n${chalk.yellow(\n 'Conflict detected in .npmrc file with the following configurations:'\n )}\\n${conflictDetails}\\n${chalk.yellow(\n 'Do you want to override these configurations and continue? [yes(y)/no(n)]'\n )}`;\n\n const ok = await yesno({ question });\n if (!ok) {\n return chalk.red(' but updating .npmrc was aborted due to conflicts.');\n }\n\n try {\n await this.cloud.generateNpmrc({ force: true });\n return chalk.green(' and .npmrc updated successfully after resolving conflicts.');\n } catch (e) {\n return `${chalk.red(' but failed to update .npmrc after resolving conflicts.')} Visit ${chalk.bold(\n 'https://bit.dev/reference/packages/npmrc'\n )} for instructions on how to update it manually.`;\n }\n }\n\n getNpmrcUpdateMessage(error): string {\n if (!error) {\n return chalk.green(' and .npmrc updated.');\n }\n return chalk.red(\n ` but failed to update .npmrc. Visit ${chalk.bold(\n 'https://bit.dev/reference/packages/npmrc'\n )} for instructions on how to update it manually.`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/cloud",
3
- "version": "0.0.501",
3
+ "version": "0.0.502",
4
4
  "homepage": "https://bit.cloud/teambit/cloud/cloud",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.cloud",
8
8
  "name": "cloud",
9
- "version": "0.0.501"
9
+ "version": "0.0.502"
10
10
  },
11
11
  "dependencies": {
12
12
  "graphql-tag": "2.12.1",
@@ -20,19 +20,19 @@
20
20
  "@teambit/scopes.scope-descriptor": "0.0.24",
21
21
  "@teambit/scopes.scope-id": "0.0.7",
22
22
  "@teambit/design.controls.menu": "0.0.1",
23
- "@teambit/graphql": "1.0.225",
23
+ "@teambit/graphql": "1.0.226",
24
24
  "@teambit/cli": "0.0.859",
25
25
  "@teambit/cloud.models.cloud-scope": "0.0.3",
26
26
  "@teambit/cloud.models.cloud-user": "0.0.5",
27
27
  "@teambit/express": "0.0.958",
28
28
  "@teambit/global-config": "0.0.862",
29
29
  "@teambit/logger": "0.0.952",
30
- "@teambit/scope": "1.0.225",
31
- "@teambit/ui": "1.0.225",
32
- "@teambit/workspace": "1.0.225",
30
+ "@teambit/scope": "1.0.226",
31
+ "@teambit/ui": "1.0.226",
32
+ "@teambit/workspace": "1.0.226",
33
33
  "@teambit/cloud.ui.user-bar": "0.0.7",
34
- "@teambit/component": "1.0.225",
35
- "@teambit/lanes": "1.0.225"
34
+ "@teambit/component": "1.0.226",
35
+ "@teambit/lanes": "1.0.226"
36
36
  },
37
37
  "devDependencies": {
38
38
  "@types/express": "4.17.13",