Bug Fixed at Secrets module

lewismacnow · Dec 19, 2021 · 2737388 · 2737388
1 parent f19243f
commit 2737388
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 13 deletions.
diff --git a/DesktopRoot.js b/DesktopRoot.js
@@ -61,7 +61,7 @@ exports.newDesktopRoot = function newDesktopRoot() {
         /*
         Setting up Secrets.
         */
-        let SECRETS = require('./Secrets.js')
+        let SECRETS = require('./Secrets.js').newSecrets()
         SECRETS.initialize()
 
         run()

diff --git a/DesktopRootReact.js b/DesktopRootReact.js
@@ -61,7 +61,7 @@ exports.newDesktopRoot = function newDesktopRoot() {
         /*
         Setting up Secrets.
         */
-        let SECRETS = require('./Secrets.js')
+        let SECRETS = require('./Secrets.js').newSecrets()
         SECRETS.initialize()
 
         run()

diff --git a/NetworkRoot.js b/NetworkRoot.js
@@ -59,7 +59,7 @@ exports.newNetworkRoot = function newNetworkRoot() {
         /*
         Setting up Secrets.
         */
-        let SECRETS = require('./Secrets.js')
+        let SECRETS = require('./Secrets.js').newSecrets()
         SECRETS.initialize()
 
         NT.app = require('./Network/NetwokNode.js').newNetworkNode()

diff --git a/Projects/Open-Storage/TS/Modules/OpenStorageClient.js b/Projects/Open-Storage/TS/Modules/OpenStorageClient.js
@@ -28,19 +28,54 @@ exports.newOpenStorageModulesOpenStorageClient = function newOpenStorageModulesO
     }
 
     async function saveFile(fileName, filePath, fileContent) {
-
+        /*
+        We are going to save this file all of the Storage Containers defined.
+        */
         for (let i = 0; i < availableStorage.storageContainerReferences.length; i++) {
             let storageContainerReference = availableStorage.storageContainerReferences[i]
-            if (availableStorage.storageContainerReferences.referenceParent === undefined) { continue }
-            if (availableStorage.storageContainerReferences.referenceParent.parentNode === undefined) { continue }
+            if (storageContainerReference.referenceParent === undefined) { continue }
+            if (storageContainerReference.referenceParent.parentNode === undefined) { continue }
 
-            let storageContainer = availableStorage.storageContainerReferences.referenceParent
+            let storageContainer = storageContainerReference.referenceParent
 
-            await SA.projects.openStorage.utilities.githubStorage.saveFile(fileName, filePath, fileContent, storageContainer)
+            switch (storageContainer.parentNode.type) {
+                case 'Github Storage': {
+                    await SA.projects.openStorage.utilities.githubStorage.saveFile(fileName, filePath, fileContent, storageContainer)
+                    break
+                }
+                case 'Superalgos Storage': {
+                    // TODO Build the Superalgos Storage Provider
+                    break
+                }
+            }
         }
     }
 
     async function loadFile() {
+        /*
+        We are going to load this file from the Storage Containers defined.
+        We are going to try to read it first from the first Storage container
+        and if it is not possible we will try with the next ones.
+        */
+        let fileContent
+        for (let i = 0; i < availableStorage.storageContainerReferences.length; i++) {
+            let storageContainerReference = availableStorage.storageContainerReferences[i]
+            if (storageContainerReference.referenceParent === undefined) { continue }
+            if (storageContainerReference.referenceParent.parentNode === undefined) { continue }
 
+            let storageContainer = storageContainerReference.referenceParent
+
+            switch (storageContainer.parentNode.type) {
+                case 'Github Storage': {
+                    fileContent = await SA.projects.openStorage.utilities.githubStorage.loadFile(fileName, filePath, storageContainer)
+                    break
+                }
+                case 'Superalgos Storage': {
+                    // TODO Build the Superalgos Storage Provider
+                    break
+                }
+            }
+        }
+        return fileContent
     }
 }
diff --git a/Secrets.js b/Secrets.js
@@ -1,10 +1,10 @@
-exports.newSecrets = function () {
+exports.newSecrets = function newSecrets () {
 
     let thisObject = {
         initialize: initialize
     }
 
-    return thisObject;
+    return thisObject
 
     function initialize() {
 
@@ -20,13 +20,13 @@ exports.newSecrets = function () {
         }
 
         try {
-            SA.secrets.signingAccountSecrets = require('./My-Secrets/SigningAccountsSecrets.json').secrets
+            SA.secrets.signingAccountSecrets.array = require('./My-Secrets/SigningAccountsSecrets.json').secrets
         } catch (err) {
             // Still have an empty array.
         }
 
         try {
-            SA.secrets.apisSecrets = require('./My-Secrets/ApisSecrets.json').secrets
+            SA.secrets.apisSecrets.array = require('./My-Secrets/ApisSecrets.json').secrets
         } catch (err) {
             // Still have an empty array.
         }

diff --git a/TaskServer/TaskServer.js b/TaskServer/TaskServer.js
@@ -138,6 +138,15 @@ exports.newTaskServer = function newTaskServer() {
                     TS.projects.foundations.globals.taskConstants.OPEN_STORAGE.initialize()
 
                     //TEST IT FROM HERE.
+
+                    let fileName = "My-File-Name"
+                    let filePath = "My-Folder"
+                    let fileContent = "This is the File Content!."
+
+                    TS.projects.foundations.globals.taskConstants.OPEN_STORAGE.saveFile(fileName, filePath, fileContent)
+
+                    let receivedFileContent = TS.projects.foundations.globals.taskConstants.OPEN_STORAGE.saveFile(fileName, filePath)
+                    console.log(receivedFileContent)
                 }
 
                 async function setupP2PNetwork() {

diff --git a/TaskServerRoot.js b/TaskServerRoot.js
@@ -65,7 +65,7 @@ SA.version = require('./package.json').version
 /*
 Setting up Secrets.
 */
-let SECRETS = require('./Secrets.js')
+let SECRETS = require('./Secrets.js').newSecrets()
 SECRETS.initialize()
 
 run()