pathchain 1.0.19 → 1.0.22

package/checker.js

@@ -48,22 +48,28 @@ function checkEmptyDir(dir) {
  * 
  * @return {bool}  used_secret
  */
-function isSecretUsed(xsecret) {
-    // DECODING SECRET
-    var secret_pb = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'))
+function isSecretUsed(xsecret, xauthor = "") {
+    if(xauthor != ""){
+        xauthor = xauthor + '/';
+    }
 
+    // LOADING PB
+    var secret_pb = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'))
+    
     // NOT FOUND EXCEPTION
-    var secret_enc;
+    var fileContents;
     try {
-        secret_enc = fs.readFileSync("files/"+xsecret)
+        fileContents = fs.readFileSync("files/" + xauthor + "secrets/" + xsecret);
     } catch (err) {
         if (err.code === 'ENOENT') {
-            return "Secret not found:(";
+            return "Secret not found";
         } else {
             throw err;
         }
     }
-    
+
+    // DECODING SECRET
+    var secret_enc = fileContents
     var secret_obj = secret_pb.secret.decode(secret_enc)
 
     if(secret_obj.used == false){

package/getter.js

@@ -126,7 +126,6 @@ function getSecretObj(xsecret, xauthor) {
  * @return void
  */
 function getEntityObj(xentity, xauthor) {
-    
     if(xauthor != ""){
         xauthor = xauthor + '/';
     }

package/index.js

@@ -102,8 +102,8 @@ exports.makeEntity = (xsecret, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') => {
  * 
  * @return {obj} entity_object (entity object)
  */
-exports.getEntityObj = (xentity) => {
-    const entity_object = getter.getEntityObj(xentity);
+exports.getEntityObj = (xentity, xauthor="") => {
+    const entity_object = getter.getEntityObj(xentity, xauthor);
     return entity_object;
 }
 

package/maker.js

@@ -4,6 +4,7 @@ var dt = require('date-and-time');
 var sha256 = require("js-sha256");
 const getter = require("./getter");
 const checker = require("./checker");
+const updater = require("./updater");
 
 /** moment
  * [Moment Protocol Buffer Creation]
@@ -164,17 +165,13 @@ function pioneer(xbigbang, format) {
  * @return {string} secret_hash
  */
 function entity(xsecret, format) {
-    // "secret/hash" FORMAT EXCEPTION
-    /*if(xsecret.split("/").length > 1){ 
-        xsecret = xsecret.split("/")[1]
-    }*/
 
     checker.checkDir("files/entities/");
     if(checker.checkEmptyDir("files/entities/")){
         return "A pioneer's secret is needed to create the first entity. There was no pioneer, but here is the one at 'files/pioneer/'" + pioneer();
     }
     else{
-        if(!checker.isSecretUsed(xsecret)){
+        if(checker.isSecretUsed(xsecret) == false){
             // CREATING entity
             var entity = pb(fs.readFileSync('node_modules/pathchain/proto/entity.proto'))
             
@@ -194,13 +191,15 @@ function entity(xsecret, format) {
                 tag: "entities/"+entity_hash,
             })
 
+            updater.useSecret(xsecret, entity_hash);
+
             checker.checkDir("files/entities/") // checking
             fs.writeFileSync("files/entities/" + entity_hash, buffer);
 
-            return "entities/"+entity_hash
+            return entity_hash
         }
         else{
-            return "Secret has been already used!"
+            return "Secret has been already used or it was not found"
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pathchain",
-  "version": "1.0.19",
+  "version": "1.0.22",
   "dependencies": {
     "date-and-time": "^3.0.2",
     "empty-dir": "^3.0.0",

package/updater.js

@@ -9,36 +9,36 @@ var pb = require('protocol-buffers');
  * 
  * @return {string} xsecret
  */
-function useSecret(xsecret, xentity){
-    // DECODING SECRET
-    var secret_pb = pb(fs.readFileSync('node_modules/pathos-proto-infra/proto/secret.proto'))
+function useSecret(xsecret, xauthor = "") {
+    if(xauthor != ""){
+        xauthor = xauthor + '/';
+    }
 
+    // LOADING PB
+    var secret_pb = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'))
+    
     // NOT FOUND EXCEPTION
-    var secret_enc;
+    var fileContents;
     try {
-        secret_enc = fs.readFileSync("files/secrets/"+xsecret)
+        fileContents = fs.readFileSync("files/" + xauthor + "secrets/" + xsecret);
     } catch (err) {
         if (err.code === 'ENOENT') {
-            return "Secret not found :(";
+            return "Secret not found";
         } else {
             throw err;
         }
     }
-    
+
+    // DECODING SECRET
+    var secret_enc = fileContents
     var secret_obj = secret_pb.secret.decode(secret_enc)
 
     if(secret_obj.used == false){
         // USING INVITE SECRET
-        secret_obj.used = true
-
-        var register = new Date()
-        register = dt.format(register, dt.compile(format, true));
-
-        var register_moment_hash = moment(register, format, 0, 0, 0, 0, 0)
-
+        secret_obj.used = true;
+        secret_obj.user = "entities/"+xauthor;
         
-
-        fs.writeFileSync("files/secrets/" + xsecret, secret_pb.secret.encode(secret_obj));
+        fs.writeFileSync("files/" + xauthor + "secrets/" + xsecret, secret_pb.secret.encode(secret_obj));
 
         return xsecret;
     }