Skip to content

Commit 7dd7652

Browse files
flovilmartflovilmart
committed
Refactors verify_email, adds public html
1 parent 0b307bc commit 7dd7652

14 files changed

+455
-63
lines changed

‎public_html/choose_password.html

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<!-- This page is displayed when someone clicks a valid 'reset password' link.
4+
Users should feel free to add to this page (i.e. branding or security widgets)
5+
but should be sure not to delete any of the form inputs or the javascript from the
6+
template file. This javascript is what adds the necessary values to authenticate
7+
this session with Parse.
8+
The query params 'username' and 'app' hold the friendly names for your current user and
9+
your app. You should feel free to incorporate their values to make the page more personal.
10+
If you are missing form parameters in your POST, Parse will navigate back to this page and
11+
add an 'error' query parameter.
12+
-->
13+
<head>
14+
<title>Password Reset</title>
15+
<style type='text/css'>
16+
h1 {
17+
display: block;
18+
font: inherit;
19+
font-size: 30px;
20+
font-weight: 600;
21+
height: 30px;
22+
line-height: 30px;
23+
margin: 45px 0px 45px 0px;
24+
padding: 0px 8px 0px 8px;
25+
}
26+
27+
.error {
28+
color: red;
29+
padding: 0px 8px 0px 8px;
30+
margin: -25px 0px -20px 0px;
31+
}
32+
33+
body {
34+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica;
35+
color: #0067AB;
36+
margin: 15px 99px 0px 98px;
37+
}
38+
39+
label {
40+
color: #666666;
41+
}
42+
form {
43+
margin: 0px 0px 45px 0px;
44+
padding: 0px 8px 0px 8px;
45+
}
46+
form > * {
47+
display: block;
48+
margin-top: 25px;
49+
margin-bottom: 7px;
50+
}
51+
52+
button {
53+
font-size: 22px;
54+
color: white;
55+
background: #0067AB;
56+
-moz-border-radius: 5px;
57+
-webkit-border-radius: 5px;
58+
-o-border-radius: 5px;
59+
-ms-border-radius: 5px;
60+
-khtml-border-radius: 5px;
61+
border-radius: 5px;
62+
background-image: -webkit-gradient(linear,50% 0,50% 100%,color-stop(0%,#0070BA),color-stop(100%,#00558C));
63+
background-image: -webkit-linear-gradient(#0070BA,#00558C);
64+
background-image: -moz-linear-gradient(#0070BA,#00558C);
65+
background-image: -o-linear-gradient(#0070BA,#00558C);
66+
background-image: -ms-linear-gradient(#0070BA,#00558C);
67+
background-image: linear-gradient(#0070BA,#00558C);
68+
-moz-box-shadow: inset 0 1px 0 0 #0076c4;
69+
-webkit-box-shadow: inset 0 1px 0 0 #0076c4;
70+
-o-box-shadow: inset 0 1px 0 0 #0076c4;
71+
box-shadow: inset 0 1px 0 0 #0076c4;
72+
border: 1px solid #005E9C;
73+
padding: 10px 14px;
74+
cursor: pointer;
75+
outline: none;
76+
display: block;
77+
font-family: "Helvetica Neue",Helvetica;
78+
79+
-webkit-box-align: center;
80+
text-align: center;
81+
box-sizing: border-box;
82+
letter-spacing: normal;
83+
word-spacing: normal;
84+
line-height: normal;
85+
text-transform: none;
86+
text-indent: 0px;
87+
text-shadow: none;
88+
}
89+
90+
button:hover {
91+
background-image: -webkit-gradient(linear,50% 0,50% 100%,color-stop(0%,#0079CA),color-stop(100%,#005E9C));
92+
background-image: -webkit-linear-gradient(#0079CA,#005E9C);
93+
background-image: -moz-linear-gradient(#0079CA,#005E9C);
94+
background-image: -o-linear-gradient(#0079CA,#005E9C);
95+
background-image: -ms-linear-gradient(#0079CA,#005E9C);
96+
background-image: linear-gradient(#0079CA,#005E9C);
97+
-moz-box-shadow: inset 0 0 0 0 #0076c4;
98+
-webkit-box-shadow: inset 0 0 0 0 #0076c4;
99+
-o-box-shadow: inset 0 0 0 0 #0076c4;
100+
box-shadow: inset 0 0 0 0 #0076c4;
101+
}
102+
103+
button:active {
104+
background-image: -webkit-gradient(linear,50% 0,50% 100%,color-stop(0%,#00395E),color-stop(100%,#005891));
105+
background-image: -webkit-linear-gradient(#00395E,#005891);
106+
background-image: -moz-linear-gradient(#00395E,#005891);
107+
background-image: -o-linear-gradient(#00395E,#005891);
108+
background-image: -ms-linear-gradient(#00395E,#005891);
109+
background-image: linear-gradient(#00395E,#005891);
110+
}
111+
112+
input {
113+
color: black;
114+
cursor: auto;
115+
display: inline-block;
116+
font-family: 'Helvetica Neue', Helvetica;
117+
font-size: 25px;
118+
height: 30px;
119+
letter-spacing: normal;
120+
line-height: normal;
121+
margin: 2px 0px 2px 0px;
122+
padding: 5px;
123+
text-transform: none;
124+
vertical-align: baseline;
125+
width: 500px;
126+
word-spacing: 0px;
127+
}
128+
129+
</style>
130+
</head>
131+
<body>
132+
<h1>Reset Your Password<span id='app'></span></h1>
133+
<noscript>We apologize, but resetting your password requires javascript</noscript>
134+
<div class='error' id='error'></div>
135+
<form id='form' action='#' method='POST'>
136+
<label>New Password for <span id='username_label'></span></label>
137+
<input name="new_password" type="password" />
138+
<input name='utf-8' type='hidden' value='✓' />
139+
<input name="username" id="username" type="hidden" />
140+
<input name="token" id="token" type="hidden" />
141+
<button>Change Password</button>
142+
</form>
143+
144+
<script language='javascript' type='text/javascript'>
145+
<!--
146+
window.onload = function() {
147+
var urlParams = {};
148+
(function () {
149+
var pair, // Really a match. Index 0 is the full match; 1 & 2 are the key & val.
150+
tokenize = /([^&=]+)=?([^&]*)/g,
151+
// decodeURIComponents escapes everything but will leave +s that should be ' '
152+
re_space = function (s) { return decodeURIComponent(s.replace(/\+/g, " ")); },
153+
// Substring to cut off the leading '?'
154+
querystring = window.location.search.substring(1);
155+
156+
while (pair = tokenize.exec(querystring))
157+
urlParams[re_space(pair[1])] = re_space(pair[2]);
158+
})();
159+
160+
var id = urlParams['id'];
161+
document.getElementById('form').setAttribute('action', '/apps/' + id + '/request_password_reset');
162+
document.getElementById('username').value = urlParams['username'];
163+
document.getElementById('username_label').appendChild(document.createTextNode(urlParams['username']));
164+
165+
document.getElementById('token').value = urlParams['token'];
166+
if (urlParams['error']) {
167+
document.getElementById('error').appendChild(document.createTextNode(urlParams['error']));
168+
}
169+
if (urlParams['app']) {
170+
document.getElementById('app').appendChild(document.createTextNode(' for ' + urlParams['app']));
171+
}
172+
}
173+
//-->
174+
</script>
175+
</body>

‎public_html/invalid_link.html

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!DOCTYPE html>
2+
<!-- This page is displayed when someone navigates to a verify email or reset password link
3+
but their security token is wrong. This can either mean the user has clicked on a
4+
stale link (i.e. re-click on a password reset link after resetting their password) or
5+
(rarely) this could be a sign of a malicious user trying to tamper with your app.
6+
-->
7+
<html>
8+
<head>
9+
<title>Invalid Link</title>
10+
<style type='text/css'>
11+
.container {
12+
border-width: 0px;
13+
display: block;
14+
font: inherit;
15+
font-family: 'Helvetica Neue', Helvetica;
16+
font-size: 16px;
17+
height: 30px;
18+
line-height: 16px;
19+
margin: 45px 0px 0px 45px;
20+
padding: 0px 8px 0px 8px;
21+
position: relative;
22+
vertical-align: baseline;
23+
}
24+
25+
h1, h2, h3, h4, h5 {
26+
color: #0067AB;
27+
display: block;
28+
font: inherit;
29+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica;
30+
font-size: 30px;
31+
font-weight: 600;
32+
height: 30px;
33+
line-height: 30px;
34+
margin: 0 0 15px 0;
35+
padding: 0 0 0 0;
36+
}
37+
</style>
38+
<body>
39+
<div class="container">
40+
<h1>Invalid Link</h1>
41+
</div>
42+
</body>
43+
</html>

‎public_html/password_reset_success.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<!-- This page is displayed whenever someone has successfully reset their password.
4+
Pro and Enterprise accounts may edit this page and tell Parse to use that custom
5+
version in their Parse app. See the App Settigns page for more information.
6+
This page will be called with the query param 'username'
7+
-->
8+
<head>
9+
<title>Password Reset</title>
10+
<style type='text/css'>
11+
h1 {
12+
color: #0067AB;
13+
display: block;
14+
font: inherit;
15+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica;
16+
font-size: 30px;
17+
font-weight: 600;
18+
height: 30px;
19+
line-height: 30px;
20+
margin: 45px 0px 0px 45px;
21+
padding: 0px 8px 0px 8px;
22+
}
23+
</style>
24+
<body>
25+
<h1>Successfully updated your password!</h1>
26+
</body>
27+
</html>

‎public_html/verify_email_success.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<!-- This page is displayed whenever someone has successfully reset their password.
4+
Pro and Enterprise accounts may edit this page and tell Parse to use that custom
5+
version in their Parse app. See the App Settigns page for more information.
6+
This page will be called with the query param 'username'
7+
-->
8+
<head>
9+
<title>Email Verification</title>
10+
<style type='text/css'>
11+
h1 {
12+
color: #0067AB;
13+
display: block;
14+
font: inherit;
15+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica;
16+
font-size: 30px;
17+
font-weight: 600;
18+
height: 30px;
19+
line-height: 30px;
20+
margin: 45px 0px 0px 45px;
21+
padding: 0px 8px 0px 8px;
22+
}
23+
</style>
24+
<body>
25+
<h1>Successfully verified your email!</h1>
26+
</body>
27+
</html>

‎spec/ParseUser.spec.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ describe('Parse.User testing', () => {
171171
followRedirect: false,
172172
}, (error, response, body) => {
173173
expect(response.statusCode).toEqual(302);
174-
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/verify_email_success.html?username=zxcv');
174+
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/apps/verify_email_success.html?username=zxcv');
175175
user.fetch()
176176
.then(() => {
177177
expect(user.get('emailVerified')).toEqual(true);
@@ -202,21 +202,21 @@ describe('Parse.User testing', () => {
202202
});
203203

204204
it('redirects you to invalid link if you try to verify email incorrecly', done => {
205-
request.get('http://localhost:8378/1/verify_email', {
205+
request.get('http://localhost:8378/1/apps/test/verify_email', {
206206
followRedirect: false,
207207
}, (error, response, body) => {
208208
expect(response.statusCode).toEqual(302);
209-
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/invalid_link.html');
209+
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/apps/invalid_link.html');
210210
done()
211211
});
212212
});
213213

214214
it('redirects you to invalid link if you try to validate a nonexistant users email', done => {
215-
request.get('http://localhost:8378/1/verify_email?token=asdfasdf&username=sadfasga', {
215+
request.get('http://localhost:8378/1/apps/test/verify_email?token=asdfasdf&username=sadfasga', {
216216
followRedirect: false,
217217
}, (error, response, body) => {
218218
expect(response.statusCode).toEqual(302);
219-
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/invalid_link.html');
219+
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/apps/invalid_link.html');
220220
done();
221221
});
222222
});
@@ -225,11 +225,11 @@ describe('Parse.User testing', () => {
225225
var user = new Parse.User();
226226
var emailAdapter = {
227227
sendVerificationEmail: options => {
228-
request.get('http://localhost:8378/1/verify_email?token=invalid&username=zxcv', {
228+
request.get('http://localhost:8378/1/apps/test/verify_email?token=invalid&username=zxcv', {
229229
followRedirect: false,
230230
}, (error, response, body) => {
231231
expect(response.statusCode).toEqual(302);
232-
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/invalid_link.html');
232+
expect(response.body).toEqual('Found. Redirecting to http://localhost:8378/1/apps/invalid_link.html');
233233
user.fetch()
234234
.then(() => {
235235
expect(user.get('emailVerified')).toEqual(false);

‎src/Config.js

+24-1
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,41 @@ export class Config {
2525
this.database = DatabaseAdapter.getDatabaseConnection(applicationId, cacheInfo.collectionPrefix);
2626

2727
this.mailController = cacheInfo.mailController;
28+
29+
this.serverURL = cacheInfo.serverURL;
2830
this.verifyUserEmails = cacheInfo.verifyUserEmails;
2931
this.appName = cacheInfo.appName;
3032

3133
this.hooksController = cacheInfo.hooksController;
3234
this.filesController = cacheInfo.filesController;
3335
this.pushController = cacheInfo.pushController;
3436
this.loggerController = cacheInfo.loggerController;
37+
this.mailController = cacheInfo.mailController;
3538
this.oauth = cacheInfo.oauth;
3639

3740
this.mount = mount;
3841
}
39-
}
42+
43+
get invalidLinkURL() {
44+
return `${this.serverURL}/apps/invalid_link.html`;
45+
}
46+
47+
get verifyEmailSuccessURL() {
48+
return `${this.serverURL}/apps/verify_email_success.html`;
49+
}
50+
51+
get choosePasswordURL() {
52+
return `${this.serverURL}/apps/choose_password`;
53+
}
54+
55+
get passwordResetSuccessURL() {
56+
return `${this.serverURL}/apps/password_reset_success.html`;
57+
}
58+
59+
get verifyEmailURL() {
60+
return `${this.serverURL}/apps/${this.applicationId}/verify_email`;
61+
}
62+
};
4063

4164
export default Config;
4265
module.exports = Config;

‎src/Controllers/AdaptableController.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ based on the parameters passed
1010

1111
// _adapter is private, use Symbol
1212
var _adapter = Symbol();
13+
import cache from '../cache';
1314

1415
export class AdaptableController {
1516

16-
constructor(adapter) {
17+
constructor(adapter, appId) {
1718
this.adapter = adapter;
19+
this.appId = appId;
1820
}
1921

2022
set adapter(adapter) {
@@ -26,6 +28,10 @@ export class AdaptableController {
2628
return this[_adapter];
2729
}
2830

31+
get config() {
32+
return cache.apps[this.appId];
33+
}
34+
2935
expectedAdapterType() {
3036
throw new Error("Subclasses should implement expectedAdapterType()");
3137
}

0 commit comments

Comments
 (0)