discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Make the login error message more informative if cookies are disabled

Browse Source
This commit is contained in:
Dan Ungureanu 2018-07-23 02:50:41 +02:00 committed by Sam
parent 37b726982d
commit b14cd2f179
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@ -4,7 +4,7 @@ import showModal from "discourse/lib/show-modal";
import { setting } from "discourse/lib/computed"; import { setting } from "discourse/lib/computed";
import { findAll } from "discourse/models/login-method"; import { findAll } from "discourse/models/login-method";
import { escape } from "pretty-text/sanitizer"; import { escape } from "pretty-text/sanitizer";
import { escapeExpression } from "discourse/lib/utilities"; import { escapeExpression, areCookiesEnabled } from "discourse/lib/utilities";
import { extractError } from "discourse/lib/ajax-error"; import { extractError } from "discourse/lib/ajax-error";
import computed from "ember-addons/ember-computed-decorators"; import computed from "ember-addons/ember-computed-decorators";
import { SECOND_FACTOR_METHODS } from "discourse/models/user"; import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@ -180,6 +180,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
// Failed to login // Failed to login
if (e.jqXHR && e.jqXHR.status === 429) { if (e.jqXHR && e.jqXHR.status === 429) {
self.flash(I18n.t("login.rate_limit"), "error"); self.flash(I18n.t("login.rate_limit"), "error");
} else if (!areCookiesEnabled()) {
self.flash(I18n.t("login.cookies_error"), "error");
} else { } else {
self.flash(I18n.t("login.error"), "error"); self.flash(I18n.t("login.error"), "error");
} }

12
app/assets/javascripts/discourse/lib/utilities.js.es6
View File

@ -617,5 +617,17 @@ export function fillMissingDates(data, startDate, endDate) {
return data; return data;
} }
export function areCookiesEnabled() {
// see: https://github.com/Modernizr/Modernizr/blob/400db4043c22af98d46e1d2b9cbc5cb062791192/feature-detects/cookies.js
try {
document.cookie = 'cookietest=1';
var ret = document.cookie.indexOf('cookietest=') !== -1;
document.cookie = 'cookietest=1; expires=Thu, 01-Jan-1970 00:00:01 GMT';
return ret;
} catch (e) {
return false;
}
};
// This prevents a mini racer crash // This prevents a mini racer crash
export default {}; export default {};

1
config/locales/client.en.yml
View File

@ -1171,6 +1171,7 @@ en:
email_placeholder: "email or username" email_placeholder: "email or username"
caps_lock_warning: "Caps Lock is on" caps_lock_warning: "Caps Lock is on"
error: "Unknown error" error: "Unknown error"
cookies_error: "Your browsers seems to have cookies disabled. You might not be able to log in without enabling them first."
rate_limit: "Please wait before trying to log in again." rate_limit: "Please wait before trying to log in again."
blank_username: "Please enter your email or username." blank_username: "Please enter your email or username."
blank_username_or_password: "Please enter your email or username, and password." blank_username_or_password: "Please enter your email or username, and password."