diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e7627c175..32a453db57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +## [5.3.9](https://github.com/forcedotcom/sfdx-core/compare/5.3.8...5.3.9) (2023-10-09) + +### Bug Fixes + +- **deps:** bump @salesforce/kit from 3.0.12 to 3.0.13 ([08fb56b](https://github.com/forcedotcom/sfdx-core/commit/08fb56b1a14385168adba81bc44d67fc987040e6)) + +## [5.3.8](https://github.com/forcedotcom/sfdx-core/compare/5.3.7...5.3.8) (2023-10-08) + +### Bug Fixes + +- **deps:** bump pino from 8.15.1 to 8.15.6 ([2a5a9cc](https://github.com/forcedotcom/sfdx-core/commit/2a5a9cc69e6616ed6b4338c3ce26e5c5dbd9abab)) + +## [5.3.7](https://github.com/forcedotcom/sfdx-core/compare/5.3.6...5.3.7) (2023-10-08) + +### Bug Fixes + +- **deps:** bump @types/semver from 7.5.2 to 7.5.3 ([9e8a0a7](https://github.com/forcedotcom/sfdx-core/commit/9e8a0a7e53d8b5900baf00e01548ea81c1ecfd4e)) + +## [5.3.6](https://github.com/forcedotcom/sfdx-core/compare/5.3.5...5.3.6) (2023-10-08) + +### Bug Fixes + +- **deps:** bump pino-pretty from 10.2.0 to 10.2.3 ([9e925c5](https://github.com/forcedotcom/sfdx-core/commit/9e925c599cbb7f5826ac6a0afe6043f6465e7dcf)) + +## [5.3.5](https://github.com/forcedotcom/sfdx-core/compare/5.3.4...5.3.5) (2023-10-06) + +### Bug Fixes + +- allow padding on id and secret ([b93ac50](https://github.com/forcedotcom/sfdx-core/commit/b93ac504d09145dad3d5b5beea4ce1d5a56985cd)) + ## [5.3.4](https://github.com/forcedotcom/sfdx-core/compare/5.3.3...5.3.4) (2023-10-04) ### Bug Fixes diff --git a/package.json b/package.json index 1e6ef4c599..b8343899a3 100644 --- a/package.json +++ b/package.json @@ -39,10 +39,10 @@ "messageTransformer/messageTransformer.ts" ], "dependencies": { - "@salesforce/kit": "^3.0.12", + "@salesforce/kit": "^3.0.13", "@salesforce/schemas": "^1.6.0", "@salesforce/ts-types": "^2.0.8", - "@types/semver": "^7.5.2", + "@types/semver": "^7.5.3", "ajv": "^8.12.0", "change-case": "^4.1.2", "faye": "^1.4.0", @@ -51,9 +51,9 @@ "jsforce": "^2.0.0-beta.28", "jsonwebtoken": "9.0.2", "jszip": "3.10.1", - "pino": "^8.15.1", + "pino": "^8.15.6", "pino-abstract-transport": "^1.0.0", - "pino-pretty": "^10.2.0", + "pino-pretty": "^10.2.3", "proper-lockfile": "^4.1.2", "semver": "^7.5.4", "ts-retry-promise": "^0.7.1" diff --git a/src/org/authInfo.ts b/src/org/authInfo.ts index e7b49bf724..26f7d1b60d 100644 --- a/src/org/authInfo.ts +++ b/src/org/authInfo.ts @@ -362,7 +362,7 @@ export class AuthInfo extends AsyncOptionalCreatable { sfdxAuthUrl: string ): Pick { const match = sfdxAuthUrl.match( - /^force:\/\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]*):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/ + /^force:\/\/([a-zA-Z0-9._-]+={0,2}):([a-zA-Z0-9._-]*={0,2}):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/ ); if (!match) { diff --git a/test/unit/org/authInfoTest.ts b/test/unit/org/authInfoTest.ts index 3d2b5e2b96..1979224ebe 100644 --- a/test/unit/org/authInfoTest.ts +++ b/test/unit/org/authInfoTest.ts @@ -1668,16 +1668,18 @@ describe('AuthInfo', () => { expect(options.loginUrl).to.equal('https://test.my.salesforce.com'); }); - it('should parse the token that includes = for padding', () => { + it('should parse an id, secret, and token that include = for padding', () => { const options = AuthInfo.parseSfdxAuthUrl( - 'force://PlatformCLI::5Aep861_OKMvio5gy8xCNsXxybPdupY9fVEZyeVOvb4kpOZx5Z1QLB7k7n5flEqEWKcwUQEX1I.O5DCFwjlYU==@test.my.salesforce.com' + 'force://3MVG9SemV5D80oBfPBCgboxuJ9cOMLWNM1DDOZ8zgvJGsz13H3J66coUBCFF3N0zEgLYijlkqeWk4ot_Q2.4o=:438437816653243682==:5Aep861_OKMvio5gy8xCNsXxybPdupY9fVEZyeVOvb4kpOZx5Z1QLB7k7n5flEqEWKcwUQEX1I.O5DCFwjlYU==@test.my.salesforce.com' ); expect(options.refreshToken).to.equal( '5Aep861_OKMvio5gy8xCNsXxybPdupY9fVEZyeVOvb4kpOZx5Z1QLB7k7n5flEqEWKcwUQEX1I.O5DCFwjlYU==' ); - expect(options.clientId).to.equal('PlatformCLI'); - expect(options.clientSecret).to.equal(''); + expect(options.clientId).to.equal( + '3MVG9SemV5D80oBfPBCgboxuJ9cOMLWNM1DDOZ8zgvJGsz13H3J66coUBCFF3N0zEgLYijlkqeWk4ot_Q2.4o=' + ); + expect(options.clientSecret).to.equal('438437816653243682=='); expect(options.loginUrl).to.equal('https://test.my.salesforce.com'); }); diff --git a/yarn.lock b/yarn.lock index 41633991e9..5dca2284bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -560,12 +560,12 @@ typescript "^4.9.5" wireit "^0.9.5" -"@salesforce/kit@^3.0.12": - version "3.0.12" - resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.12.tgz#8d598813fd3dce9545951186cfa579bafaac374a" - integrity sha512-+2bjUaIbS1/XrYBYxpS5zKyQER8dgVakIL6X/MxZVZFJaLHithkLXvrUKYd5tZEaijxBZq1ooIkGm2yCLrg8Ew== +"@salesforce/kit@^3.0.13": + version "3.0.13" + resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.13.tgz#10b47ad6e0e27c3a9f97eb6a5cdcfffa9ba1f163" + integrity sha512-HLQ5L5bBi0tsMeH5ZHJAhHUpvNUNPQoNJt2O82Jf6C60GGsrlzwzQ5ONAHGNBgKSZ7HLr0UGL5xaA+hE9uOcgw== dependencies: - "@salesforce/ts-types" "^2.0.7" + "@salesforce/ts-types" "^2.0.8" tslib "^2.6.2" "@salesforce/prettier-config@^0.0.3": @@ -795,10 +795,10 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a" integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow== -"@types/semver@^7.3.12", "@types/semver@^7.5.2": - version "7.5.2" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.2.tgz#31f6eec1ed7ec23f4f05608d3a2d381df041f564" - integrity sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw== +"@types/semver@^7.3.12", "@types/semver@^7.5.3": + version "7.5.3" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04" + integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw== "@types/shelljs@0.8.13": version "0.8.13" @@ -3915,10 +3915,10 @@ pino-abstract-transport@^1.0.0, pino-abstract-transport@v1.1.0: readable-stream "^4.0.0" split2 "^4.0.0" -pino-pretty@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-10.2.0.tgz#c674a153e15c08d7032a826d0051d786feace1d9" - integrity sha512-tRvpyEmGtc2D+Lr3FulIZ+R1baggQ4S3xD2Ar93KixFEDx6SEAUP3W5aYuEw1C73d6ROrNcB2IXLteW8itlwhA== +pino-pretty@^10.2.3: + version "10.2.3" + resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-10.2.3.tgz#db539c796a1421fd4d130734fa994f5a26027783" + integrity sha512-4jfIUc8TC1GPUfDyMSlW1STeORqkoxec71yhxIpLDQapUu8WOuoz2TTCoidrIssyz78LZC69whBMPIKCMbi3cw== dependencies: colorette "^2.0.7" dateformat "^4.6.3" @@ -3940,10 +3940,10 @@ pino-std-serializers@^6.0.0: resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3" integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA== -pino@^8.15.1: - version "8.15.1" - resolved "https://registry.yarnpkg.com/pino/-/pino-8.15.1.tgz#04b815ff7aa4e46b1bbab88d8010aaa2b17eaba4" - integrity sha512-Cp4QzUQrvWCRJaQ8Lzv0mJzXVk4z2jlq8JNKMGaixC2Pz5L4l2p95TkuRvYbrEbe85NQsDKrAd4zalf7Ml6WiA== +pino@^8.15.6: + version "8.15.6" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.15.6.tgz#55c361e3c4dadabbbb47543e0d3bf5759fe9c052" + integrity sha512-GuxHr61R0ZFD1npu58tB3a3FSVjuy21OwN/haw4OuKiZBL63Pg11Y51WWeD52RENS2mjwPZOwt+2OQOSkck6kQ== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1"