From d4a7dbeb08365b84eae6f038f844aaf9788eedb5 Mon Sep 17 00:00:00 2001 From: Sipachev Igor Date: Fri, 15 Apr 2022 13:19:47 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=D0=B8=D0=BA=D1=83=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popup/src/api/DomainResolver.ts | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/popup/src/api/DomainResolver.ts b/popup/src/api/DomainResolver.ts index 26515da..0d61451 100644 --- a/popup/src/api/DomainResolver.ts +++ b/popup/src/api/DomainResolver.ts @@ -29,29 +29,24 @@ export class DomainResolver { const parts = url.match(/http:\/\/.*?\.(.*?)\..*?/) || [] const nickname = parts[1] || null - const isPlacetgroup = url.indexOf('laen') > -1 || - url.indexOf('smsmoney') > -1 || - url.indexOf('smsraha') > -1 || - url.indexOf('placetgroup') > -1 const isNordecum = url.indexOf('smspinigai') > -1 || url.indexOf('paskolos') > -1 || url.indexOf('nordecum') > -1 - if (!isPlacetgroup && !isNordecum) { + const project = isNordecum ? 'nordecum' : 'placetgroup' + const tld = isNordecum ? 'lt' : 'com' + const isLocal = url.indexOf('.sv') !== -1 + + if (isLocal && !nickname) { return null } - const project = isPlacetgroup ? 'placetgroup' : 'nordecum' - const tld = isPlacetgroup ? 'com' : 'lt' - const isLocal = url.indexOf('.sv') !== -1 - if (nickname && isLocal) { - url = project + '.' + nickname + '.sv' - } else { - url = 'dev.' + project + '.' + tld - } - url = (isLocal ? 'http://' : 'https://') + url - console.log('domain_resolver', parts, nickname, isPlacetgroup, project, tld, url) + url = isLocal + ? 'http://' + project + '.' + nickname + '.sv' + : 'https://dev.' + project + '.' + tld + + console.log('domain_resolver', parts, nickname, isNordecum, project, tld, url) return url } }