Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-2033 Update GBE account state in response to checkout-web events #555

Merged
merged 16 commits into from Jun 15, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Remove changes used for local development

  • Loading branch information
wlycdgr committed May 21, 2020
commit 3bf68466c78f9dbca5c3f9df1557a77f2271533e
@@ -49,8 +49,7 @@
],
"matches": [
"https://account.ghostery.com/*",
"https://account.ghosterystage.com/*",
"http://localhost:3001/*"
"https://account.ghosterystage.com/*"
],
"run_at": "document_start"
},
@@ -61,8 +60,7 @@
],
"matches": [
"https://checkout.ghostery.com/*",
"https://checkout.ghosterystage.com/*",
"http://localhost:3002/*"
"https://checkout.ghosterystage.com/*"
],
"run_at": "document_start"
},
@@ -27,7 +27,6 @@ class Globals {
// environment variables
this.DEBUG = manifest.debug || false;
this.LOG = this.DEBUG && manifest.log;
this.DEV = manifest.dev || false;
this.EXTENSION_NAME = manifest.name || 'Ghostery';
this.EXTENSION_VERSION = manifest.version_name || manifest.version; // Firefox does not support "version_name"
this.BROWSER_INFO = {
@@ -52,26 +51,17 @@ class Globals {
// domains
this.GHOSTERY_ROOT_DOMAIN = `${this.DEBUG ? 'ghosterystage' : 'ghostery'}.com`;
this.GHOSTERY_BASE_URL = `https://${this.GHOSTERY_ROOT_DOMAIN}`;
this.ACCOUNT_BASE_URL = `https://account.${this.GHOSTERY_ROOT_DOMAIN}`;
this.CHECKOUT_BASE_URL = `https://checkout.${this.GHOSTERY_ROOT_DOMAIN}`;
this.METRICS_BASE_URL = `https://${this.DEBUG ? 'staging-d' : 'd'}.ghostery.com`;
this.CMP_BASE_URL = `https://${this.DEBUG ? 'staging-cmp-cdn' : 'cmp-cdn'}.ghostery.com`;
this.CDN_BASE_URL = `https://${this.DEBUG ? 'staging-cdn' : 'cdn'}.ghostery.com`;
this.APPS_BASE_URL = `https://${this.DEBUG ? 'staging-apps' : 'apps'}.ghostery.com`;
this.GCACHE_BASE_URL = `https://${this.DEBUG ? 'staging-gcache' : 'gcache'}.ghostery.com`;
if (this.DEV) {
this.ACCOUNT_BASE_URL = 'http://localhost:3001';
this.CHECKOUT_BASE_URL = 'http://localhost:3002';
this.AUTH_SERVER = 'http://localhost:8080';
this.ACCOUNT_SERVER = 'http://localhost:8081';
this.COOKIE_DOMAIN = 'localhost';
this.COOKIE_URL = `http://${this.COOKIE_DOMAIN}`;
} else {
this.ACCOUNT_BASE_URL = `https://account.${this.GHOSTERY_ROOT_DOMAIN}`;
this.CHECKOUT_BASE_URL = `https://checkout.${this.GHOSTERY_ROOT_DOMAIN}`;
this.AUTH_SERVER = `https://consumerapi.${this.GHOSTERY_ROOT_DOMAIN}`;
this.ACCOUNT_SERVER = `https://accountapi.${this.GHOSTERY_ROOT_DOMAIN}`;
this.COOKIE_DOMAIN = `.${this.GHOSTERY_ROOT_DOMAIN}`;
this.COOKIE_URL = this.GHOSTERY_BASE_URL;
}
this.AUTH_SERVER = `https://consumerapi.${this.GHOSTERY_ROOT_DOMAIN}`;
this.ACCOUNT_SERVER = `https://accountapi.${this.GHOSTERY_ROOT_DOMAIN}`;
this.COOKIE_DOMAIN = `.${this.GHOSTERY_ROOT_DOMAIN}`;
this.COOKIE_URL = this.GHOSTERY_BASE_URL;

// extension IDs
this.GHOSTERY_TAB_CHROME_PRODUCTION_ID = 'plmapebanmikcofllaaddgeocahboejc';
ProTip! Use n and p to navigate between commits in a pull request.