opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

109
web/core/modules/user/user.js
View file

@ -1,24 +1,13 @@
/**
* @file
* User behaviors.
*/
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* @preserve
**/
(function ($, Drupal, drupalSettings) {
'use strict';
/**
* Attach handlers to evaluate the strength of any password fields and to
* check that its confirmation is correct.
*
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
* Attaches password strength indicator and other relevant validation to
* password fields.
*/
Drupal.behaviors.password = {
attach: function (context, settings) {
attach: function attach(context, settings) {
var $passwordInput = $(context).find('input.js-password-field').once('password');
if ($passwordInput.length) {
@ -26,23 +15,16 @@
var $passwordInputParent = $passwordInput.parent();
var $passwordInputParentWrapper = $passwordInputParent.parent();
var $passwordSuggestions;
var $passwordSuggestions = void 0;
// Add identifying class to password element parent.
$passwordInputParent.addClass('password-parent');
// Add the password confirmation layer.
$passwordInputParentWrapper
.find('input.js-password-confirm')
.parent()
.append('<div aria-live="polite" aria-atomic="true" class="password-confirm js-password-confirm">' + translate.confirmTitle + ' <span></span></div>')
.addClass('confirm-parent');
$passwordInputParentWrapper.find('input.js-password-confirm').parent().append('<div aria-live="polite" aria-atomic="true" class="password-confirm js-password-confirm">' + translate.confirmTitle + ' <span></span></div>').addClass('confirm-parent');
var $confirmInput = $passwordInputParentWrapper.find('input.js-password-confirm');
var $confirmResult = $passwordInputParentWrapper.find('div.js-password-confirm');
var $confirmChild = $confirmResult.find('span');
// If the password strength indicator is enabled, add its markup.
if (settings.password.showStrengthIndicator) {
var passwordMeter = '<div class="password-strength"><div class="password-strength__meter"><div class="password-strength__indicator js-password-strength__indicator"></div></div><div aria-live="polite" aria-atomic="true" class="password-strength__title">' + translate.strengthTitle + ' <span class="password-strength__text js-password-strength__text"></span></div></div>';
$confirmInput.parent().after('<div class="password-suggestions description"></div>');
@ -50,75 +32,46 @@
$passwordSuggestions = $passwordInputParentWrapper.find('div.password-suggestions').hide();
}
// Check that password and confirmation inputs match.
var passwordCheckMatch = function (confirmInputVal) {
var passwordCheckMatch = function passwordCheckMatch(confirmInputVal) {
var success = $passwordInput.val() === confirmInputVal;
var confirmClass = success ? 'ok' : 'error';
// Fill in the success message and set the class accordingly.
$confirmChild.html(translate['confirm' + (success ? 'Success' : 'Failure')])
.removeClass('ok error').addClass(confirmClass);
$confirmChild.html(translate['confirm' + (success ? 'Success' : 'Failure')]).removeClass('ok error').addClass(confirmClass);
};
// Check the password strength.
var passwordCheck = function () {
var passwordCheck = function passwordCheck() {
if (settings.password.showStrengthIndicator) {
// Evaluate the password strength.
var result = Drupal.evaluatePasswordStrength($passwordInput.val(), settings.password);
// Update the suggestions for how to improve the password.
if ($passwordSuggestions.html() !== result.message) {
$passwordSuggestions.html(result.message);
}
// Only show the description box if a weakness exists in the
// password.
$passwordSuggestions.toggle(result.strength !== 100);
// Adjust the length of the strength indicator.
$passwordInputParent.find('.js-password-strength__indicator')
.css('width', result.strength + '%')
.removeClass('is-weak is-fair is-good is-strong')
.addClass(result.indicatorClass);
$passwordInputParent.find('.js-password-strength__indicator').css('width', result.strength + '%').removeClass('is-weak is-fair is-good is-strong').addClass(result.indicatorClass);
// Update the strength indication text.
$passwordInputParent.find('.js-password-strength__text').html(result.indicatorText);
}
// Check the value in the confirm input and show results.
if ($confirmInput.val()) {
passwordCheckMatch($confirmInput.val());
$confirmResult.css({visibility: 'visible'});
}
else {
$confirmResult.css({visibility: 'hidden'});
$confirmResult.css({ visibility: 'visible' });
} else {
$confirmResult.css({ visibility: 'hidden' });
}
};
// Monitor input events.
$passwordInput.on('input', passwordCheck);
$confirmInput.on('input', passwordCheck);
}
}
};
/**
* Evaluate the strength of a user's password.
*
* Returns the estimated strength and the relevant output message.
*
* @param {string} password
* The password to evaluate.
* @param {object} translate
* An object containing the text to display for each strength level.
*
* @return {object}
* An object containing strength, message, indicatorText and indicatorClass.
*/
Drupal.evaluatePasswordStrength = function (password, translate) {
password = password.trim();
var indicatorText;
var indicatorClass;
var indicatorText = void 0;
var indicatorClass = void 0;
var weaknesses = 0;
var strength = 100;
var msg = [];
@ -128,18 +81,14 @@
var hasNumbers = /[0-9]/.test(password);
var hasPunctuation = /[^a-zA-Z0-9]/.test(password);
// If there is a username edit box on the page, compare password to that,
// otherwise use value from the database.
var $usernameBox = $('input.username');
var username = ($usernameBox.length > 0) ? $usernameBox.val() : translate.username;
var username = $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
// Lose 5 points for every character less than 12, plus a 30 point penalty.
if (password.length < 12) {
msg.push(translate.tooShort);
strength -= ((12 - password.length) * 5) + 30;
strength -= (12 - password.length) * 5 + 30;
}
// Count weaknesses.
if (!hasLowercase) {
msg.push(translate.addLowerCase);
weaknesses++;
@ -157,7 +106,6 @@
weaknesses++;
}
// Apply penalty for each weakness (balanced against length penalty).
switch (weaknesses) {
case 1:
strength -= 12.5;
@ -176,33 +124,26 @@
break;
}
// Check if password is the same as the username.
if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
msg.push(translate.sameAsUsername);
// Passwords the same as username are always very weak.
strength = 5;
}
// Based on the strength, work out what text should be shown by the
// password strength meter.
if (strength < 60) {
indicatorText = translate.weak;
indicatorClass = 'is-weak';
}
else if (strength < 70) {
} else if (strength < 70) {
indicatorText = translate.fair;
indicatorClass = 'is-fair';
}
else if (strength < 80) {
} else if (strength < 80) {
indicatorText = translate.good;
indicatorClass = 'is-good';
}
else if (strength <= 100) {
} else if (strength <= 100) {
indicatorText = translate.strong;
indicatorClass = 'is-strong';
}
// Assemble the final message.
msg = translate.hasWeaknesses + '<ul><li>' + msg.join('</li><li>') + '</li></ul>';
return {
@ -211,7 +152,5 @@
indicatorText: indicatorText,
indicatorClass: indicatorClass
};
};
})(jQuery, Drupal, drupalSettings);
})(jQuery, Drupal, drupalSettings);