Merge pull request SpiderMath#8 from momozor/patch-1

Simply uuid() function
AkiraList · May 23, 2021 · 666f83a · 666f83a
2 parents a498749 + 8e9ca78
commit 666f83a
Showing 1 changed file with 13 additions and 25 deletions.
diff --git a/Src/Controllers/Admin.js b/Src/Controllers/Admin.js
@@ -1,34 +1,22 @@
 const APIKEYS = require('../../models/apikeys')
 
 function uuid() {
-    var result1 = '';
-    var result2 = '';
-    var result3 = '';
-    var result4 = '';
-    var result5 = '';
+    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
 
-    var characters       = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    var charactersLength = characters.length;
-
-    for ( var i = 0; i < 8; i++ ) {
-        result1 += characters.charAt(Math.floor(Math.random() * charactersLength));
-    }
-    for ( var i = 0; i < 4; i++ ) {
-        result2 += characters.charAt(Math.floor(Math.random() * charactersLength));
-    }
-    for ( var i = 0; i < 4; i++ ) {
-        result3 += characters.charAt(Math.floor(Math.random() * charactersLength));
+    const randomChoice = function(container) {
+        return Math.floor(Math.random() * container.length)
     }
-    for ( var i = 0; i < 4; i++ ) {
-        result4 += characters.charAt(Math.floor(Math.random() * charactersLength));
+    const randomCharacterFrom = function(length) {
+        return characters.charAt(randomChoice(characters))
     }
-    for ( var i = 0; i < 12; i++ ) {
-        result5 += characters.charAt(Math.floor(Math.random() * charactersLength));
+
+    const makeKeyPart = function(length) {
+        return Array(length).fill().map(function() {
+            return randomCharacterFrom(length)
+        }).join('')
     }
-
-    let final = `${result1}-${result2}-${result3}-${result4}-${result5}`
 
-    return final
+    return `${makeKeyPart(8)}-${makeKeyPart(4)}-${makeKeyPart(4)}-${makeKeyPart(4)}-${makeKeyPart(12)}`
 }
 
 
@@ -41,7 +29,7 @@ exports.newAPIKEY = async(req, res, next) => {
 
         let domain = email.split('@')[1]
 
-        if(blockedDomains.includes(`${domain}`)){
+        if(blockedDomains.includes(domain)){
             return res.render('main' , {message : "domain"})
         }
 
@@ -71,4 +59,4 @@ exports.newAPIKEY = async(req, res, next) => {
             })
         }
     }
-}
+}