Skip to content

V1.1 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 18, 2016
Merged

V1.1 #75

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/1.1/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ Generator.prototype.genPassword = function() {
}

let charsets = {
special: " !\"#$%&'()*+,-./:;<=>?@[\]^_`{|}~",
special: " !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
upper: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
lower: "abcdefghijklmnopqrstuvwxyz",
number: "0123456789"
Expand Down
9 changes: 7 additions & 2 deletions public/js/create_user.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
})();

function getNewUser(){
var result = pegasus('https://randomuser.me/api/0.4/?randomapi');
var lego = "";
if (document.body.classList.contains('lego')) {
lego = "&lego";
}

var result = pegasus('https://randomuser.me/api/0.4/?randomapi' + lego);

result.then(function(data) {
if(!data['error']){
Expand Down Expand Up @@ -62,4 +67,4 @@ function getNewUser(){
return el.getAttribute('data-label') === label;
}).setAttribute('data-value', value);
}
}
}
4 changes: 2 additions & 2 deletions public/js/lego.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

if (kkeys.toString().indexOf(konami) >= 0) {
kkeys = [];
getNewUser();
document.getElementsByTagName('header')[0].getElementsByTagName('h1')[0].innerHTML = 'Random Lego Generator';
document.getElementsByTagName('body')[0].className += " lego";
window.scrollTo(0, 0);
getNewUser();
}
});
}
})();
})();
2 changes: 1 addition & 1 deletion routes/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var express = require('express');
var router = express.Router();
var Request = require('../models/Request');

var latestVersion = '1.0';
var latestVersion = '1.1';

router.get('/', (req, res, next) => {
genUser(req, res, latestVersion);
Expand Down
24 changes: 15 additions & 9 deletions views/pages/changelog.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,18 @@
<% include ../snippets/subpage %>

<div class="frame">
<section id="1.0">
<section id="1.1">
<h2>Version 1.1</h2>
<span>8/18/2016</span>
<ul>
<li>Fixed HETU for FI</li>
<li>Fixed salt not being used in calculation for hashes (also hotfixed 1.0)</li>
<li>DOB and Registered use ISO 8601 time standards</li>
<li>DOB and Registered can't overlap in impossible ways</li>
<li>Added customizable <a href="documentation#passwords">password options</a></li>
</ul>
</section>
<section id="1.0">
<h2>Version 1.0</h2>
<span>4/7/2016</span>
<ul>
Expand All @@ -22,11 +33,6 @@
<li>Added DK and TR</li>
</ul>
</section>
<!--
<section id="0.9">
stuff
</section>
-->
<section id="0.8">
<h2>Version 0.8</h2>
<span>2/4/2016</span>
Expand All @@ -48,7 +54,7 @@
<span>5/8/2015</span>
<ul>
<li>Fixed seed bug that didn't respect nationalities</li>
<li>Seed is returned on 1st result only and is meant to regenerate a request with multiple results.</li>
<li>Seed is returned on 1st result only and is meant to regenerate a request with multiple results</li>
<li>Added AU, ES, FI, FR, IE, and NL</li>
<li>Fixed GB phone numbers, zipcodes, and changed SSN to NINO</li>
<li>RandomAPI members can now generate up to 1,000 results per call, <a href="documentation#multiple">Learn more</a></li>
Expand All @@ -75,8 +81,8 @@
<span>5/3/2014</span>
<ul>
<li>Redesigned and rebranded the Random User API website and platform</li>
<li>We doubled our profile photo database! We now return 100 male and 100 female portraits.</li>
<li>Salts now use strictly alphanumeric characters.</li>
<li>We doubled our profile photo database! We now return 100 male and 100 female portraits</li>
<li>Salts now use strictly alphanumeric characters</li>
<li>Restructured our file system to avoid redundancy</li>
<li>Optimized generator</li>
</ul>
Expand Down
92 changes: 65 additions & 27 deletions views/pages/documentation.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
<li><a href="#errors">Error Handling</a></li>
<li><a href="#multiple">Requesting multiple users</a></li>
<li><a href="#gender">Specifying a gender</a></li>
<li><a href="#seeds">Seeds</a></li>
<li><a href="#passwords">Passwords</a></li>
</ul>
<ul>
<li><a href="#seeds">Seeds</a></li>
<li><a href="#format">Formats</a></li>
<li><a href="#previous">Versioning</a></li>
<li><a href="#nationalities">Nationalities</a></li>
Expand Down Expand Up @@ -58,45 +59,45 @@ $.ajax({
"gender": "<span>male</span>",
"name": {
"title": "<span>mr</span>",
"first": "<span>samuel</span>",
"last": "<span>ross</span>"
"first": "<span>romain</span>",
"last": "<span>hoogmoed</span>"
},
"location": {
"street": "<span>5592 pockrus page rd</span>",
"city": "<span>santa ana</span>",
"state": "<span>oregon</span>",
"postcode": <span>69974</span>
"street": "<span>1861 jan pieterszoon coenstraat</span>",
"city": "<span>maasdriel</span>",
"state": "<span>zeeland</span>",
"postcode": <span>69217</span>
},
"email": "<span>samuel.ross@example.com</span>",
"email": "<span>romain.hoogmoed@example.com</span>",
"login": {
"username": "<span>silverwolf434</span>",
"password": "<span>blackjac</span>",
"salt": "<span>d14iEZQT</span>",
"md5": "<span>261a57061d35918f5c3ef7f90f4f2a80</span>",
"sha1": "<span>c330ad8c974ab9982622d5d5506cfed4886a79ab</span>",
"sha256": "<span>8ca4a1ca48975a69bd829de61298cd6a950dede740d4c0e755d07ee4cfc06fa5</span>"
"username": "<span>lazyduck408</span>",
"password": "<span>jokers</span>",
"salt": "<span>UGtRFz4N</span>",
"md5": "<span>6d83a8c084731ee73eb5f9398b923183</span>",
"sha1": "<span>cb21097d8c430f2716538e365447910d90476f6e</span>",
"sha256": "<span>5a9b09c86195b8d8b01ee219d7d9794e2abb6641a2351850c49c309f1fc204a0</span>"
},
"registered": <span>1155461743</span>,
"dob": <span>1078494582</span>,
"phone": "<span>(179)-102-8139</span>",
"cell": "<span>(107)-396-0688</span>",
"dob": "<span>1983-07-14 07:29:45</span>",
"registered": "<span>2010-09-24 02:10:42</span>",
"phone": "<span>(656)-976-4980</span>",
"cell": "<span>(065)-247-9303</span>",
"id": {
"name": "<span>SSN</span>",
"value": "<span>476-30-9095</span>"
"name": "<span>BSN</span>",
"value": "<span>04242023</span>"
},
"picture": {
"large": "<span>https://randomuser.me/api/portraits/men/80.jpg</span>",
"medium": "<span>https://randomuser.me/api/portraits/med/men/80.jpg</span>",
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/80.jpg</span>"
"large": "<span>https://randomuser.me/api/portraits/men/83.jpg</span>",
"medium": "<span>https://randomuser.me/api/portraits/med/men/83.jpg</span>",
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/83.jpg</span>"
},
"nat": "<span>US</span>"
"nat": "<span>NL</span>"
}
],
"info": {
"seed": "<span>705567e86a824a27</span>",
"seed": "<span>2da87e9305069f1d</span>",
"results": <span>1</span>,
"page": <span>1</span>,
"version": "<span>1.0</span>"
"version": "<span>1.1</span>"
}
}
</pre>
Expand Down Expand Up @@ -128,6 +129,42 @@ http://api.randomuser.me/<span>?gender=female</span>
</pre>
</section>

<section id="passwords">
<h2>Passwords</h2>
<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>
<pre>
http://api.randomuser.me/<span>?password=upper,lower,1-16</span>
</pre>

<p>The example above would generate a password consisting of uppercase and lowercase characters ranging between 1 to 16 characters long.<br><br>
You can specify options for the passwords using this format:</p>
<pre>
http://api.randomuser.me/<span>?password=CHARSETS,MIN_LENGTH-MAX_LENGTH</span>
OR
http://api.randomuser.me/<span>?password=CHARSETS,MAX_LENGTH</span>
</pre>
<p>You can mix and match the charsets below for the CHARSETS option above:</p>
<pre>
special !"#$%&'()*+,- ./:;<=>?@[\]^_`{|}~
upper ABCDEFGHIJKLMNOPQRSTUVWXYZ
lower abcdefghijklmnopqrstuvwxyz
number 0123456789
</pre>
<p>MIN_LENGTH and MAX_LENGTH are the min/max length of the passwords that you want to generate.<br>
By default, passwords will be between 8 - 64 characters long.<br><br>
Here are some more examples of password option combinations:</p>
<pre>
// Special chars exactly 32 characters long
http://api.randomuser.me/<span>?password=special,32</span>

// Uppercase chars between 1 to 8 characters long
http://api.randomuser.me/<span>?password=upper,1-8</span>

// Special, uppercase, lowercase, and numeric chars between the default 8 to 64 characters long
http://api.randomuser.me/<span>?password=special,upper,lower,number</span>
</pre>
</section>

<section id="seeds">
<h2>Seeds</h2>
<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>
Expand Down Expand Up @@ -158,7 +195,7 @@ http://api.randomuser.me/<span>?format=csv</span>
<pre>http://api.randomuser.me/</pre>
<p>The result that is returned automatically uses the latest version of the API.<br>
If you want to access a specific version of the API that won't be affected by updates, do this:</p>
<pre>http://api.randomuser.me/<span>1.0</span>/</pre>
<pre>http://api.randomuser.me/<span>1.1</span>/</pre>
</section>

<section id="nationalities">
Expand All @@ -168,6 +205,7 @@ http://api.randomuser.me/<span>?format=csv</span>
<p>Currently, randomuser offers these nationalities:</p>
<ul>
<li>v1.0: AU, BR, CA, CH, DE, DK, ES, FI, FR, GB, IE, IR, NL, NZ, TR, US</li>
<li>v1.1: AU, BR, CA, CH, DE, DK, ES, FI, FR, GB, IE, IR, NL, NZ, TR, US</li>
</ul>
<p>You can specify a nationality like so:</p>
<pre>
Expand Down
50 changes: 25 additions & 25 deletions views/pages/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -73,45 +73,45 @@ $.ajax({
"gender": "<span>male</span>",
"name": {
"title": "<span>mr</span>",
"first": "<span>samuel</span>",
"last": "<span>ross</span>"
"first": "<span>romain</span>",
"last": "<span>hoogmoed</span>"
},
"location": {
"street": "<span>5592 pockrus page rd</span>",
"city": "<span>santa ana</span>",
"state": "<span>oregon</span>",
"postcode": <span>69974</span>
"street": "<span>1861 jan pieterszoon coenstraat</span>",
"city": "<span>maasdriel</span>",
"state": "<span>zeeland</span>",
"postcode": <span>69217</span>
},
"email": "<span>samuel.ross@example.com</span>",
"email": "<span>romain.hoogmoed@example.com</span>",
"login": {
"username": "<span>silverwolf434</span>",
"password": "<span>blackjac</span>",
"salt": "<span>d14iEZQT</span>",
"md5": "<span>261a57061d35918f5c3ef7f90f4f2a80</span>",
"sha1": "<span>c330ad8c974ab9982622d5d5506cfed4886a79ab</span>",
"sha256": "<span>8ca4a1ca48975a69bd829de61298cd6a950dede740d4c0e755d07ee4cfc06fa5</span>"
"username": "<span>lazyduck408</span>",
"password": "<span>jokers</span>",
"salt": "<span>UGtRFz4N</span>",
"md5": "<span>6d83a8c084731ee73eb5f9398b923183</span>",
"sha1": "<span>cb21097d8c430f2716538e365447910d90476f6e</span>",
"sha256": "<span>5a9b09c86195b8d8b01ee219d7d9794e2abb6641a2351850c49c309f1fc204a0</span>"
},
"registered": <span>1155461743</span>,
"dob": <span>1078494582</span>,
"phone": "<span>(179)-102-8139</span>",
"cell": "<span>(107)-396-0688</span>",
"dob": "<span>1983-07-14 07:29:45</span>",
"registered": "<span>2010-09-24 02:10:42</span>",
"phone": "<span>(656)-976-4980</span>",
"cell": "<span>(065)-247-9303</span>",
"id": {
"name": "<span>SSN</span>",
"value": "<span>476-30-9095</span>"
"name": "<span>BSN</span>",
"value": "<span>04242023</span>"
},
"picture": {
"large": "<span>https://randomuser.me/api/portraits/men/80.jpg</span>",
"medium": "<span>https://randomuser.me/api/portraits/med/men/80.jpg</span>",
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/80.jpg</span>"
"large": "<span>https://randomuser.me/api/portraits/men/83.jpg</span>",
"medium": "<span>https://randomuser.me/api/portraits/med/men/83.jpg</span>",
"thumbnail": "<span>https://randomuser.me/api/portraits/thumb/men/83.jpg</span>"
},
"nat": "<span>US</span>"
"nat": "<span>NL</span>"
}
],
"info": {
"seed": "<span>705567e86a824a27</span>",
"seed": "<span>2da87e9305069f1d</span>",
"results": <span>1</span>,
"page": <span>1</span>,
"version": "<span>1.0</span>"
"version": "<span>1.1</span>"
}
}
</pre>
Expand Down