Attachment #4542 for bug #27936

View | Details | Raw Unified | Return to bug 27936
Collapse All | Expand All




			umc.tools.status('overview', umc.tools.isTrue(props.overview));
		}

		umc.dialog.login().then(dojo.hitch(this, 'onLogin'));
			// username and password are given, try to login directly
			umc.dialog.login().then(dojo.hitch(this, 'onLogin'));
			return;
		}

		// check whether we still have a possibly valid cookie
		var sessionCookie = dojo.cookie('UMCSessionId');
		var usernameCookie = dojo.cookie('UMCUsername');
		if (undefined !== sessionCookie && usernameCookie !== undefined
			&& (!umc.tools.status('username') || umc.tools.status('username') == usernameCookie)) {
			// the following conditions need to be given for an automatic login
			// * session and username need to be set via cookie
			// * if a username is given via the query string, it needs to match the
			//   username saved in the cookie
			this.onLogin(dojo.cookie('UMCUsername'));
		}
		else {
			umc.dialog.login().then(dojo.hitch(this, 'onLogin'));
		}
	},

	onLogin: function(username) {

		dojo.cookie('UMCUsername', username, { expires: 100, path: '/' });
		umc.tools.status('username', username);

		// set the UCR session timeout value
		umc.tools.ucr('umc/http/session/timeout').then( function(res) {
			umc.tools._sessionTimeout = parseInt( res['umc/http/session/timeout'] , 10 );
		} );

		// start the timer for session checking
		umc.tools.checkSession(true);


(-)umc/widgets/Uploader.js (-2 / +3 lines)

Lines 175-183	Link Here

175

							dojo.mixin(params, this.dynamicOptions);

175

							dojo.mixin(params, this.dynamicOptions);

176

177

178

					// mixin the iframe information

178

					// mixin the iframe information and sessionID

179

					dojo.mixin(params, {

179

					dojo.mixin(params, {

180

						iframe: (this._uploader.uploadType === 'iframe') ? true : false

180

						iframe: (this._uploader.uploadType === 'iframe'),

181

						'X-UMC-Session-Id': umc.tools.getSessionId()

181

});

182

});

182

					this._uploader.upload(params);

183

					this._uploader.upload(params);

183

					this.onUploadStarted(data[0]);

184

					this.onUploadStarted(data[0]);

(-)umc/widgets/LoginDialog.js (-1 / +3 lines)

Lines 232-238	Link Here

232

		this.standby(true);

232

		this.standby(true);

233

		umc.tools.umcpCommand('auth', {

233

		umc.tools.umcpCommand('auth', {

234

			username: username,

234

			username: username,

235

			password: password

235

			password: password,

236

			// send also the version of the UMC frontend package

237

			version: umc.tools.status('version')

236

		}).then(dojo.hitch(this, function(data) {

238

		}).then(dojo.hitch(this, function(data) {

237

			// disable standby in any case

239

			// disable standby in any case

238

			this.standby(false);

240

			this.standby(false);

(-)umc/dialog.js (-1 / +2 lines)

Lines 68-74	Link Here

			// try to authenticate via long polling... i.e., in case of an error try again until it works

			// try to authenticate via long polling... i.e., in case of an error try again until it works

			this._loginDeferred = umc.tools.umcpCommand('auth', {

			this._loginDeferred = umc.tools.umcpCommand('auth', {

				username: username,

				username: username,

				password: password

				password: password,

				version: umc.tools.status('version')

			}, false, undefined, {

			}, false, undefined, {

				message: this._('So far the authentification failed. Continuing nevertheless.'),

				message: this._('So far the authentification failed. Continuing nevertheless.'),

				noLogin: true

				noLogin: true




}));
dojo.mixin(umc.tools, {

	_sessionID: '',
	_sessionDuration: 0,
	_sessionTimeout: 300,

	_status: {
		username: null,

		displayUsername: true,
		width: null,
		setupGui: false,
		loggingIn: false,
		version: ''
	},

	status: function(/*String?*/ key, /*Mixed?*/ value) {

		//		With two parameters, sets the value of the specified key.
		//		Also contains the properties given
		//		to `umc.app.start()`. The following properties exist:
		//		* version (String): The version of the UMC frontend package.
		//		* username (String): The username of the authenticated user.
		//		* hostname (String): The hostname on which the UMC is running.
		//		* domainname (String): The domainname on which the UMC is running.

		return undefined;
	},

	getSessionId: function() {
		return this._sessionID;
	},

	setSession: function(/*String*/ sessionID, /*Integer*/ duration) {
		// summary:
		// 		sets the sessionid and sessiontimeout
		// sessionID: String
		// 		the session id
		// duration: Integer
		// 		the session timeout in milliseconds
		this._sessionID = sessionID;
		this._sessionDuration = duration;
	},

	checkSessionActive: function() {
		return this._sessionID && this._sessionDuration > 0;
	},

	closeSession: function() {
		// summary:
		//		Reset the session in order to close the session from the client side.
		this.setSession('', -1);
			expires: -1,
			path: '/'
		});
	},

	holdSession: function(/*String*/ id) {
		// summary:
		//		Set the expiration time of the current session in to 24 hours.
		// id: String
		//		If specified, the session ID will be set to this value, otherwise the
		//		ID will not change.
		this.setSession(id || this._sessionID, 1000 * 60 * 60 * 24);
		dojo.cookie('UMCSessionId', id || dojo.cookie('UMCSessionId'), {
			expires: date.toUTCString(),
			path: '/'
		});
	},

	_renewIESession : function() {
		// summary:
		//		Reset the Internet Explorer Session. Internet Explorer can not handle max-age cookies.
		//		This is required for automatically show the login dialogue when the session is expired.
		if(dojo.isIE !== undefined) {
			var date = new Date((new Date()).getTime() + 1000 * this._sessionTimeout);
			dojo.cookie('UMCSessionId', dojo.cookie('UMCSessionId'), {
				expires: date.toUTCString(),
				path: '/'
			});
		}
	},

	_checkSessionTimer: null,

	checkSession: function(enable) {

			// create a new timer instance
			this._checkSessionTimer = new dojox.timing.Timer(1000);
			this._checkSessionTimer.onTick = function() {
				if (!umc.tools.checkSessionActive()) {
					umc.tools._checkSessionTimer.stop();
					if (umc.tools.status['loggingIn']) {
						// login dialog is already running

							umc.tools._checkSessionTimer.start();
						}
					});
				} else {
					umc.tools._sessionDuration -= 1000;
				}
			};
		}

	_PollingHandler: function(url, content, finishedDeferred, opts) {
		// save the current session ID locally, as the cookie might expire when
		// the time and timezone settings are updated
		var _oldSessionID = umc.tools.getSessionId();

		return {
			finishedDeferred: finishedDeferred,


			sendRequest: function() {
				// switch off the automatic check for session timeout...
				// the problem here is as follows, we do not receive a response,
				// therefore the cookie is not updated (which is checked for the
				// session timeout), however, the server will renew the session
				// with each valid request that it receives
				var currentSessionID = umc.tools.getSessionId();
				if (!currentSessionID) {
					// restore last valid session ID
					currentSessionID = _oldSessionID;
				}


				// send AJAX command
				this._lastRequestTime = (new Date()).getTime();
				var xhrRequest = dojo.xhrPost({
					url: this.url,
					preventCache: true,
					handleAs: 'json',
					headers: {
						'Content-Type': 'application/json',
						'X-UMC-Session-Id': umc.tools.getSessionId()
					},
					postData: this.content,
					timeout: 1000 * this.xhrTimeout
				});
				xhrRequest.then(dojo.hitch(this, function(data) {
					// request finished
					if (xhrRequest.ioArgs.xhr.getResponseHeader('X-UMC-Session-Id')) {
						// reset the sessionId and sessionTimeout
						umc.tools.setSession(xhrRequest.ioArgs.xhr.getResponseHeader('X-UMC-Session-Id'), 1000 * parseInt(xhrRequest.ioArgs.xhr.getResponseHeader('X-UMC-Session-Timeout')));
					}
					this._dialog.hide();
					this._dialog.destroyRecursive();
					this.finishedDeferred.resolve(data);

		}
		else {
			// normal AJAX call
			var xcall = dojo.xhrPost({
				url: url,
				preventCache: true,
				handleAs: 'json',
				headers: {
					'Content-Type': 'application/json',
					'X-UMC-Session-Id': umc.tools.getSessionId()
				},
				postData: body
			});

			var call = xcall.then(function(data) {
				if (xcall.ioArgs.xhr.getResponseHeader('X-UMC-Session-Id')) {
					// reset the sessionId and sessionTimeout
					umc.tools.setSession(xcall.ioArgs.xhr.getResponseHeader('X-UMC-Session-Id'), 1000 * parseInt(xcall.ioArgs.xhr.getResponseHeader('X-UMC-Session-Timeout')));
				}
				return data;
			});


Return to bug 27936