merge fix

Author: TalAviel

lib/strategies/webapp-strategy.js

@@ -74,17 +74,6 @@ WebAppStrategy.logout = function (req) {
 	req.logout();
 }
 
-// legacy static version, does not log event to the auth server
-WebAppStrategy.logout = function (req) {
-	finishLogout(req);
-};
-
-// preferred non-static version, logs event to the auth server
-WebAppStrategy.prototype.logout = function (req) {
-	logAction(req, this.serviceConfig.getOAuthServerUrl(), LOGOUT_ACTIVITY);
-	finishLogout(req);
-};
-
 WebAppStrategy.prototype.setPreferredLocale = function (req, language) {
 
 	// Check that express-session is enabled
@@ -493,47 +482,8 @@ function retrieveTokens(formData, strategy) {
 				});
 			}
 		});
-
-function addLocaleToQuery(req, url, strategy) {
-	const localeToUse = strategy.getPreferredLocale(req);
-	if (localeToUse) {
-		url += "&" + LOCALE_PARAM_NAME + "=" + encodeURIComponent(localeToUse);
-	} else {
-		if (req && req.headers && req.headers['accept-language']) {
-			let language = acceptLanguage.get(req.headers['accept-language']);
-			url += "&" + LOCALE_PARAM_NAME + "=" + encodeURIComponent(language);
-		}
-	}
-	return url;
+	});
 }
 
-function logAction(req, url, activity) {
-	logger.debug("logAction");
-	const loggingEndpoint = url + LOGGING_PATH;
-	const appIdAuthContext = req.session[WebAppStrategy.AUTH_CONTEXT];
-	if (!appIdAuthContext || !appIdAuthContext.accessToken || !appIdAuthContext.identityToken) {
-		logger.debug("no session tokens found for logging activity " + activity );
-		return;
-	}
-
-	let requestData = {
-		'eventName': activity,
-		'id_token': appIdAuthContext.identityToken
-	}
-
-	request({
-		'method': "POST",
-		'url': loggingEndpoint,
-		'json': requestData,
-		'auth': {
-			'bearer': appIdAuthContext.accessToken
-		}
-	}, function (error, response, body){
-		if (error) {
-			logger.debug('logging request error: ' + error);
-		} else {
-			logger.debug('logging request ok: ' + response.statusCode);
-		}});
-}
 
 module.exports = WebAppStrategy;