zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use params from epp_session.js

Browse source 
Use bundled params instead of passing individual arguments through
epp_session.js.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=136384801
This commit is contained in:
mmuller 2016-10-17 13:00:10 -07:00 • committed by Ben McIlwain
parent 5da24fd361
commit ebeded4c74
3 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
java/google/registry/ui/js/registrar/console.js
View file

@ -47,10 +47,15 @@ goog.forwardDeclare('registry.Component');
* @final
*/
registry.registrar.Console = function(params) {
/**
* @type {!Object}
*/
// We have to define this before creating an EppSession because EppSession's
// constructor expects us to have it as an attribute.
this.params = params;
registry.registrar.Console.base(
this, 'constructor',
new registry.registrar.EppSession(this, params.xsrfToken,
params.clientId));
this, 'constructor', new registry.registrar.EppSession(this));
/**
* Component that's currently embedded in the page.
@ -63,11 +68,6 @@ registry.registrar.Console = function(params) {
// ready here.
this.history.setEnabled(true);
/**
* @type {!Object}
*/
this.params = params;
/**
* Last active nav element.
* @type {Element}

17
java/google/registry/ui/js/registrar/epp_session.js
View file

@ -27,15 +27,14 @@ goog.forwardDeclare('registry.registrar.Console');
/**
* Session state for console.
* @param {!registry.registrar.Console} console
* @param {string} xsrfToken Populated by server-side soy template.
* @param {string} clientId The logged in GAE user.
* @constructor
* @extends {registry.Session}
* @final
*/
registry.registrar.EppSession = function(console, xsrfToken, clientId) {
registry.registrar.EppSession = function(console) {
registry.registrar.EppSession.base(
this, 'constructor', new goog.Uri('/registrar-xhr'), xsrfToken,
this, 'constructor', new goog.Uri('/registrar-xhr'),
console.params.xsrfToken,
registry.Session.ContentType.EPP);
/**
@ -48,12 +47,6 @@ registry.registrar.EppSession = function(console, xsrfToken, clientId) {
* @private
*/
this.isEppLoggedIn_ = false;
/**
* @type {string}
* @private
*/
this.clientId_ = clientId;
};
goog.inherits(registry.registrar.EppSession, registry.Session);
@ -74,7 +67,7 @@ registry.registrar.EppSession.prototype.isEppLoggedIn = function() {
* @return {string} the clientId.
*/
registry.registrar.EppSession.prototype.getClientId = function() {
return this.clientId_;
return this.console.params.clientId;
};
@ -83,7 +76,7 @@ registry.registrar.EppSession.prototype.getClientId = function() {
* @param {function()} successCb to be called on success.
*/
registry.registrar.EppSession.prototype.login = function(successCb) {
var eppArgs = {clId: this.clientId_, clTrid: 'asdf-1235'};
var eppArgs = {clId: this.console.params.clientId, clTrid: 'asdf-1235'};
this.send(
registry.soy.registrar.epp.login(eppArgs).getContent(),
goog.bind(function(xml) {