some updates

Author: alan2207

app.js

@@ -50,6 +50,6 @@ app.get('/', function(req, res) {
 }) 
 
 
-app.listen(3000, function() {
+app.listen(process.env.port || 3000, function() {
     console.log('Server started on localhost:3000');
 });

controllers/url-shortener.js

@@ -3,17 +3,20 @@ var validUrl = require('valid-url');
 
 module.exports = function(app) {
     // generating a random number for shorter URL
-    var randomNum = Math.floor(Math.random() * 10000) + 1;
+    var randomNum;
     // getting source url of the host, just defining as global
     var sourceUrl; 
     // getting url that is passed as parameter, just defining as global
     var url;
 
     // route for index.html
     app.get('/shortenURL', function(req, res) {
+
+        randomNum = Math.floor(Math.random() * 10000) + 1;
+
         // getting the sourceUrl from main route and storing it globally
-        sourceUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
-        res.render('shortenURL-index');
+        sourceUrl = req.protocol + '://' + req.get('host');
+        res.render('shortenURL-index', {url: sourceUrl, num: randomNum});
     });
 
     // route for recieving parameter for url
@@ -24,17 +27,19 @@ module.exports = function(app) {
         if(validUrl.isUri(url)) {
             res.json({
                 original_url: req.params.url,
-                short_url: sourceUrl + '' + randomNum
+                short_url: sourceUrl + '/shorten/' + randomNum
             });
             // otherwise display error message
-        } else {
-            res.render('shortenURL-error');
         }
     }); 
 
+  
     // route for shorter url that will redirect to the wanted url
-    app.get('/' + randomNum, function(req, res) {
-        res.redirect(302, url);
+    app.get('/shorten/:num'  , function(req, res) {
+        if(req.params.num == randomNum) {
+            res.redirect(301, url);
+        } else {
+            res.render('shortenURL-index', {url: sourceUrl, num: randomNum});
+        }
     });
-
 }

controllers/whoami.js

@@ -1,7 +1,8 @@
-var os = require('os');
-
+var useragent = require('express-useragent');
 module.exports = function(app) {
 
+    app.use(useragent.express());
+
     app.get('/whoami', function(req, res) {
         res.render('whoami');
     })
@@ -10,7 +11,7 @@ module.exports = function(app) {
         res.json({
             ipaddress: req.ip,
             language: req.headers["accept-language"].split(',')[0],
-            software: `${os.type()} ${os.release()}, ${os.platform()}, ${os.arch()}`
+            software: `${req.useragent.os} ${req.useragent.platform}, ${req.useragent.browser} ${req.useragent.version}`
         });
     });
 }

package.json

@@ -13,6 +13,7 @@
     "cors": "^2.8.3",
     "ejs": "^2.5.6",
     "express": "^4.15.3",
+    "express-useragent": "^1.0.7",
     "mongoose": "^4.10.0",
     "multer": "^1.3.0",
     "node-bing-api": "^3.2.1",

views/shortenURL-error.ejs

@@ -19,13 +19,13 @@
         </ul>
 
         <h2>Example creation usage:</h2>
-        <p>As natural: <code>https://little-url.herokuapp.com/new/https://www.google.com</code></p>
+        <p>As natural: <code><%= url %>/shortenURL/https://www.google.com</code></p>
 
         <h2>Example creation output:</h2>
-        <code>{ "original_url":"https://www.google.com", "short_url":"https://little-url.herokuapp.com/2871" }
+        <code>{ "original_url":"https://www.google.com", "short_url":"<%= url %>/shorten/<%= num %>" }
 </code>
         <h2>Usage:</h2>
-        <code>https://little-url.herokuapp.com/2871</code>
+        <code><%= url %>/shorten/2871</code>
 
         <h2>Will redirect to:</h2>
         <code>https://www.google.com/</code>