From a38be75ccb0f699f507b66c4d44b3b21d1677e25 Mon Sep 17 00:00:00 2001 From: Nejc Zdovc Date: Wed, 18 Jul 2018 08:52:56 +0200 Subject: [PATCH] Merge pull request #14774 from NejcZdovc/fix/#14763-pia Removes PIA --- app/browser/api/ledger.js | 14 --- .../brave/img/private_internet_access.png | Bin 2933 -> 0 bytes .../brave/img/private_internet_access_2x.png | Bin 2700 -> 0 bytes .../locales/en-US/preferences.properties | 1 - .../preferences/payment/disabledContent.js | 10 -- test/unit/app/browser/api/ledgerTest.js | 91 ------------------ 6 files changed, 116 deletions(-) delete mode 100755 app/extensions/brave/img/private_internet_access.png delete mode 100755 app/extensions/brave/img/private_internet_access_2x.png diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js index afd2fed00d6..6145d848c6c 100644 --- a/app/browser/api/ledger.js +++ b/app/browser/api/ledger.js @@ -1589,15 +1589,6 @@ const roundtrip = (params, options, callback) => { parts = underscore.extend(underscore.pick(parts, ['protocol', 'hostname', 'port']), underscore.omit(params, ['headers', 'payload', 'timeout'])) - // TBD: let the user configure this via preferences [MTR] - if (params.useProxy) { - if (parts.hostname === 'ledger.brave.com') { - parts.hostname = 'ledger-proxy.privateinternetaccess.com' - } else if (parts.hostname === 'ledger.mercury.basicattentiontoken.org') { - parts.hostname = 'mercury-proxy.privateinternetaccess.com' - } - } - // Use alternate hostname if it's provided parts.hostname = params.altHostname || parts.hostname @@ -1642,11 +1633,6 @@ const roundtrip = (params, options, callback) => { if (err) return callback(err, response) if (Math.floor(response.statusCode / 100) !== 2) { - if (params.useProxy && response.statusCode === 403) { - params.useProxy = false - return module.exports.roundtrip(params, options, callback) - } - return callback( new Error('HTTP response ' + response.statusCode + ' for ' + params.method + ' ' + params.path), response) diff --git a/app/extensions/brave/img/private_internet_access.png b/app/extensions/brave/img/private_internet_access.png deleted file mode 100755 index ba44b176c31294c894cc9a987014c03fea8ede52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2933 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 AW&i*H diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index dce6786d119..f8be9a86f07 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -242,7 +242,6 @@ paymentInProgress=Currently processing payments=Payments paymentsFAQLink.title=View the FAQ paymentsSidebarText1=Our Partners -paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave BAT Wallets are provided through a partnership with: paymentsWelcomeLink=View the FAQ paymentsWelcomeText1=To start using Brave Payments, simply flip the switch at the top of this window. diff --git a/app/renderer/components/preferences/payment/disabledContent.js b/app/renderer/components/preferences/payment/disabledContent.js index 48e030c328e..91540e99a8c 100644 --- a/app/renderer/components/preferences/payment/disabledContent.js +++ b/app/renderer/components/preferences/payment/disabledContent.js @@ -14,8 +14,6 @@ const cx = require('../../../../../js/lib/classSet') // style const globalStyles = require('../../styles/global') const commonStyles = require('../../styles/commonStyles') -const PIA = require('../../../../extensions/brave/img/private_internet_access.png') -const PIA2 = require('../../../../extensions/brave/img/private_internet_access_2x.png') const uphold = require('../../../../extensions/brave/img/ledger/uphold_logo_small.png') const uphold2 = require('../../../../extensions/brave/img/ledger/uphold_logo_medium.png') @@ -91,8 +89,6 @@ class DisabledContent extends ImmutableComponent {

-
-
@@ -167,12 +163,6 @@ const styles = StyleSheet.create({ display: 'block' }, - disabledContent__sidebar__logo_PIA: { - backgroundImage: `-webkit-image-set(url(${PIA}) 1x, url(${PIA2}) 2x)`, - width: '195px', - height: '20px' - }, - disabledContent__sidebar__logo_uphold: { backgroundImage: `-webkit-image-set(url(${uphold}) 1x, url(${uphold2}) 2x)`, backgroundSize: 'contain', diff --git a/test/unit/app/browser/api/ledgerTest.js b/test/unit/app/browser/api/ledgerTest.js index 0d6b6bb36e0..b5f0eb32631 100644 --- a/test/unit/app/browser/api/ledgerTest.js +++ b/test/unit/app/browser/api/ledgerTest.js @@ -903,97 +903,6 @@ describe('ledger api unit tests', function () { assert.deepEqual(state.toJS(), expectedState.toJS()) }) }) - - describe('roundtrip', function () { - let requestStub - const simpleCallback = sinon.stub() - let responseCode = 200 - - before(function () { - requestStub = sinon.stub(request, 'request', (options, callback) => { - switch (responseCode) { - case 403: - callback(null, { - statusCode: 403, - headers: {}, - statusMessage: 'Your requested URL has been blocked by the URL Filter database module of {{EnterpriseName}}. The URL is listed in categories that are not allowed by your administrator at this time.', - httpVersionMajor: 1, - httpVersionMinor: 1 - }) - break - case 200: - default: - callback(null, { - statusCode: 200, - headers: {}, - statusMessage: '', - httpVersionMajor: 1, - httpVersionMinor: 1 - }, {timestamp: '6487805648321904641'}) - } - }) - }) - - after(function () { - requestStub.restore() - }) - - describe('when params.useProxy is true', function () { - let expectedOptions - before(function () { - expectedOptions = { - url: 'https://ledger-proxy.privateinternetaccess.com/v3/publisher/timestamp', - method: 'GET', - payload: undefined, - responseType: 'text', - headers: { - 'content-type': 'application/json; charset=utf-8', - 'user-agent': '' - }, - verboseP: undefined - } - requestStub.reset() - simpleCallback.reset() - ledgerApi.roundtrip({ - server: 'https://ledger.brave.com', - path: '/v3/publisher/timestamp', - useProxy: true - }, {}, simpleCallback) - }) - - it('updates URL to use proxy (ledger-proxy.privateinternetaccess.com)', function () { - assert(requestStub.withArgs(expectedOptions, sinon.match.func).called) - }) - - it('calls the callback on success', function () { - assert(simpleCallback.calledOnce) - }) - - describe('when the proxy returns a 403', function () { - before(function () { - responseCode = 403 - requestStub.reset() - ledgerApi.roundtrip({ - server: 'https://ledger.brave.com', - path: '/v3/publisher/timestamp', - useProxy: true - }, {}, simpleCallback) - }) - after(function () { - responseCode = 200 - }) - it('calls request a second time (with useProxy = false)', function () { - assert(requestStub.calledTwice) - assert(requestStub.withArgs(expectedOptions, sinon.match.func).called) - - const secondCallOptions = Object.assign({}, expectedOptions, { - url: 'https://ledger.brave.com/v3/publisher/timestamp' - }) - assert(requestStub.withArgs(secondCallOptions, sinon.match.func).called) - }) - }) - }) - }) }) describe('when timing needs to be checked', function () {