Revert "clipper telemetry fix (#567)" (#569)

This reverts commit 70b40f9.

Author: ArpanKundu97

package-lock.json

@@ -31,15 +31,15 @@ export class InlineWorker extends ExtensionWorkerBase<any, any> {
 		let injectMessageHandlerThunk = () => { return new IFrameMessageHandler(() => parent); };
 		super(clientInfo, auth, new ClipperData(new LocalStorage()), uiMessageHandlerThunk, injectMessageHandlerThunk);
 
-		this.logger.then(sessionLogger => sessionLogger.setContextProperty(Log.Context.Custom.InPrivateBrowsing, Log.unknownValue));
+		this.logger.setContextProperty(Log.Context.Custom.InPrivateBrowsing, Log.unknownValue);
 
 		let invokeOptions = {
 			invokeMode: InvokeMode.Default
 		};
 		this.sendInvokeOptionsToInject(invokeOptions);
 
 		// The inline worker gets created after the UI was successfully inject, so we can safely log this here
-		this.logger.then(sessionLogger => sessionLogger.logUserFunnel(Log.Funnel.Label.Invoke));
+		this.logger.logUserFunnel(Log.Funnel.Label.Invoke);
 		this.logClipperInvoke({
 			invokeSource: InvokeSource.Bookmarklet
 		}, invokeOptions);
@@ -82,8 +82,8 @@ export class InlineWorker extends ExtensionWorkerBase<any, any> {
 	 * authentication. Otherwise, it resolves with true if the redirect endpoint was hit as a result of a successful
 	 * sign in attempt, and false if it was not hit (e.g., user manually closed the popup)
 	 */
-	protected async doSignInAction(authType: AuthType): Promise<boolean> {
-		let usidQueryParamValue = await this.getUserSessionIdQueryParamValue();
+	protected doSignInAction(authType: AuthType): Promise<boolean> {
+		let usidQueryParamValue = this.getUserSessionIdQueryParamValue();
 		let signInUrl = ClipperUrls.generateSignInUrl(this.clientInfo.get().clipperId, usidQueryParamValue, AuthType[authType]);
 
 		return this.launchPopupAndWaitForClose(signInUrl);
@@ -93,19 +93,18 @@ export class InlineWorker extends ExtensionWorkerBase<any, any> {
 	 * Signs the user out
 	 */
 	protected doSignOutAction(authType: AuthType) {
-		this.getUserSessionIdQueryParamValue().then(usidQueryParamValue => {
-			let signOutUrl = ClipperUrls.generateSignOutUrl(this.clientInfo.get().clipperId, usidQueryParamValue, AuthType[authType]);
-
-			let iframe = document.createElement("iframe");
-			iframe.hidden = true;
-			iframe.style.display = "none";
-			iframe.src = signOutUrl;
-			document.body.appendChild(iframe);
-		});
+		let usidQueryParamValue = this.getUserSessionIdQueryParamValue();
+		let signOutUrl = ClipperUrls.generateSignOutUrl(this.clientInfo.get().clipperId, usidQueryParamValue, AuthType[authType]);
+
+		let iframe = document.createElement("iframe");
+		iframe.hidden = true;
+		iframe.style.display = "none";
+		iframe.src = signOutUrl;
+		document.body.appendChild(iframe);
 	}
 
 	private throwNotImplementedFailure(): any {
-		this.logger.then(sessionLogger => sessionLogger.logFailure(Log.Failure.Label.NotImplemented, Log.Failure.Type.Unexpected));
+		this.logger.logFailure(Log.Failure.Label.NotImplemented, Log.Failure.Type.Unexpected);
 		throw new Error("not implemented");
 	}
 }

src/scripts/extensions/bookmarklet/inlineWorker.ts

@@ -51,7 +51,7 @@ export abstract class ExtensionBase<TWorker extends ExtensionWorkerBase<TTab, TT
 		ExtensionBase.extensionId = StringUtils.generateGuid();
 
 		this.clipperData = clipperData;
-		this.clipperData.setLogger(Promise.resolve(this.logger));
+		this.clipperData.setLogger(this.logger);
 		this.auth = new AuthenticationHelper(this.clipperData, this.logger);
 		this.tooltip = new TooltipHelper(this.clipperData);
 
@@ -281,7 +281,7 @@ export abstract class ExtensionBase<TWorker extends ExtensionWorkerBase<TTab, TT
 			Promise.all([lastSeenTooltipTimeBase, numTimesTooltipHasBeenSeenBase]).then((values) => {
 				tooltipImpressionEvent.setCustomProperty(Log.PropertyName.Custom.LastSeenTooltipTime, values[0]);
 				tooltipImpressionEvent.setCustomProperty(Log.PropertyName.Custom.NumTimesTooltipHasBeenSeen, values[1]);
-				worker.getLogger().then(sessionLogger => sessionLogger.logEvent(tooltipImpressionEvent));
+				worker.getLogger().logEvent(tooltipImpressionEvent);
 			});
 		});
 	}
@@ -300,7 +300,7 @@ export abstract class ExtensionBase<TWorker extends ExtensionWorkerBase<TTab, TT
 					if (wasInvoked) {
 						let whatsNewImpressionEvent = new Log.Event.BaseEvent(Log.Event.Label.WhatsNewImpression);
 						whatsNewImpressionEvent.setCustomProperty(Log.PropertyName.Custom.FeatureEnabled, wasInvoked);
-						worker.getLogger().then(sessionLogger => sessionLogger.logEvent(whatsNewImpressionEvent));
+						worker.getLogger().logEvent(whatsNewImpressionEvent);
 
 						// We don't want to do this if the tooltip was not invoked (e.g., on about:blank) so we can show it at the next opportunity
 						this.updateLastSeenVersionInStorageToCurrent();