Revision 49769
Added by Sofia Baltzi almost 6 years ago
modules/dnet-openaire-users/trunk/src/main/java/eu/dnetlib/openaire/usermanagement/ActivationCodeServlet.java | ||
---|---|---|
42 | 42 |
if (!verificationActions.verificationCodeHasExpired(formUsername)) { |
43 | 43 |
HttpSession session = request.getSession(); |
44 | 44 |
session.setAttribute("username", formUsername); |
45 |
response.sendRedirect("./addPassword.jsp");
|
|
45 |
response.sendRedirect("./registerSuccess.jsp");
|
|
46 | 46 |
} else { |
47 | 47 |
logger.info("Verification code has expired!"); |
48 | 48 |
response.sendRedirect("./expiredVerificationCode.jsp"); |
modules/dnet-openaire-users/trunk/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServlet.java | ||
---|---|---|
51 | 51 |
String username = request.getParameter("username"); |
52 | 52 |
String email =request.getParameter("email"); |
53 | 53 |
String confirmEmail = request.getParameter("email_conf"); |
54 |
//String password = request.getParameter("password");
|
|
55 |
//String confirmPassword = request.getParameter("password_conf");
|
|
54 |
String password = request.getParameter("password"); |
|
55 |
String confirmPassword = request.getParameter("password_conf"); |
|
56 | 56 |
|
57 | 57 |
if (organization == null){ |
58 | 58 |
logger.info("organization is null"); |
59 | 59 |
} |
60 | 60 |
if (firstName != null && lastName != null && username != null && |
61 |
email.equals(confirmEmail) /*&& password.equals(confirmPassword)*/ ) {
|
|
61 |
email.equals(confirmEmail) && password.equals(confirmPassword) ) {
|
|
62 | 62 |
|
63 | 63 |
try { |
64 | 64 |
|
65 | 65 |
if (username.matches("^[a-zA-Z0-9][a-zA-Z0-9_-]{4,150}") && !ldapActions.usernameExists(username) && !ldapActions.emailExists(email)) { |
66 | 66 |
|
67 |
ldapActions.createUser(username, email, firstName, lastName, organization/*, password*/);
|
|
67 |
ldapActions.createUser(username, email, firstName, lastName, organization, password);
|
|
68 | 68 |
logger.info("User successfully created"); |
69 | 69 |
|
70 | 70 |
UUID verificationCode = UUID.randomUUID(); |
modules/dnet-openaire-users/trunk/src/main/webapp/register.jsp | ||
---|---|---|
91 | 91 |
<div class="form-group"> |
92 | 92 |
<input id="email_conf" name="email_conf" type="text" placeholder="Confirm email (*)" class="form-control" value=${email_conf}></div> |
93 | 93 |
<c:remove var="email_conf" scope="session" /> |
94 |
<%--<div class="form-group">--%>
|
|
95 |
<%--<span class="msg_password_error uk-text-danger uk-text-small uk-float-left" style="display:none">Please enter your password.</span>--%>
|
|
96 |
<%--<span class="msg_pass_conf_error uk-text-danger uk-text-small uk-float-left" style="display:none">These passwords don't match.</span>--%>
|
|
97 |
<%--<p><span class="msg_please_add uk-text-danger uk-text-small uk-float-left" style="display:none">Please add:  </span></p>--%>
|
|
98 |
<%--<span class="msg_lowercase_letter uk-text-danger uk-text-small uk-float-left" style="display:none">A lowercase letter.  </span>--%>
|
|
99 |
<%--<span class="msg_capital_letter uk-text-danger uk-text-small uk-float-left" style="display:none">A capital (uppercase) letter.   </span>--%>
|
|
100 |
<%--<span class="msg_number uk-text-danger uk-text-small uk-float-left" style="display:none">A number.  </span>--%>
|
|
101 |
<%--<span class="msg_lenght uk-text-danger uk-text-small uk-float-left" style="display:none">Minimum 6 characters.  </span>--%>
|
|
102 |
<%--<input id="password" name="password" type="password" placeholder="Password" class="form-control"></div>--%>
|
|
103 |
<%--<div class="form-group">--%>
|
|
104 |
<%--<input id="password_conf" name="password_conf" type="password" placeholder="Confirm password" class="form-control"></div>--%>
|
|
94 |
<div class="form-group">
|
|
95 |
<span class="msg_password_error uk-text-danger uk-text-small uk-float-left" style="display:none">Please enter your password.</span>
|
|
96 |
<span class="msg_pass_conf_error uk-text-danger uk-text-small uk-float-left" style="display:none">These passwords don't match.</span>
|
|
97 |
<p><span class="msg_please_add uk-text-danger uk-text-small uk-float-left" style="display:none">Please add:  </span></p>
|
|
98 |
<span class="msg_lowercase_letter uk-text-danger uk-text-small uk-float-left" style="display:none">A lowercase letter.  </span>
|
|
99 |
<span class="msg_capital_letter uk-text-danger uk-text-small uk-float-left" style="display:none">A capital (uppercase) letter.   </span>
|
|
100 |
<span class="msg_number uk-text-danger uk-text-small uk-float-left" style="display:none">A number.  </span>
|
|
101 |
<span class="msg_lenght uk-text-danger uk-text-small uk-float-left" style="display:none">Minimum 6 characters.  </span>
|
|
102 |
<input id="password" name="password" type="password" placeholder="Password" class="form-control"></div>
|
|
103 |
<div class="form-group">
|
|
104 |
<input id="password_conf" name="password_conf" type="password" placeholder="Confirm password" class="form-control"></div>
|
|
105 | 105 |
<div class="uk-margin uk-grid-small uk-child-width-auto uk-grid uk-text-left uk-grid-stack" uk-grid=""> |
106 | 106 |
<div class="uk-width-1-1 uk-text-meta uk-text-danger uk-first-column">(*) Required fields</div> |
107 | 107 |
<div class="uk-width-1-1 uk-grid-margin uk-first-column">RECAPTHA I AM NOT A ROBOT THING GOES HERE</div> |
... | ... | |
114 | 114 |
<!-- END OF REGISTER FORM --> |
115 | 115 |
<script> |
116 | 116 |
|
117 |
//var myInput = document.getElementById("password");
|
|
117 |
var myInput = document.getElementById("password"); |
|
118 | 118 |
var usernameInput = document.getElementById("username"); |
119 | 119 |
//var myEmailInput = document.getElementById("email"); |
120 | 120 |
|
121 |
// // When the user starts to type something inside the password field |
|
122 |
// myInput.onkeyup = function() { |
|
123 |
// |
|
124 |
// // Validate lowercase letters |
|
125 |
// var lowerCaseLetters = /[a-z]/g; |
|
126 |
// if (myInput.value.match(lowerCaseLetters)) { |
|
127 |
// $(".msg_lowercase_letter").fadeOut(); |
|
128 |
// } else { |
|
129 |
// $(".msg_lowercase_letter").fadeIn(); |
|
130 |
// } |
|
131 |
// |
|
132 |
// // Validate capital letters |
|
133 |
// var upperCaseLetters = /[A-Z]/g; |
|
134 |
// if (myInput.value.match(upperCaseLetters)) { |
|
135 |
// $(".msg_capital_letter").fadeOut(); |
|
136 |
// } else { |
|
137 |
// $(".msg_capital_letter").fadeIn(); |
|
138 |
// } |
|
139 |
// |
|
140 |
// // Validate numbers |
|
141 |
// var numbers = /[0-9]/g; |
|
142 |
// if (myInput.value.match(numbers)) { |
|
143 |
// $(".msg_number").fadeOut(); |
|
144 |
// } else { |
|
145 |
// $(".msg_number").fadeIn(); |
|
146 |
// } |
|
147 |
// |
|
148 |
// // Validate length |
|
149 |
// if (myInput.value.length >= 6) { |
|
150 |
// $(".msg_lenght").fadeOut(); |
|
151 |
// } else { |
|
152 |
// $(".msg_lenght").fadeIn(); |
|
153 |
// } |
|
154 |
// |
|
155 |
// if(myInput.value.match(lowerCaseLetters) && myInput.value.match(upperCaseLetters) |
|
156 |
// && myInput.value.match(numbers) && (myInput.value.length >= 6)){ |
|
157 |
// if($(".msg_please_add").css('display')!='none'){ |
|
158 |
// $(".msg_please_add").fadeOut(); |
|
159 |
// } |
|
160 |
// } else { |
|
161 |
// if($(".msg_please_add").css('display')=='none') { |
|
162 |
// $(".msg_please_add").fadeIn(); |
|
163 |
// } |
|
164 |
// } |
|
165 |
// } |
|
121 |
// When the user starts to type something inside the password field |
|
122 |
myInput.onkeyup = function() { |
|
166 | 123 |
|
124 |
// Validate lowercase letters |
|
125 |
var lowerCaseLetters = /[a-z]/g; |
|
126 |
if (myInput.value.match(lowerCaseLetters)) { |
|
127 |
$(".msg_lowercase_letter").fadeOut(); |
|
128 |
} else { |
|
129 |
$(".msg_lowercase_letter").fadeIn(); |
|
130 |
} |
|
131 |
|
|
132 |
// Validate capital letters |
|
133 |
var upperCaseLetters = /[A-Z]/g; |
|
134 |
if (myInput.value.match(upperCaseLetters)) { |
|
135 |
$(".msg_capital_letter").fadeOut(); |
|
136 |
} else { |
|
137 |
$(".msg_capital_letter").fadeIn(); |
|
138 |
} |
|
139 |
|
|
140 |
// Validate numbers |
|
141 |
var numbers = /[0-9]/g; |
|
142 |
if (myInput.value.match(numbers)) { |
|
143 |
$(".msg_number").fadeOut(); |
|
144 |
} else { |
|
145 |
$(".msg_number").fadeIn(); |
|
146 |
} |
|
147 |
|
|
148 |
// Validate length |
|
149 |
if (myInput.value.length >= 6) { |
|
150 |
$(".msg_lenght").fadeOut(); |
|
151 |
} else { |
|
152 |
$(".msg_lenght").fadeIn(); |
|
153 |
} |
|
154 |
|
|
155 |
if(myInput.value.match(lowerCaseLetters) && myInput.value.match(upperCaseLetters) |
|
156 |
&& myInput.value.match(numbers) && (myInput.value.length >= 6)){ |
|
157 |
if($(".msg_please_add").css('display')!='none'){ |
|
158 |
$(".msg_please_add").fadeOut(); |
|
159 |
} |
|
160 |
} else { |
|
161 |
if($(".msg_please_add").css('display')=='none') { |
|
162 |
$(".msg_please_add").fadeIn(); |
|
163 |
} |
|
164 |
} |
|
165 |
} |
|
166 |
|
|
167 | 167 |
usernameInput.onkeyup = function() { |
168 | 168 |
|
169 | 169 |
// Validate username minimum length |
modules/dnet-openaire-users/trunk/src/main/webapp/registerSuccess.jsp | ||
---|---|---|
1 |
<%-- |
|
2 |
Created by IntelliJ IDEA. |
|
3 |
User: sofia |
|
4 |
Date: 1/11/2017 |
|
5 |
Time: 12:44 μμ |
|
6 |
To change this template use File | Settings | File Templates. |
|
7 |
--%> |
|
8 |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
|
9 |
<!DOCTYPE html> |
|
10 |
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> |
|
11 |
<META HTTP-EQUIV=Refresh CONTENT="0.5; URL=http://beta.services.openaire.eu/uoa-user-management/openid_connect_login"> |
|
12 |
<html lang="en-gb" dir="ltr" vocab="http://schema.org/"> |
|
13 |
<head> |
|
14 |
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> |
|
15 |
<meta http-equiv="X-UA-Compatible" content="IE=edge"> |
|
16 |
<meta name="viewport" content="width=device-width, initial-scale=1"> |
|
17 |
<title>OpenAIRE - Forgot password</title> |
|
18 |
<script src="./js/jquery.js"></script> |
|
19 |
<script src="./js/uikit.js"></script> |
|
20 |
<script src="./js/validation.js"></script> |
|
21 |
<link rel="stylesheet" style="text/css" href="./css/theme.css"> |
|
22 |
<link rel="stylesheet" style="text/css" href="./css/custom.css"> |
|
23 |
<link rel="stylesheet" style="text/css" href="./css/aai-custom.css"> |
|
24 |
</head> |
|
25 |
<body class="" style=""> |
|
26 |
<div class="uk-offcanvas-content uk-height-viewport"> |
|
27 |
<!-- MENU STARTS HERE --> |
|
28 |
<!-- MAIN MENU STARTS HERE --> |
|
29 |
<div class="tm-header tm-header-transparent" uk-header=""> |
|
30 |
<div class="uk-container uk-container-expand"> |
|
31 |
<nav class="uk-navbar" uk-navbar="{"align":"left"}"> |
|
32 |
<div class="uk-navbar-center"> |
|
33 |
<div class="uk-logo uk-navbar-item"> |
|
34 |
<img alt="OpenAIRE" class="uk-responsive-height" src="./images/Logo_Horizontal.png"> |
|
35 |
</div> |
|
36 |
</div> |
|
37 |
</nav> |
|
38 |
</div> |
|
39 |
</div> |
|
40 |
<!-- MENU ENDS HERE --> |
|
41 |
<!-- CONTENT STARTS HERE --> |
|
42 |
<div class="first_page_section uk-section-default uk-section uk-padding-remove-vertical"> |
|
43 |
<div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid=""> |
|
44 |
</div> |
|
45 |
</div> |
|
46 |
<div class=" uk-section uk-margin-small-top tm-middle custom-main-content" id="tm-main"> |
|
47 |
<div class="uk-container uk-container-small uk-margin-medium-top uk-margin-small-bottom uk-text-center"> |
|
48 |
<%--<h2 class="uk-h2 uk-margin-small-bottom">Forgot Password</h2>--%> |
|
49 |
<div uk-grid="" class="uk-grid uk-grid-stack"> |
|
50 |
<div class="tm-main uk-width-1-2@s uk-width-1-1@m uk-width-1-1@l uk-row-first uk-first-column uk-align-center"> |
|
51 |
<div class="uk-grid "> |
|
52 |
<!-- CENTER SIDE --> |
|
53 |
<div class="uk-width-1-1@m uk-width-1-1@s uk-text-center"> |
|
54 |
<!-- <h3 class="uk-h3">Create an account</h3> --> |
|
55 |
<div class="middle-box text-center loginscreen animated fadeInDown "> |
|
56 |
<h3 class="uk-h4 uk-text-success">You have successfully registered!</h3> |
|
57 |
<div class="uk-width-1-3@m uk-align-center"> |
|
58 |
<%--<p>Please click <a href="http://beta.services.openaire.eu/uoa-user-management/openid_connect_login">here</a> to login.</p>--%> |
|
59 |
</div> |
|
60 |
</ul> |
|
61 |
</div> |
|
62 |
</div> |
|
63 |
<!-- END OF CENTER SIDE --> |
|
64 |
</div> |
|
65 |
</div> |
|
66 |
</div> |
|
67 |
</div> |
|
68 |
</div> |
|
69 |
<!-- CONTENT ENDS HERE --> |
|
70 |
<!-- FOOTER STARTS HERE--> |
|
71 |
<div class="custom-footer" style="z-index: 200;"> |
|
72 |
<div class="uk-section-primary uk-section uk-section-small"> |
|
73 |
<div class="uk-container"> |
|
74 |
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid=""> |
|
75 |
<div class="uk-width-1-1@m uk-first-column"> |
|
76 |
<div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-center"> |
|
77 |
<img alt="OpenAIRE" class="el-image" src="./images/Logo_Horizontal_white_small.png"> |
|
78 |
</div> |
|
79 |
<div class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead"> |
|
80 |
<div><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank" rel="license"><img alt="Creative" src="./images/80x15.png" style="height: auto; max-width: 100%; vertical-align: middle;"></a> UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A <a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.</div> |
|
81 |
<div>OPENAIRE IS POWERED BY <a href="http://www.d-net.research-infrastructures.eu/">D-NET</a>.</div> |
|
82 |
</div> |
|
83 |
<div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right"> |
|
84 |
<a class="uk-totop uk-icon" href="#" uk-scroll="" uk-totop=""> |
|
85 |
</a> |
|
86 |
</div> |
|
87 |
</div> |
|
88 |
</div> |
|
89 |
</div> |
|
90 |
</div> |
|
91 |
</div> <!-- FOOTER ENDS HERE --> |
|
92 |
</div> |
|
93 |
</body> |
|
94 |
</html> |
Also available in: Unified diff
Add registerSuccess.jsp