Skip to content

Commit b7bd935

Browse files
keitharmkeitharm
authored
Merge pull request #75 from RandomAPI/v1.1
V1.1
2 parents ae990c7 + 147dec9 commit b7bd935

File tree

7 files changed

+116
-67
lines changed

7 files changed

+116
-67
lines changed

‎api/1.1/api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ Generator.prototype.genPassword = function() {
261261
}
262262

263263
let charsets = {
264-
special: " !\"#$%&'()*+,-./:;<=>?@[\]^_`{|}~",
264+
special: " !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
265265
upper: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
266266
lower: "abcdefghijklmnopqrstuvwxyz",
267267
number: "0123456789"

‎public/js/create_user.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@
2727
})();
2828

2929
function getNewUser(){
30-
var result = pegasus('https://randomuser.me/api/0.4/?randomapi');
30+
var lego = "";
31+
if (document.body.classList.contains('lego')) {
32+
lego = "&lego";
33+
}
34+
35+
var result = pegasus('https://randomuser.me/api/0.4/?randomapi' + lego);
3136

3237
result.then(function(data) {
3338
if(!data['error']){
@@ -62,4 +67,4 @@ function getNewUser(){
6267
return el.getAttribute('data-label') === label;
6368
}).setAttribute('data-value', value);
6469
}
65-
}
70+
}

‎public/js/lego.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
if (kkeys.toString().indexOf(konami) >= 0) {
88
kkeys = [];
9-
getNewUser();
109
document.getElementsByTagName('header')[0].getElementsByTagName('h1')[0].innerHTML = 'Random Lego Generator';
1110
document.getElementsByTagName('body')[0].className += " lego";
1211
window.scrollTo(0, 0);
12+
getNewUser();
1313
}
1414
});
1515
}
16-
})();
16+
})();

‎routes/api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var express = require('express');
33
var router = express.Router();
44
var Request = require('../models/Request');
55

6-
var latestVersion = '1.0';
6+
var latestVersion = '1.1';
77

88
router.get('/', (req, res, next) => {
99
genUser(req, res, latestVersion);

‎views/pages/changelog.ejs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,18 @@
88
<% include ../snippets/subpage %>
99

1010
<div class="frame">
11-
<section id="1.0">
11+
<section id="1.1">
12+
<h2>Version 1.1</h2>
13+
<span>8/18/2016</span>
14+
<ul>
15+
<li>Fixed HETU for FI</li>
16+
<li>Fixed salt not being used in calculation for hashes (also hotfixed 1.0)</li>
17+
<li>DOB and Registered use ISO 8601 time standards</li>
18+
<li>DOB and Registered can't overlap in impossible ways</li>
19+
<li>Added customizable <a href="documentation#passwords">password options</a></li>
20+
</ul>
21+
</section>
22+
<section id="1.0">
1223
<h2>Version 1.0</h2>
1324
<span>4/7/2016</span>
1425
<ul>
@@ -22,11 +33,6 @@
2233
<li>Added DK and TR</li>
2334
</ul>
2435
</section>
25-
<!--
26-
<section id="0.9">
27-
stuff
28-
</section>
29-
-->
3036
<section id="0.8">
3137
<h2>Version 0.8</h2>
3238
<span>2/4/2016</span>
@@ -48,7 +54,7 @@
4854
<span>5/8/2015</span>
4955
<ul>
5056
<li>Fixed seed bug that didn't respect nationalities</li>
51-
<li>Seed is returned on 1st result only and is meant to regenerate a request with multiple results.</li>
57+
<li>Seed is returned on 1st result only and is meant to regenerate a request with multiple results</li>
5258
<li>Added AU, ES, FI, FR, IE, and NL</li>
5359
<li>Fixed GB phone numbers, zipcodes, and changed SSN to NINO</li>
5460
<li>RandomAPI members can now generate up to 1,000 results per call, <a href="documentation#multiple">Learn more</a></li>
@@ -75,8 +81,8 @@
7581
<span>5/3/2014</span>
7682
<ul>
7783
<li>Redesigned and rebranded the Random User API website and platform</li>
78-
<li>We doubled our profile photo database! We now return 100 male and 100 female portraits.</li>
79-
<li>Salts now use strictly alphanumeric characters.</li>
84+
<li>We doubled our profile photo database! We now return 100 male and 100 female portraits</li>
85+
<li>Salts now use strictly alphanumeric characters</li>
8086
<li>Restructured our file system to avoid redundancy</li>
8187
<li>Optimized generator</li>
8288
</ul>

‎views/pages/documentation.ejs

Lines changed: 65 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
<li><a href="#errors">Error Handling</a></li>
1717
<li><a href="#multiple">Requesting multiple users</a></li>
1818
<li><a href="#gender">Specifying a gender</a></li>
19-
<li><a href="#seeds">Seeds</a></li>
19+
<li><a href="#passwords">Passwords</a></li>
2020
</ul>
2121
<ul>
22+
<li><a href="#seeds">Seeds</a></li>
2223
<li><a href="#format">Formats</a></li>
2324
<li><a href="#previous">Versioning</a></li>
2425
<li><a href="#nationalities">Nationalities</a></li>
@@ -58,45 +59,45 @@ $.ajax({
5859
"gender": "<span>male</span>",
5960
"name": {
6061
"title": "<span>mr</span>",
61-
"first": "<span>samuel</span>",
62-
"last": "<span>ross</span>"
62+
"first": "<span>romain</span>",
63+
"last": "<span>hoogmoed</span>"
6364
},
6465
"location": {
65-
"street": "<span>5592 pockrus page rd</span>",
66-
"city": "<span>santa ana</span>",
67-
"state": "<span>oregon</span>",
68-
"postcode": <span>69974</span>
66+
"street": "<span>1861 jan pieterszoon coenstraat</span>",
67+
"city": "<span>maasdriel</span>",
68+
"state": "<span>zeeland</span>",
69+
"postcode": <span>69217</span>
6970
},
70-
"email": "<span>samuel.ross@example.com</span>",
71+
"email": "<span>romain.hoogmoed@example.com</span>",
7172
"login": {
72-
"username": "<span>silverwolf434</span>",
73-
"password": "<span>blackjac</span>",
74-
"salt": "<span>d14iEZQT</span>",
75-
"md5": "<span>261a57061d35918f5c3ef7f90f4f2a80</span>",
76-
"sha1": "<span>c330ad8c974ab9982622d5d5506cfed4886a79ab</span>",
77-
"sha256": "<span>8ca4a1ca48975a69bd829de61298cd6a950dede740d4c0e755d07ee4cfc06fa5</span>"
73+
"username": "<span>lazyduck408</span>",
74+
"password": "<span>jokers</span>",
75+
"salt": "<span>UGtRFz4N</span>",
76+
"md5": "<span>6d83a8c084731ee73eb5f9398b923183</span>",
77+
"sha1": "<span>cb21097d8c430f2716538e365447910d90476f6e</span>",
78+
"sha256": "<span>5a9b09c86195b8d8b01ee219d7d9794e2abb6641a2351850c49c309f1fc204a0</span>"
7879
},
79-
"registered": <span>1155461743</span>,
80-
"dob": <span>1078494582</span>,
81-
"phone": "<span>(179)-102-8139</span>",
82-
"cell": "<span>(107)-396-0688</span>",
80+
"dob": "<span>1983-07-14 07:29:45</span>",
81+
"registered": "<span>2010-09-24 02:10:42</span>",
82+
"phone": "<span>(656)-976-4980</span>",
83+
"cell": "<span>(065)-247-9303</span>",
8384
"id": {
84-
"name": "<span>SSN</span>",
85-
"value": "<span>476-30-9095</span>"
85+
"name": "<span>BSN</span>",
86+
"value": "<span>04242023</span>"
8687
},
8788
"picture": {
88-
"large": "<span>https://randomuser.me/api/portraits/men/80.jpg</span>",
89-
"medium": "<span>https://randomuser.me/api/portraits/med/men/80.jpg</span>",
90-
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/80.jpg</span>"
89+
"large": "<span>https://randomuser.me/api/portraits/men/83.jpg</span>",
90+
"medium": "<span>https://randomuser.me/api/portraits/med/men/83.jpg</span>",
91+
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/83.jpg</span>"
9192
},
92-
"nat": "<span>US</span>"
93+
"nat": "<span>NL</span>"
9394
}
9495
],
9596
"info": {
96-
"seed": "<span>705567e86a824a27</span>",
97+
"seed": "<span>2da87e9305069f1d</span>",
9798
"results": <span>1</span>,
9899
"page": <span>1</span>,
99-
"version": "<span>1.0</span>"
100+
"version": "<span>1.1</span>"
100101
}
101102
}
102103
</pre>
@@ -128,6 +129,42 @@ http://api.randomuser.me/<span>?gender=female</span>
128129
</pre>
129130
</section>
130131

132+
<section id="passwords">
133+
<h2>Passwords</h2>
134+
<p>By default, passwords are chosen randomly from a list of ~10k top used passwords. Starting with version 1.1, you can have more control over how passwords are generated using the <span>password</span> option.</p>
135+
<pre>
136+
http://api.randomuser.me/<span>?password=upper,lower,1-16</span>
137+
</pre>
138+
139+
<p>The example above would generate a password consisting of uppercase and lowercase characters ranging between 1 to 16 characters long.<br><br>
140+
You can specify options for the passwords using this format:</p>
141+
<pre>
142+
http://api.randomuser.me/<span>?password=CHARSETS,MIN_LENGTH-MAX_LENGTH</span>
143+
OR
144+
http://api.randomuser.me/<span>?password=CHARSETS,MAX_LENGTH</span>
145+
</pre>
146+
<p>You can mix and match the charsets below for the CHARSETS option above:</p>
147+
<pre>
148+
special !"#$%&'()*+,- ./:;<=>?@[\]^_`{|}~
149+
upper ABCDEFGHIJKLMNOPQRSTUVWXYZ
150+
lower abcdefghijklmnopqrstuvwxyz
151+
number 0123456789
152+
</pre>
153+
<p>MIN_LENGTH and MAX_LENGTH are the min/max length of the passwords that you want to generate.<br>
154+
By default, passwords will be between 8 - 64 characters long.<br><br>
155+
Here are some more examples of password option combinations:</p>
156+
<pre>
157+
// Special chars exactly 32 characters long
158+
http://api.randomuser.me/<span>?password=special,32</span>
159+
160+
// Uppercase chars between 1 to 8 characters long
161+
http://api.randomuser.me/<span>?password=upper,1-8</span>
162+
163+
// Special, uppercase, lowercase, and numeric chars between the default 8 to 64 characters long
164+
http://api.randomuser.me/<span>?password=special,upper,lower,number</span>
165+
</pre>
166+
</section>
167+
131168
<section id="seeds">
132169
<h2>Seeds</h2>
133170
<p>Seeds allow you to always generate the same set of users. For example, the seed "foobar" will always return results for <a href="http://api.randomuser.me/1.0/?seed=foobar" target="_blank">Becky Sims</a> (for version 1.0). Seeds can be any string or sequence of characters.</p>
@@ -158,7 +195,7 @@ http://api.randomuser.me/<span>?format=csv</span>
158195
<pre>http://api.randomuser.me/</pre>
159196
<p>The result that is returned automatically uses the latest version of the API.<br>
160197
If you want to access a specific version of the API that won't be affected by updates, do this:</p>
161-
<pre>http://api.randomuser.me/<span>1.0</span>/</pre>
198+
<pre>http://api.randomuser.me/<span>1.1</span>/</pre>
162199
</section>
163200

164201
<section id="nationalities">
@@ -168,6 +205,7 @@ http://api.randomuser.me/<span>?format=csv</span>
168205
<p>Currently, randomuser offers these nationalities:</p>
169206
<ul>
170207
<li>v1.0: AU, BR, CA, CH, DE, DK, ES, FI, FR, GB, IE, IR, NL, NZ, TR, US</li>
208+
<li>v1.1: AU, BR, CA, CH, DE, DK, ES, FI, FR, GB, IE, IR, NL, NZ, TR, US</li>
171209
</ul>
172210
<p>You can specify a nationality like so:</p>
173211
<pre>

‎views/pages/index.ejs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -73,45 +73,45 @@ $.ajax({
7373
"gender": "<span>male</span>",
7474
"name": {
7575
"title": "<span>mr</span>",
76-
"first": "<span>samuel</span>",
77-
"last": "<span>ross</span>"
76+
"first": "<span>romain</span>",
77+
"last": "<span>hoogmoed</span>"
7878
},
7979
"location": {
80-
"street": "<span>5592 pockrus page rd</span>",
81-
"city": "<span>santa ana</span>",
82-
"state": "<span>oregon</span>",
83-
"postcode": <span>69974</span>
80+
"street": "<span>1861 jan pieterszoon coenstraat</span>",
81+
"city": "<span>maasdriel</span>",
82+
"state": "<span>zeeland</span>",
83+
"postcode": <span>69217</span>
8484
},
85-
"email": "<span>samuel.ross@example.com</span>",
85+
"email": "<span>romain.hoogmoed@example.com</span>",
8686
"login": {
87-
"username": "<span>silverwolf434</span>",
88-
"password": "<span>blackjac</span>",
89-
"salt": "<span>d14iEZQT</span>",
90-
"md5": "<span>261a57061d35918f5c3ef7f90f4f2a80</span>",
91-
"sha1": "<span>c330ad8c974ab9982622d5d5506cfed4886a79ab</span>",
92-
"sha256": "<span>8ca4a1ca48975a69bd829de61298cd6a950dede740d4c0e755d07ee4cfc06fa5</span>"
87+
"username": "<span>lazyduck408</span>",
88+
"password": "<span>jokers</span>",
89+
"salt": "<span>UGtRFz4N</span>",
90+
"md5": "<span>6d83a8c084731ee73eb5f9398b923183</span>",
91+
"sha1": "<span>cb21097d8c430f2716538e365447910d90476f6e</span>",
92+
"sha256": "<span>5a9b09c86195b8d8b01ee219d7d9794e2abb6641a2351850c49c309f1fc204a0</span>"
9393
},
94-
"registered": <span>1155461743</span>,
95-
"dob": <span>1078494582</span>,
96-
"phone": "<span>(179)-102-8139</span>",
97-
"cell": "<span>(107)-396-0688</span>",
94+
"dob": "<span>1983-07-14 07:29:45</span>",
95+
"registered": "<span>2010-09-24 02:10:42</span>",
96+
"phone": "<span>(656)-976-4980</span>",
97+
"cell": "<span>(065)-247-9303</span>",
9898
"id": {
99-
"name": "<span>SSN</span>",
100-
"value": "<span>476-30-9095</span>"
99+
"name": "<span>BSN</span>",
100+
"value": "<span>04242023</span>"
101101
},
102102
"picture": {
103-
"large": "<span>https://randomuser.me/api/portraits/men/80.jpg</span>",
104-
"medium": "<span>https://randomuser.me/api/portraits/med/men/80.jpg</span>",
105-
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/80.jpg</span>"
103+
"large": "<span>https://randomuser.me/api/portraits/men/83.jpg</span>",
104+
"medium": "<span>https://randomuser.me/api/portraits/med/men/83.jpg</span>",
105+
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/83.jpg</span>"
106106
},
107-
"nat": "<span>US</span>"
107+
"nat": "<span>NL</span>"
108108
}
109109
],
110110
"info": {
111-
"seed": "<span>705567e86a824a27</span>",
111+
"seed": "<span>2da87e9305069f1d</span>",
112112
"results": <span>1</span>,
113113
"page": <span>1</span>,
114-
"version": "<span>1.0</span>"
114+
"version": "<span>1.1</span>"
115115
}
116116
}
117117
</pre>

0 commit comments

Comments
 (0)