renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(bitbucket-server): revert encode auth in URL (#3511)

Browse source 
This reverts commit 3e66e019e4.
This commit is contained in:
Nick Oliver 2019-04-08 23:32:05 -07:00 committed by Rhys Arkins
parent 107051e7cd
commit ec16c8b2b8
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/platform/bitbucket-server/index.js
View file

@ -124,9 +124,7 @@ async function initRepo({
const { host, pathname } = url.parse(opts.endpoint); const { host, pathname } = url.parse(opts.endpoint);
const gitUrl = GitStorage.getUrl({ const gitUrl = GitStorage.getUrl({
gitFs: gitFs || 'https', gitFs: gitFs || 'https',
auth: `${encodeURIComponent(opts.username)}:${encodeURIComponent( auth: `${opts.username}:${opts.password}`,
opts.password
)}`,
host: `${host}${pathname}${pathname.endsWith('/') ? '' : '/'}scm`, host: `${host}${pathname}${pathname.endsWith('/') ? '' : '/'}scm`,
repository, repository,
}); });

18
test/platform/bitbucket-server/index.spec.js
View file

@ -33,7 +33,6 @@ describe('platform/bitbucket-server', () => {
jest.spyOn(api, 'delete'); jest.spyOn(api, 'delete');
bitbucket = require('../../../lib/platform/bitbucket-server'); bitbucket = require('../../../lib/platform/bitbucket-server');
GitStorage = require('../../../lib/platform/git/storage'); GitStorage = require('../../../lib/platform/git/storage');
jest.spyOn(GitStorage, 'getUrl');
GitStorage.mockImplementation(() => ({ GitStorage.mockImplementation(() => ({
initRepo: jest.fn(), initRepo: jest.fn(),
cleanRepo: jest.fn(), cleanRepo: jest.fn(),
@ -59,8 +58,8 @@ describe('platform/bitbucket-server', () => {
hostRules.update({ hostRules.update({
platform: 'bitbucket-server', platform: 'bitbucket-server',
token: 'token', token: 'token',
username: 'user@ame', username: 'username',
password: 'passw:rd', password: 'password',
endpoint: mockResponses.baseURL, endpoint: mockResponses.baseURL,
}); });
}); });
@ -99,19 +98,6 @@ describe('platform/bitbucket-server', () => {
expect(res).toMatchSnapshot(); expect(res).toMatchSnapshot();
}); });
it('sends the username and password encoded', async () => {
expect.assertions(2);
GitStorage.getUrl.mockClear();
await bitbucket.initRepo({
repository: 'SOME/repo',
});
expect(GitStorage.getUrl).toHaveBeenCalledTimes(1);
expect(GitStorage.getUrl.mock.calls[0][0]).toHaveProperty(
'auth',
'user%40ame:passw%3Ard'
);
});
it('sends the host as the endpoint option', async () => { it('sends the host as the endpoint option', async () => {
expect.assertions(2); expect.assertions(2);
GitStorage.getUrl.mockClear(); GitStorage.getUrl.mockClear();