New custom payment & licensing, bug fixes, and more tests!

Because the Chrome Webstore native payment is too restrictive (you had to have a google account to install the extension...! and in some countries the extension could not be installed...!). Now it's handled by Stripe :)
maximelebreton · Jan 16, 2019 · add7747 · add7747
1 parent 429d88f
commit add7747
Show file tree

Hide file tree

Showing 22 changed files with 356 additions and 59 deletions.
diff --git a/package.json b/package.json
@@ -1,11  1,11 @@
 {
   "name": "bar-translate",
-  "version": "1.1.0",
   "version": "1.2.0",
   "description": "",
   "scripts": {
-    "watch": "npm run pre-watch && parcel watch src/background.js --out-dir dist --no-hmr",
-    "build": "npm run pre-build && parcel build src/background.js --out-dir dist --no-source-maps && npm run post-build",
-    "test": "jest --watchAll",
     "watch": "npm run pre-watch && parcel watch src/background.js src/register.html --out-dir dist --no-hmr",
     "build": "npm run pre-build && parcel build src/background.js src/register.html --out-dir dist --no-source-maps && npm run post-build",
     "test": "jest --verbose --silent --watchAll",
     "pre-watch": "npm run clean-dist && npm run copy-dev-manifest && npm run copy-hot-reload",
     "pre-build": "npm run clean-dist && npm run copy-prod-manifest",
     "post-build": "npm run zip-build",
@@ -30,6  30,9 @@
   "jest": {
     "roots": [
       "src"
     ],
     "setupFiles": [
       "jest-webextension-mock"
     ]
   },
   "author": "Maxime Le Breton",
@@ -41,8  44,10 @@
     "copyfiles": "^2.1.0",
     "cross-env": "^5.2.0",
     "cross-zip-cli": "^1.0.0",
     "cssnano": "^4.1.8",
     "fetch-mock": "^7.2.5",
     "jest": "^23.6.0",
     "jest-webextension-mock": "^3.5.0",
     "node-fetch": "^2.3.0",
     "parcel-plugin-copy": "^1.0.2",
     "rimraf": "^2.6.3"

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -17,6  17,9 @@
     "default": {
       "message": "default"
     },
     "default__smallcase": {
       "message": "ᴅᴇғᴀᴜʟᴛ"
     },
     "try": {
       "message": "try"
     },
@@ -35,6  38,9 @@
     "syncLicense": {
       "message": "Link existing license"
     },
     "registerLicense": {
       "message": "Register your license"
     },
     "dontShowAnymore": {
       "message": "Don't show anymore"
     },

diff --git a/src/js/actions.js b/src/js/actions.js
@@ -10,12  10,24 @@ const actions = {
     })
   },
 
   openRegisterPage: () => {
     chrome.tabs.create({
       url: chrome.runtime.getURL("register.html")
     })
   },
 
   openHelpPage: () => {
     chrome.tabs.create({
       url: chrome.runtime.getURL("help.html")
     })
   },
 
   openBuyPage: () => {
     chrome.tabs.create({
       url: 'https://license.maximelebreton.com/bar-translate/buy'
     })
   },
 
   openChromeWebstorePage: () => {
     chrome.tabs.create({
       url: `https://chrome.google.com/webstore/detail/bar-translate/inigdjcpofmlcigjhhiigigihmookhcp`

diff --git a/src/js/contextMenus/onClicked.js b/src/js/contextMenus/onClicked.js
@@ -1,6  1,6 @@
 import contextMenus from './index'
 import actions from '../actions'
-import licensing from '../licensing'
 //import licensing from '../licensing'
 import langUtils from '../utils/lang'
 import notifications from '../notifications'
 import translateService from '../translateService'
@@ -32,10  32,12 @@ export default chrome.contextMenus.onClicked.addListener(function (info, tab) {
     actions.openHelpPage()
   }
   if (info.menuItemId === contextMenus.buyLicense) {
-    actions.openChromeWebstorePage()
     //actions.openChromeWebstorePage()
     actions.openBuyPage()
   }
   if (info.menuItemId === contextMenus.registerLicense) {
-    licensing.registerLicense()
     //licensing.registerLicense()
     actions.openRegisterPage()
   }
 
 });
diff --git a/src/js/licensing.js b/src/js/licensing.js
@@ -1,12  1,12 @@
-import notifications from './notifications'
 //import notifications from './notifications'
 import storage from './storage'
 
-var CWS_API_URL = 'https://www.googleapis.com/chromewebstore/v1.1/';
 //var CWS_API_URL = 'https://www.googleapis.com/chromewebstore/v1.1/';
 
 
 const licensing = {
 
-  getAuthToken: () => {
   /*getAuthToken: () => {
     return new Promise((resolve, reject) => {
 
       chrome.identity.getAuthToken({interactive: false}, function (token) {
@@ -43,16  43,16 @@ const licensing = {
       return data
     })
 
-  },
   },*/
 
 
   getLicenseMessage: (license) => {
-    let licenseSuccessMessage = `Your Bar Translate license has been registered!`
-    let licenseRejectMessage = `Sorry, but you don't have a Bar Translate license associated to this account`
-    if (license && license.result === true && license.accessLevel === 'FULL') {
-      return licenseSuccessMessage
-    } else {
     let licenseSuccessMessage = `Your Bar Translate license is registered!`
     let licenseRejectMessage = `Sorry, but there is no Bar Translate license associated with this account`
     if (!license || (license && license.accessLevel === 'FREE_TRIAL')) {
       return licenseRejectMessage
     } else {
       return licenseSuccessMessage
     }
   },
 
@@ -61,7  61,11 @@ const licensing = {
       return storage.sync.getValue('barTranslate.license')
   },
 
   storeLicense: (licenseData) => {
    return storage.sync.set('barTranslate.license', licenseData)
   }
 
 /*
   registerLicense: () => {
     return licensing.getAuthToken()
       .then(token => {
@@ -81,7  85,7 @@ const licensing = {
         console.info(license)
         return license
       })
-  }
   }*/
 }
 
 

diff --git a/src/js/messages.js b/src/js/messages.js
@@ -31,7  31,7 @@ const messages = {
           title: getMessage('buyNow')
         },
         sync: {
-          title: getMessage('syncLicense')
           title: getMessage('registerLicense')
         }
       }
     },
@@ -56,7  56,7 @@ const messages = {
       title: getMessage('buyLicense')
     },
     license: {
-      title: getMessage('syncLicense')
       title: getMessage('registerLicense')
     }
 
   },

diff --git a/src/js/notifications/create.test.js b/src/js/notifications/create.test.js
@@ -3,20  3,23 @@ import langUtils from '../utils/lang.js'
 
 
 
-describe('Test supported lanuages translations', () => {
-
-  it("Returns language traduction for each supported language", function () {
 describe('Supported languages translations', () => {
 
   it("Returns hello traduction for each supported language", function () {
     let missingLanguages = []
     chromeLanguages.forEach((lang) => {
 
         let hello = langUtils.getHelloFromLangOrAlias(lang)
         expect(hello).toBeDefined()
         if (hello) {
-          expect(hello).toBeDefined()
 
         } else {
-            console.warn(`${hello} for ${lang}`)
           missingLanguages.push(lang)
 
         }
 
     })
     console.warn(`missing hello for ${missingLanguages}`)
 
   })
 

diff --git a/src/js/notifications/onButtonClicked.js b/src/js/notifications/onButtonClicked.js
@@ -1,6  1,6 @@
 import notifications from './index'
 import actions from '../actions'
-import licensing from '../licensing'
 //import licensing from '../licensing'
 import storage from '../storage'
 import textUtils from '../utils/text'
 
@@ -10,10  10,11 @@ export default chrome.notifications.onButtonClicked.addListener((notificationId,
 
       if (buttonIndex === 0) {
         chrome.notifications.clear(notifications.tryLoveBuy.id)
-        actions.openChromeWebstorePage()
         actions.openBuyPage()
       }
       if (buttonIndex === 1) {
-        licensing.registerLicense()
         //licensing.registerLicense()
         actions.openRegisterPage()
         chrome.notifications.clear(notifications.tryLoveBuy.id)
       }
 

diff --git a/src/js/omnibox/messages.js b/src/js/omnibox/messages.js
@@ -19,6  19,7 @@ const messages = {
 
     let toPrefix = sourceLanguage && !isDetectedSourceLanguage ? `${chrome.i18n.getMessage('into')} ` : `${chrome.i18n.getMessage('in')} `
     let toSuffix = `<dim>${isDefault ? ` (${chrome.i18n.getMessage('default')})` : ''}</dim>`
 
     let to = `<match>${toPrefix}<url>${targetLanguageName}</url></match>${toSuffix}`
 
     return `${translate}${match}${from}${to}`
@@ -33,7  34,7 @@ const messages = {
   },*/
 
   getSuggestDescription(languageName, languageSlice, langName, langSlice, aliasName, aliasSlice) {
-  return `<match><dim>?</dim></match>${space.repeat(2)}Translate in <url><match>${languageName.slice(0, languageSlice.length)}</match>${languageName.slice(languageSlice.length, languageName.length)}</url> <dim>(<match>${!aliasSlice ? langName.slice(0, langSlice.length) : ''}</match>${!aliasSlice ? langName.slice(langSlice.length, langName.length) : ''}<match>${aliasSlice ? aliasName.slice(0, aliasSlice.length) : ''}</match>${aliasSlice ? aliasName.slice(aliasSlice.length, aliasName.length) : ''})</dim>`
     return `<match><dim>?</dim></match>${space.repeat(2)}Translate in <url><match>${languageName.slice(0, languageSlice.length)}</match>${languageName.slice(languageSlice.length, languageName.length)}</url> <dim>(<match>${!aliasSlice ? langName.slice(0, langSlice.length) : ''}</match>${!aliasSlice ? langName.slice(langSlice.length, langName.length) : ''}<match>${aliasSlice ? aliasName.slice(0, aliasSlice.length) : ''}</match>${aliasSlice ? aliasName.slice(aliasSlice.length, aliasName.length) : ''})</dim>`
   },
 
   /*getFromLanguageSuggestDescription(languageName, languageSlice, langName, langSlice) {
@@ -65,7  66,7 @@ const messages = {
     //let arrow = `—›`
     //let prefix = `<dim>${sourceLanguage ? `${sourceLanguage}` : ''}</dim><match></match><dim> › ${targetLanguage}</dim>`
     let space = `  `
-    return `${space}<match><dim>=</dim></match>${space}<url><match>${translatedText}</match></url> <dim>${space}ᴛʀᴀɴsʟᴀᴛᴇᴅ ʙʏ ${translateService.smallcase}</dim>`
     return `${space}<match><dim>=</dim></match>${space}<url><match>${translatedText}</match></url><dim>${space.repeat(2)}${chrome.i18n.getMessage('translatedBy__smallcase')} ${translateService.smallcase}</dim>`
   },
 
   getErrorDescription(sourceLanguage, targetLanguage, query, translateService) {

diff --git a/src/js/omnibox/onInputChanged.js b/src/js/omnibox/onInputChanged.js
@@ -11,6  11,7 @@ let abortOnChangeDebounce = false
 
 const getTranslationsSuggests = (sourceLanguage, targetLanguage, query, translations, translateService) => {
   return translations.map(function (translation) {
     // because suggest doesn't display if content attr already exist in suggests, and somestimes the input query match the translated result
     let content = translation.translatedText === query ? `${translation.translatedText}${textUtils.zeroWidthSpace}` : translation.translatedText
 
     return {
@@ -193,7  194,6 @@ let debounceOnChange = debounce(onChange, 300)
 
 
 const onInputChangedListener = (text, suggest) => {
-
   let {sourceLanguage, targetLanguage, query, isDefault} = langUtils.extractLanguageFromQuery(text)
   messages.defaultDescription = messages.getDefaultDescription(sourceLanguage, targetLanguage, query, isDefault)
 

diff --git a/src/js/omnibox/onInputStarted.js b/src/js/omnibox/onInputStarted.js
@@ -26,7  26,7 @@ export default chrome.omnibox.onInputStarted.addListener(function() {
     .then(license => {
       console.info(license, 'license')
       console.info(licensing.getLicenseMessage(license))
-      if (!license || (license && license.accessLevel !== 'FULL')) {
       if (!license || (license && license.accessLevel === 'FREE_TRIAL')) {
 
         //notifications.show('tryLoveBuy')
         storage.local.getValue(`${notifications.tryLoveBuy.id}.${storage.states.alreadyNotified}`)

diff --git a/src/js/translateService/googleScriptService.js b/src/js/translateService/googleScriptService.js
@@ -9,15  9,16 @@ const googleScriptService = () => {
     getUrl: (sourceLanguage, targetLanguage, query) => {
       const path = 'https://script.google.com/macros/s/AKfycbyCMrxkscWQ_fqmz_G0jBp44qzSitIu37RcsUVznA4M-zSP2tI/exec'
       const params = {
-        'sl': sourceLanguage,
         'sl': sourceLanguage ? sourceLanguage : '',
         'tl': targetLanguage,
         'q': encodeURI(query)
       }
       return googleScriptService().getUrlWithParams(path, params)
     },
 
     getSiteUrl: (sourceLanguage, targetLanguage, query) => {
-      return `https://translate.google.com/#view=home&op=translate&sl=${sourceLanguage}&tl=${targetLanguage}&text=${encodeURI(query)}`
       console.log(sourceLanguage)
       return `https://translate.google.com/#view=home&op=translate&sl=${sourceLanguage ? sourceLanguage : ''}&tl=${targetLanguage}&text=${encodeURI(query)}`
     },
 
     getNormalizedData: (data) => {

diff --git a/src/js/translateService/googleTranslateService.js b/src/js/translateService/googleTranslateService.js
@@ -19,18  19,29 @@ const googleTranslateService = () => {
     },
 
     getSiteUrl: (sourceLanguage, targetLanguage, query) => {
       console.log(sourceLanguage)
       return `https://translate.google.com/#view=home&op=translate&sl=${sourceLanguage ? sourceLanguage : 'auto'}&tl=${targetLanguage}&text=${encodeURI(query)}`
     },
 
     getNormalizedData: (data) => {
       const translations = data[0]
       const detectedSourceLanguage = data[2]
-      const normalizedData = translations.map(translation => {
 
       // because google translate api split every sentence after a dot (.), so we need to re-concate them
       let concatedTranslatedText = ''
       translations.forEach(translation => {
         concatedTranslatedText  = translation[0]
       })
       const normalizedData = [{
         translatedText: concatedTranslatedText,
         detectedSourceLanguage: detectedSourceLanguage
       }]
       /*const normalizedData = translations.map(translation => {
         return {
           translatedText: translation[0],
           detectedSourceLanguage: detectedSourceLanguage
         }
-      })
       })*/
       return normalizedData
     }
   }

diff --git a/src/js/translateService/index.test.js b/src/js/translateService/index.test.js
@@ -47,6  47,18 @@ describe('Check Services', () => {
   Object.keys(translateService.list).forEach(function (id) {
     let currentTranslateService = translateService.list[id]
 
     let urlWithoutSource = currentTranslateService.getUrl(null, targetLanguage, query)
     it(urlWithoutSource, () => {
       if (id === 'googleTranslate') {
         expect(urlWithoutSource).toMatch('auto')
       } else {
         expect(urlWithoutSource).toMatch('')
       }
       expect(urlWithoutSource).toMatch(targetLanguage)
       expect(urlWithoutSource).toMatch(query)
     })
 
 
     let url = currentTranslateService.getUrl(sourceLanguage, targetLanguage, query)
     it(url, () => {
       expect(url).toMatch(sourceLanguage)

diff --git a/src/js/translateService/yandexService.js b/src/js/translateService/yandexService.js
@@ -7,7  7,7 @@ const yandexService = () => {
     smallcase: 'ʏᴀɴᴅᴇx',
 
     getUrl: (sourceLanguage, targetLanguage, query) => {
-      sourceLanguage = sourceLanguage.split('-')[0]
       sourceLanguage = sourceLanguage ? sourceLanguage.split('-')[0] : null
       targetLanguage = targetLanguage.split('-')[0]
 
       const path = 'https://translate.yandex.net/api/v1.5/tr.json/translate'
@@ -20,7  20,7 @@ const yandexService = () => {
     },
 
     getSiteUrl: (sourceLanguage, targetLanguage, query) => {
-      sourceLanguage = sourceLanguage.split('-')[0]
       sourceLanguage = sourceLanguage ? sourceLanguage.split('-')[0] : null
       targetLanguage = targetLanguage.split('-')[0]
       return `https://translate.yandex.com/?lang=${sourceLanguage ? sourceLanguage   '-' : ''}${targetLanguage}&text=${encodeURI(query)}`
     },