Create a login bundle for login page scripts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst
Morris Jobke
parent
2cfe4fdd4a
commit
3cc8c9b769
12 changed files with 250 additions and 258 deletions
BIN
core/js/dist/login.js
vendored
Normal file
BIN
core/js/dist/login.js
vendored
Normal file
Binary file not shown.
BIN
core/js/dist/login.js.map
vendored
Normal file
BIN
core/js/dist/login.js.map
vendored
Normal file
Binary file not shown.
BIN
core/js/dist/main.js
vendored
BIN
core/js/dist/main.js
vendored
Binary file not shown.
BIN
core/js/dist/main.js.map
vendored
BIN
core/js/dist/main.js.map
vendored
Binary file not shown.
|
|
@ -1,50 +0,0 @@
|
|||
/**
|
||||
* Copyright (c) 2015
|
||||
* Vincent Petry <pvince81@owncloud.com>
|
||||
* Jan-Christoph Borchardt, http://jancborchardt.net
|
||||
* This file is licensed under the Affero General Public License version 3 or later.
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @namespace
|
||||
* @memberOf OC
|
||||
* @private
|
||||
*/
|
||||
OC.Login = _.extend(OC.Login || {}, {
|
||||
onLogin: function () {
|
||||
// Only if password reset form is not active
|
||||
if($('form[name=login][action]').length === 0) {
|
||||
$('#submit-wrapper .submit-icon')
|
||||
.removeClass('icon-confirm-white')
|
||||
.addClass(OCA.Theming && OCA.Theming.inverted
|
||||
? 'icon-loading-small'
|
||||
: 'icon-loading-small-dark');
|
||||
$('#submit')
|
||||
.attr('value', t('core', 'Logging in …'));
|
||||
$('.login-additional').fadeOut();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
|
||||
rememberLogin: function(){
|
||||
if($(this).is(":checked")){
|
||||
if($("#user").val() && $("#password").val()) {
|
||||
$('#submit').trigger('click');
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$(document).ready(function() {
|
||||
$('form[name=login]').submit(OC.Login.onLogin);
|
||||
|
||||
$('#remember_login').click(OC.Login.rememberLogin);
|
||||
|
||||
var clearParamRegex = new RegExp('clear=1');
|
||||
if (clearParamRegex.test(window.location.href)) {
|
||||
window.localStorage.clear();
|
||||
window.sessionStorage.clear();
|
||||
}
|
||||
});
|
||||
|
|
@ -1,199 +0,0 @@
|
|||
|
||||
OC.Lostpassword = {
|
||||
sendErrorMsg : t('core', 'Couldn\'t send reset email. Please contact your administrator.'),
|
||||
|
||||
sendSuccessMsg : t('core', 'We have send a password reset e-mail to the e-mail address known to us for this account. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.'),
|
||||
|
||||
encryptedMsg : t('core', "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?")
|
||||
+ ('<br /><input type="checkbox" id="encrypted-continue" class="checkbox checkbox--white" value="Yes" />')
|
||||
+ '<label for="encrypted-continue">'
|
||||
+ t('core', 'I know what I\'m doing')
|
||||
+ '</label><br />',
|
||||
|
||||
resetErrorMsg : t('core', 'Password can not be changed. Please contact your administrator.'),
|
||||
|
||||
init : function() {
|
||||
$('#lost-password[href=""]').click(OC.Lostpassword.resetLink);
|
||||
$('#lost-password-back').click(OC.Lostpassword.backToLogin);
|
||||
$('form[name=login]').submit(OC.Lostpassword.onSendLink);
|
||||
$('#reset-password #submit').click(OC.Lostpassword.resetPassword);
|
||||
OC.Lostpassword.resetButtons();
|
||||
},
|
||||
|
||||
resetButtons : function() {
|
||||
$('#reset-password-wrapper .submit-icon')
|
||||
.addClass('icon-confirm-white')
|
||||
.removeClass('icon-loading-small-dark');
|
||||
$('#reset-password-submit')
|
||||
.attr('value', t('core', 'Reset password'))
|
||||
.prop('disabled', false);
|
||||
$('#user').prop('disabled', false);
|
||||
$('.login-additional').fadeIn();
|
||||
},
|
||||
|
||||
backToLogin : function(event) {
|
||||
event.preventDefault();
|
||||
|
||||
$('#reset-password-wrapper').slideUp().fadeOut();
|
||||
$('#lost-password').slideDown().fadeIn();
|
||||
$('#lost-password-back').hide();
|
||||
$('.remember-login-container').slideDown().fadeIn();
|
||||
$('#submit-wrapper').slideDown().fadeIn();
|
||||
$('.groupbottom').slideDown().fadeIn();
|
||||
$('#user').parent().addClass('grouptop');
|
||||
$('#password').attr('required', true);
|
||||
$('form[name=login]').removeAttr('action');
|
||||
$('#user').focus();
|
||||
},
|
||||
|
||||
resetLink : function(event){
|
||||
event.preventDefault();
|
||||
|
||||
$('#lost-password').hide();
|
||||
$('.wrongPasswordMsg').hide();
|
||||
$('#lost-password-back').slideDown().fadeIn();
|
||||
$('.remember-login-container').slideUp().fadeOut();
|
||||
$('#submit-wrapper').slideUp().fadeOut();
|
||||
$('.groupbottom').slideUp().fadeOut(function(){
|
||||
$('#user').parent().removeClass('grouptop');
|
||||
});
|
||||
$('#reset-password-wrapper').slideDown().fadeIn();
|
||||
$('#password').attr('required', false);
|
||||
$('form[name=login]').attr('action', 'lostpassword/email');
|
||||
$('#user').focus();
|
||||
|
||||
// Generate a browser warning for required fields if field empty
|
||||
if ($('#user').val().length === 0) {
|
||||
$('#submit').trigger('click');
|
||||
} else {
|
||||
if (OC.config.lost_password_link === 'disabled') {
|
||||
return;
|
||||
} else if (OC.config.lost_password_link) {
|
||||
window.location = OC.config.lost_password_link;
|
||||
} else {
|
||||
OC.Lostpassword.onSendLink();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
onSendLink: function (event) {
|
||||
// Only if password reset form is active
|
||||
if($('form[name=login][action]').length === 1) {
|
||||
if (event) {
|
||||
event.preventDefault();
|
||||
}
|
||||
$('#reset-password-wrapper .submit-icon')
|
||||
.removeClass('icon-confirm-white')
|
||||
.addClass('icon-loading-small-dark');
|
||||
$('#reset-password-submit')
|
||||
.attr('value', t('core', 'Sending email …'))
|
||||
.prop('disabled', true);
|
||||
$('#user').prop('disabled', true);
|
||||
$('.login-additional').fadeOut();
|
||||
$.post(
|
||||
OC.generateUrl('/lostpassword/email'),
|
||||
{
|
||||
user : $('#user').val()
|
||||
},
|
||||
OC.Lostpassword.sendLinkDone
|
||||
).fail(function() {
|
||||
OC.Lostpassword.sendLinkError(OC.Lostpassword.sendErrorMsg);
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
sendLinkDone : function(result){
|
||||
var sendErrorMsg;
|
||||
|
||||
if (result && result.status === 'success'){
|
||||
OC.Lostpassword.sendLinkSuccess();
|
||||
} else {
|
||||
if (result && result.msg){
|
||||
sendErrorMsg = result.msg;
|
||||
} else {
|
||||
sendErrorMsg = OC.Lostpassword.sendErrorMsg;
|
||||
}
|
||||
OC.Lostpassword.sendLinkError(sendErrorMsg);
|
||||
}
|
||||
},
|
||||
|
||||
sendLinkSuccess : function(msg){
|
||||
var node = OC.Lostpassword.getSendStatusNode();
|
||||
// update is the better success message styling
|
||||
node.addClass('update').css({width:'auto'});
|
||||
node.html(OC.Lostpassword.sendSuccessMsg);
|
||||
OC.Lostpassword.resetButtons();
|
||||
},
|
||||
|
||||
sendLinkError : function(msg){
|
||||
var node = OC.Lostpassword.getSendStatusNode();
|
||||
node.addClass('warning');
|
||||
node.html(msg);
|
||||
OC.Lostpassword.resetButtons();
|
||||
},
|
||||
|
||||
getSendStatusNode : function(){
|
||||
if (!$('#lost-password').length){
|
||||
$('<p id="lost-password"></p>').insertBefore($('#remember_login'));
|
||||
} else {
|
||||
$('#lost-password').replaceWith($('<p id="lost-password"></p>'));
|
||||
}
|
||||
return $('#lost-password');
|
||||
},
|
||||
|
||||
resetPassword : function(event){
|
||||
event.preventDefault();
|
||||
if ($('#password').val()){
|
||||
$.post(
|
||||
$('#password').parents('form').attr('action'),
|
||||
{
|
||||
password : $('#password').val(),
|
||||
proceed: $('#encrypted-continue').is(':checked') ? 'true' : 'false'
|
||||
},
|
||||
OC.Lostpassword.resetDone
|
||||
);
|
||||
}
|
||||
if($('#encrypted-continue').is(':checked')) {
|
||||
$('#reset-password #submit').hide();
|
||||
$('#reset-password #float-spinner').removeClass('hidden');
|
||||
}
|
||||
},
|
||||
|
||||
resetDone : function(result){
|
||||
var resetErrorMsg;
|
||||
if (result && result.status === 'success'){
|
||||
OC.Lostpassword.redirect('/login?user=' + result.user);
|
||||
} else {
|
||||
if (result && result.msg){
|
||||
resetErrorMsg = result.msg;
|
||||
} else if (result && result.encryption) {
|
||||
resetErrorMsg = OC.Lostpassword.encryptedMsg;
|
||||
} else {
|
||||
resetErrorMsg = OC.Lostpassword.resetErrorMsg;
|
||||
}
|
||||
OC.Lostpassword.resetError(resetErrorMsg);
|
||||
}
|
||||
},
|
||||
|
||||
redirect : function(url){
|
||||
window.location = OC.generateUrl(url);
|
||||
},
|
||||
|
||||
resetError : function(msg){
|
||||
var node = OC.Lostpassword.getResetStatusNode();
|
||||
node.addClass('warning');
|
||||
node.html(msg);
|
||||
},
|
||||
|
||||
getResetStatusNode : function (){
|
||||
if (!$('#lost-password').length){
|
||||
$('<p id="lost-password"></p>').insertBefore($('#reset-password fieldset'));
|
||||
} else {
|
||||
$('#lost-password').replaceWith($('<p id="lost-password"></p>'));
|
||||
}
|
||||
return $('#lost-password');
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
$(document).ready(OC.Lostpassword.init);
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[
|
||||
"visitortimezone.js",
|
||||
"lostpassword.js",
|
||||
"login.js"
|
||||
]
|
||||
|
|
@ -1,10 +1,12 @@
|
|||
/* global jstz */
|
||||
import $ from 'jquery';
|
||||
import jstz from 'jstimezonedetect';
|
||||
|
||||
$(document).ready(function () {
|
||||
$('#timezone_offset').val((-new Date().getTimezoneOffset() / 60));
|
||||
$('#timezone').val(jstz.determine().name());
|
||||
|
||||
// only enable the submit button once we are sure that the timezone is set
|
||||
var $loginForm = $('form[name="login"]');
|
||||
const $loginForm = $('form[name="login"]');
|
||||
if ($loginForm.length) {
|
||||
$loginForm.find('input#submit').prop('disabled', false);
|
||||
}
|
||||
48
core/src/login.js
Normal file
48
core/src/login.js
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
/**
|
||||
* Copyright (c) 2015
|
||||
* Vincent Petry <pvince81@owncloud.com>
|
||||
* Jan-Christoph Borchardt, http://jancborchardt.net
|
||||
* This file is licensed under the Affero General Public License version 3 or later.
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
|
||||
import $ from 'jquery'
|
||||
|
||||
import './lostpassword'
|
||||
import './Util/visitortimezone'
|
||||
|
||||
function onLogin () {
|
||||
// Only if password reset form is not active
|
||||
if ($('form[name=login][action]').length === 0) {
|
||||
$('#submit-wrapper .submit-icon')
|
||||
.removeClass('icon-confirm-white')
|
||||
.addClass(OCA.Theming && OCA.Theming.inverted
|
||||
? 'icon-loading-small'
|
||||
: 'icon-loading-small-dark');
|
||||
$('#submit')
|
||||
.attr('value', t('core', 'Logging in …'));
|
||||
$('.login-additional').fadeOut();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function rememberLogin () {
|
||||
if ($(this).is(":checked")) {
|
||||
if ($("#user").val() && $("#password").val()) {
|
||||
$('#submit').trigger('click');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$(document).ready(function () {
|
||||
$('form[name=login]').submit(onLogin);
|
||||
|
||||
$('#remember_login').click(rememberLogin);
|
||||
|
||||
const clearParamRegex = new RegExp('clear=1');
|
||||
if (clearParamRegex.test(window.location.href)) {
|
||||
window.localStorage.clear();
|
||||
window.sessionStorage.clear();
|
||||
}
|
||||
});
|
||||
195
core/src/lostpassword.js
Normal file
195
core/src/lostpassword.js
Normal file
|
|
@ -0,0 +1,195 @@
|
|||
import $ from 'jquery'
|
||||
|
||||
import OC from './OC/index'
|
||||
|
||||
const sendErrorMsg = t('core', 'Couldn\'t send reset email. Please contact your administrator.');
|
||||
const sendSuccessMsg = t('core', 'We have send a password reset e-mail to the e-mail address known to us for this account. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.');
|
||||
const encryptedMsg = t('core', "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?")
|
||||
+ ('<br /><input type="checkbox" id="encrypted-continue" class="checkbox checkbox--white" value="Yes" />')
|
||||
+ '<label for="encrypted-continue">'
|
||||
+ t('core', 'I know what I\'m doing')
|
||||
+ '</label><br />';
|
||||
const resetErrorMsg = t('core', 'Password can not be changed. Please contact your administrator.');
|
||||
|
||||
function init () {
|
||||
$('#lost-password[href=""]').click(resetLink);
|
||||
$('#lost-password-back').click(backToLogin);
|
||||
$('form[name=login]').submit(onSendLink);
|
||||
$('#reset-password #submit').click(resetPassword);
|
||||
resetButtons();
|
||||
}
|
||||
|
||||
function resetButtons () {
|
||||
$('#reset-password-wrapper .submit-icon')
|
||||
.addClass('icon-confirm-white')
|
||||
.removeClass('icon-loading-small-dark');
|
||||
$('#reset-password-submit')
|
||||
.attr('value', t('core', 'Reset password'))
|
||||
.prop('disabled', false);
|
||||
$('#user').prop('disabled', false);
|
||||
$('.login-additional').fadeIn();
|
||||
}
|
||||
|
||||
function backToLogin (event) {
|
||||
event.preventDefault();
|
||||
|
||||
$('#reset-password-wrapper').slideUp().fadeOut();
|
||||
$('#lost-password').slideDown().fadeIn();
|
||||
$('#lost-password-back').hide();
|
||||
$('.remember-login-container').slideDown().fadeIn();
|
||||
$('#submit-wrapper').slideDown().fadeIn();
|
||||
$('.groupbottom').slideDown().fadeIn();
|
||||
$('#user').parent().addClass('grouptop');
|
||||
$('#password').attr('required', true);
|
||||
$('form[name=login]').removeAttr('action');
|
||||
$('#user').focus();
|
||||
}
|
||||
|
||||
function resetLink (event) {
|
||||
event.preventDefault();
|
||||
|
||||
$('#lost-password').hide();
|
||||
$('.wrongPasswordMsg').hide();
|
||||
$('#lost-password-back').slideDown().fadeIn();
|
||||
$('.remember-login-container').slideUp().fadeOut();
|
||||
$('#submit-wrapper').slideUp().fadeOut();
|
||||
$('.groupbottom').slideUp().fadeOut(function () {
|
||||
$('#user').parent().removeClass('grouptop');
|
||||
});
|
||||
$('#reset-password-wrapper').slideDown().fadeIn();
|
||||
$('#password').attr('required', false);
|
||||
$('form[name=login]').attr('action', 'lostpassword/email');
|
||||
$('#user').focus();
|
||||
|
||||
// Generate a browser warning for required fields if field empty
|
||||
if ($('#user').val().length === 0) {
|
||||
$('#submit').trigger('click');
|
||||
} else {
|
||||
if (OC.config.lost_password_link === 'disabled') {
|
||||
return;
|
||||
} else if (OC.config.lost_password_link) {
|
||||
window.location = OC.config.lost_password_link;
|
||||
} else {
|
||||
onSendLink();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function onSendLink (event) {
|
||||
// Only if password reset form is active
|
||||
if ($('form[name=login][action]').length === 1) {
|
||||
if (event) {
|
||||
event.preventDefault();
|
||||
}
|
||||
$('#reset-password-wrapper .submit-icon')
|
||||
.removeClass('icon-confirm-white')
|
||||
.addClass('icon-loading-small-dark');
|
||||
$('#reset-password-submit')
|
||||
.attr('value', t('core', 'Sending email …'))
|
||||
.prop('disabled', true);
|
||||
$('#user').prop('disabled', true);
|
||||
$('.login-additional').fadeOut();
|
||||
$.post(
|
||||
OC.generateUrl('/lostpassword/email'),
|
||||
{
|
||||
user: $('#user').val()
|
||||
},
|
||||
sendLinkDone
|
||||
).fail(function () {
|
||||
sendLinkError(sendErrorMsg);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function sendLinkDone (result) {
|
||||
var sendErrorMsg;
|
||||
|
||||
if (result && result.status === 'success') {
|
||||
sendLinkSuccess();
|
||||
} else {
|
||||
if (result && result.msg) {
|
||||
sendErrorMsg = result.msg;
|
||||
} else {
|
||||
sendErrorMsg = sendErrorMsg;
|
||||
}
|
||||
sendLinkError(sendErrorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
function sendLinkSuccess (msg) {
|
||||
const node = getSendStatusNode();
|
||||
// update is the better success message styling
|
||||
node.addClass('update').css({width: 'auto'});
|
||||
node.html(sendSuccessMsg);
|
||||
resetButtons();
|
||||
}
|
||||
|
||||
function sendLinkError (msg) {
|
||||
const node = getSendStatusNode();
|
||||
node.addClass('warning');
|
||||
node.html(msg);
|
||||
resetButtons();
|
||||
}
|
||||
|
||||
function getSendStatusNode () {
|
||||
if (!$('#lost-password').length) {
|
||||
$('<p id="lost-password"></p>').insertBefore($('#remember_login'));
|
||||
} else {
|
||||
$('#lost-password').replaceWith($('<p id="lost-password"></p>'));
|
||||
}
|
||||
return $('#lost-password');
|
||||
}
|
||||
|
||||
function resetPassword (event) {
|
||||
event.preventDefault();
|
||||
if ($('#password').val()) {
|
||||
$.post(
|
||||
$('#password').parents('form').attr('action'),
|
||||
{
|
||||
password: $('#password').val(),
|
||||
proceed: $('#encrypted-continue').is(':checked') ? 'true' : 'false'
|
||||
},
|
||||
resetDone
|
||||
);
|
||||
}
|
||||
if ($('#encrypted-continue').is(':checked')) {
|
||||
$('#reset-password #submit').hide();
|
||||
$('#reset-password #float-spinner').removeClass('hidden');
|
||||
}
|
||||
}
|
||||
|
||||
function resetDone (result) {
|
||||
if (result && result.status === 'success') {
|
||||
redirect('/login?user=' + result.user);
|
||||
} else {
|
||||
if (result && result.msg) {
|
||||
resetError(result.msg);
|
||||
} else if (result && result.encryption) {
|
||||
resetError(encryptedMsg);
|
||||
} else {
|
||||
resetError(resetErrorMsg);
|
||||
}
|
||||
resetError(resetErrorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
function redirect (url) {
|
||||
window.location = OC.generateUrl(url);
|
||||
}
|
||||
|
||||
function resetError (msg) {
|
||||
var node = getResetStatusNode();
|
||||
node.addClass('warning');
|
||||
node.html(msg);
|
||||
}
|
||||
|
||||
function getResetStatusNode () {
|
||||
if (!$('#lost-password').length) {
|
||||
$('<p id="lost-password"></p>').insertBefore($('#reset-password fieldset'));
|
||||
} else {
|
||||
$('#lost-password').replaceWith($('<p id="lost-password"></p>'));
|
||||
}
|
||||
return $('#lost-password');
|
||||
}
|
||||
|
||||
$(document).ready(init);
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php /** @var $l \OCP\IL10N */ ?>
|
||||
<?php
|
||||
script('core', 'merged-login');
|
||||
script('core', 'dist/login');
|
||||
|
||||
use OC\Core\Controller\LoginController;
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@ const webpack = require('webpack');
|
|||
module.exports = [
|
||||
{
|
||||
entry: {
|
||||
main: path.join(__dirname, 'src/main.js'),
|
||||
login: path.join(__dirname, 'src/login.js'),
|
||||
main: path.join(__dirname, 'src/main.js')
|
||||
},
|
||||
output: {
|
||||
filename: '[name].js',
|
||||
|
|
|
|||
Loading…
Reference in a new issue