@salesforce/plugin-auth 3.3.27 → 3.4.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 (6) hide show
  1. package/lib/common.js +11 -11
  2. package/lib/common.js.map +1 -1
  3. package/npm-shrinkwrap.json +1704 -4646
  4. package/oclif.lock +1096 -2847
  5. package/oclif.manifest.json +1 -1
  6. package/package.json +8 -8
package/lib/common.js CHANGED
@@ -12,27 +12,27 @@ Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
12
12
  const messages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
13
13
  const resolveLoginUrl = async (instanceUrl) => {
14
14
  const logger = await Logger.child('Common', { tag: 'resolveLoginUrl' });
15
- if (instanceUrl) {
16
- throwIfLightning(instanceUrl);
17
- return instanceUrl;
18
- }
19
- let loginUrl;
15
+ const loginUrl = instanceUrl ?? (await getLoginUrl(logger));
16
+ throwIfLightning(loginUrl);
17
+ logger.debug(`loginUrl: ${loginUrl}`);
18
+ return loginUrl;
19
+ };
20
+ /** try to get url from project if there is one, otherwise use the default production URL */
21
+ const getLoginUrl = async (logger) => {
20
22
  try {
21
23
  const project = await SfProject.resolve();
22
24
  const projectJson = await project.resolveProjectConfig();
23
- loginUrl = getString(projectJson, 'sfdcLoginUrl', SfdcUrl.PRODUCTION);
25
+ return getString(projectJson, 'sfdcLoginUrl', SfdcUrl.PRODUCTION);
24
26
  }
25
27
  catch (err) {
26
28
  const message = (isObject(err) ? Reflect.get(err, 'message') ?? err : err);
27
29
  logger.debug(`error occurred while trying to determine loginUrl: ${message}`);
28
- loginUrl = SfdcUrl.PRODUCTION;
30
+ return SfdcUrl.PRODUCTION;
29
31
  }
30
- throwIfLightning(loginUrl);
31
- logger.debug(`loginUrl: ${loginUrl}`);
32
- return loginUrl;
33
32
  };
34
33
  const throwIfLightning = (urlString) => {
35
- if (urlString?.match(/\.lightning\..*force\.com/)) {
34
+ const url = new SfdcUrl(urlString);
35
+ if (url.isLightningDomain() || (url.isInternalUrl() && url.origin.includes('.lightning.'))) {
36
36
  throw new SfError(messages.getMessage('lightningInstanceUrl'), 'LightningDomain', [
37
37
  messages.getMessage('flags.instance-url.description'),
38
38
  ]);
package/lib/common.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAE9E,MAAM,eAAe,GAAG,KAAK,EAAE,WAAoB,EAAmB,EAAE;IACtE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACxE,IAAI,WAAW,EAAE,CAAC;QAChB,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9B,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAC;QACzD,QAAQ,GAAG,SAAS,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACxE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAW,CAAC;QAC7F,MAAM,CAAC,KAAK,CAAC,sDAAsD,OAAO,EAAE,CAAC,CAAC;QAC9E,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAChC,CAAC;IACD,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE3B,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;IACtC,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,SAAkB,EAAQ,EAAE;IACpD,IAAI,SAAS,EAAE,KAAK,CAAC,2BAA2B,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,iBAAiB,EAAE;YAChF,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,EAAE,QAAkB,EAAoB,EAAE,CACvE,OAAO,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,kBAAkB,EAAE,KAAK,IAAI,CAAC,IAAI;IAC5D,CAAC,CAAC,KAAK;IACP,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AAE5G,eAAe;IACb,iBAAiB;IACjB,eAAe;CAChB,CAAC"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAE9E,MAAM,eAAe,GAAG,KAAK,EAAE,WAAoB,EAAmB,EAAE;IACtE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,WAAW,IAAI,CAAC,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3B,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;IACtC,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,6FAA6F;AAC7F,MAAM,WAAW,GAAG,KAAK,EAAE,MAAc,EAAmB,EAAE;IAC5D,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAC;QACzD,OAAO,SAAS,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAW,CAAC;QAC7F,MAAM,CAAC,KAAK,CAAC,sDAAsD,OAAO,EAAE,CAAC,CAAC;QAC9E,OAAO,OAAO,CAAC,UAAU,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AACF,MAAM,gBAAgB,GAAG,CAAC,SAAiB,EAAQ,EAAE;IACnD,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,iBAAiB,EAAE;YAChF,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,EAAE,QAAkB,EAAoB,EAAE,CACvE,OAAO,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,kBAAkB,EAAE,KAAK,IAAI,CAAC,IAAI;IAC5D,CAAC,CAAC,KAAK;IACP,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AAE5G,eAAe;IACb,iBAAiB;IACjB,eAAe;CAChB,CAAC"}