Merge pull request #311 from OneNoteDev/bug/fix-third-party-cookie-message

Show browser-specific third-party cookie message

Author: leakymemory

Diff for: src/scripts/clipperUI/panels/signInPanel.tsx

@@ -66,6 +66,7 @@ class SignInPanelClass extends ComponentBase<SignInPanelState, SignInPanelProps>
 
 	signInFailureThirdPartyCookiesBlocked(): boolean {
 		return this.signInAttempted()
+			&& !this.props.clipperState.userResult.data.user
 			&& !this.props.clipperState.userResult.data.writeableCookies;
 	}
 
@@ -115,9 +116,26 @@ class SignInPanelClass extends ComponentBase<SignInPanelState, SignInPanelProps>
 		if (this.signInFailureContainsErrorDescription()) {
 			return this.props.clipperState.userResult.data.errorDescription;
 		} else if (this.signInFailureThirdPartyCookiesBlocked()) {
+
+			let browserSpecificMessage = "";
+			switch (this.props.clipperState.clientInfo.clipperType) {
+				case ClientType.ChromeExtension:
+					browserSpecificMessage = Localization.getLocalizedString("WebClipper.Error.CookiesDisabled.Chrome");
+					break;
+				case ClientType.EdgeExtension:
+					browserSpecificMessage = Localization.getLocalizedString("WebClipper.Error.CookiesDisabled.Edge");
+					break;
+				case ClientType.FirefoxExtension:
+					browserSpecificMessage = Localization.getLocalizedString("WebClipper.Error.CookiesDisabled.Firefox");
+					break;
+				default:
+					browserSpecificMessage = Localization.getLocalizedString("WebClipper.Error.CookiesDisabled.Line2");
+					break;
+			}
+
 			return <div>
 				<div class={Constants.Ids.signInErrorCookieInformation}>{Localization.getLocalizedString("WebClipper.Error.CookiesDisabled.Line1")}</div>
-				<div class={Constants.Ids.signInErrorCookieInformation}>{Localization.getLocalizedString("WebClipper.Error.CookiesDisabled.Line2")}</div>
+				<div class={Constants.Ids.signInErrorCookieInformation}>{browserSpecificMessage}</div>
 			</div>;
 		}
 

Diff for: src/strings.json

@@ -46,6 +46,9 @@
 	"WebClipper.Error.CannotClipPage": "Sorry, this type of page can\u0027t be clipped.",
 	"WebClipper.Error.CookiesDisabled.Line1": "Cookies must be enabled in order for OneNote Web Clipper to work correctly.",
 	"WebClipper.Error.CookiesDisabled.Line2": "Please allow third-party cookies in your browser or add the onenote.com and live.com domains as an exception.",
+	"WebClipper.Error.CookiesDisabled.Chrome": "Please allow third-party cookies in your browser or add the [*.]onenote.com and [*.]live.com domains as an exception.",
+	"WebClipper.Error.CookiesDisabled.Edge": "Please allow third-party cookies in your browser.",
+	"WebClipper.Error.CookiesDisabled.Firefox": "Please allow third-party cookies in your browser or add the https://onenote.com and https://live.com domains as an exception.",
 	"WebClipper.Error.CorruptedSection": "Your clip can\u0027t be saved here because the section is corrupt.",
 	"WebClipper.Error.GenericError": "Something went wrong. Please try clipping the page again.",
 	"WebClipper.Error.GenericExpiredTokenRefreshError": "Your login session has ended and we were unable to clip the page. Please sign in again.",