Commit e5d20424 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Elimina ajustes dinámicos de nombre y redirects 

Descarta las comprobaciones de dominio del lado del cliente para decidir
que título y otros elementos usar, ya que se dejan de usar múltiples
dominios simultáneamente.

Omite la dualidad de dominios de acceso, se continua a partir de ahora
con un único dominio sin valores alternativos.

Delega la responsabilidad de redirigir dominios con diferente dominio de
nivel superior.
parent 91a9ce01

client-app/src/app/App.js

+4 −12
Original line number Diff line number Diff line
@@ -94,10 +94,6 @@ define([ 


		constructor: function(args) {



			// TODO medida temporal de comienzo de migración de identidad

			var currDomain = globalThis.location.hostname,

				ecomarcanDomainPattern = /.*ecomarcan\..+/;



			this.config = {

				ownChannel: this.rootChannel,

				events: {
@@ -111,8 +107,7 @@ define([ 
					MODULE_CHANGED: 'moduleChanged'

				},



				_reconnectTimeout: 10000,

				_ecomarcan: ecomarcanDomainPattern.test(currDomain)

				_reconnectTimeout: 10000

			};



			lang.mixin(this, this.config, args);
@@ -145,8 +140,7 @@ define([ 
			});



			new MetaTags({

				parentChannel: parentChannel,

				ecomarcan: this._ecomarcan

				parentChannel: parentChannel

			});



			this._credentials = new Credentials({
@@ -369,8 +363,7 @@ define([ 
			this._deleteLayout();



			this._currLayoutInstance = new InnerLayoutImpl({

				parentChannel: this.getChannel(),

				ecomarcan: this._ecomarcan

				parentChannel: this.getChannel()

			});



			this._setCurrentLayout(this._currLayoutInstance);
@@ -388,8 +381,7 @@ define([ 
			this._deleteLayout();



			this._currLayoutInstance = new OuterLayoutImpl({

				parentChannel: this.getChannel(),

				ecomarcan: this._ecomarcan

				parentChannel: this.getChannel()

			});



			this._setCurrentLayout(this._currLayoutInstance);

client-app/src/app/component/Topbar.js

+1 −6
Original line number Diff line number Diff line
@@ -36,16 +36,11 @@ define([ 
				logoClass: 'topbarLogo',

				logoHref: '/home',

				logoImgSrc: '/res/images/logos/logo.svg',

				logoTextContent: 'ECOMARCAN',



				_isProductionEnvironment: (/true/i).test(redmicConfig.getEnvVariableValue('envProduction'))

			};



			if (args && args.ecomarcan) {

				this.config.logoTextContent = 'ECOMARCAN';

			} else {

				this.config.logoTextContent = 'REDMIC';

			}



			lang.mixin(this, this.config, args);

		},

client-app/src/app/component/layout/InnerLayoutImpl.js

+1 −2
Original line number Diff line number Diff line
@@ -200,8 +200,7 @@ define([ 


			this.topbar = new Topbar({

				parentChannel: this.getChannel(),

				collapseButtonClass: this.collapseButtonClass,

				ecomarcan: this.ecomarcan

				collapseButtonClass: this.collapseButtonClass

			});



			this.sidebar = new MainSidebarImpl({

client-app/src/app/component/meta/MetaTags.js

+1 −6
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ define([ 
					PUT_META_TAGS: 'putMetaTags'

				},



				nativeTitleSuffix: 'ECOMARCAN',

				ogTitleLimit: 60,

				twitterTitleLimit: 70,

				ogDescriptionLimit: 200,
@@ -41,12 +42,6 @@ define([ 
				_defaultKey: 'default'

			};



			if (args && args.ecomarcan) {

				this.config.nativeTitleSuffix = 'ECOMARCAN';

			} else {

				this.config.nativeTitleSuffix = 'REDMIC';

			}



			lang.mixin(this, this.config, args);

		},

deploy/.env

+2 −3
Original line number Diff line number Diff line 
OAUTH_URL=https://api.domain/oauth

OAUTH_CLIENT_ID=app

OAUTH_CLIENT_SECRET=secret



API_URL=https://api.domain

CONFIG_URL=https://s3.eu-west-1.amazonaws.com/mediastorage.redmic/public/config.json

SITEMAP_URL=https://s3.eu-west-1.amazonaws.com/mediastorage.redmic/public/sitemap.xml



PRERENDER_URL=http://prerender:3000

PRERENDER_PROTOCOL=https



TRAEFIK_ENTRYPOINT=http

PUBLIC_HOSTNAME=change.me
 
ALT_TRAEFIK_DOMAIN_NAME=alternative

ALT_TRAEFIK_SECONDARY_TLDS=es|com|net

ALT_TRAEFIK_PRIMARY_TLD=org