Merge pull request #335 from hunterlester/update

chore/move to before_deploy

Author: bochaco

.travis.yml

@@ -26,10 +26,9 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
-script:
+before_deploy:
 - yarn install-all
 - yarn package-all
-before_deploy:
 - export EMAIL_APP="$(ls email_app/out/*.zip)";
 - export WEB_HOSTING_MANAGER="$(ls web_hosting_manager/release/*.zip)";
 - export SHA_256_SUM_EMAIL_APP="$(ls email_app/out/*.txt)";

README.md

@@ -1,3 +1,5 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/2fnekwfbm5h2ayk7/branch/master?svg=true)]
+
 # safe_examples
 Examples showcasing various features of the SAFE Network
 

appveyor.yml

@@ -16,18 +16,19 @@ install:
   - node --version
   - npm --version
   - yarn --version
+  - yarn config set child-concurrency 1
+  - yarn 
   - yarn add windows-build-tools --global
-  - yarn --ignore-optional
 
 
 build_script:
   - node --version
   - yarn --version
-  - yarn install-all
-  - yarn package-all
 
 
-after_build:
+before_deploy:
+  - yarn install-all
+  - yarn package-all
   - echo %APPVEYOR_REPO_TAG%
   - echo %APPVEYOR_REPO_TAG_NAME%
   - ps: Get-ChildItem .\email_app\out\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

safe_web_api_playground/md

@@ -25,6 +25,7 @@ module.exports = [
   'rawPubEncKey',
   'rawSecEncKey',
   'encryptedBuffer',
+  'decipheredBuffer',
   'idAddress',
   'serialisedMD',
   'hashedString',

safe_web_api_playground/static/js/api_variables.js

@@ -19,13 +19,13 @@ module.exports = {
     },
 
     decryptSealed: async () => {
-      // let cipher = <encrypted data>;
+      // let encryptedBuffer = <encrypted data>;
       try {
-        var deciphered = await window.safeCryptoEncKeyPair.decryptSealed(encKeyPairHandle, cipher)
+        decipheredBuffer = await window.safeCryptoEncKeyPair.decryptSealed(encKeyPairHandle, encryptedBuffer)
       } catch(err) {
         return err;
       }
-      return `Returns decrypted data: ${String.fromCharCode.apply(null, new Uint8Array(deciphered))}`;
+      return `Returns decrypted data: ${String.fromCharCode.apply(null, new Uint8Array(decipheredBuffer))}`;
     },
 
     free: () => {

safe_web_api_playground/static/js/code-snippets/safeCryptoEncKeyPair.js

@@ -11,25 +11,27 @@ module.exports = {
 
     encryptSealed: async () => {
       // For practical application use, pubEncKeyHandle should be the recipients public key
-      // let str = <utf-8 string> or <buffer>;
+      // let stringOrBuffer = <utf-8 string> or <buffer>;
+      const stringOrBuffer = 'plain string to be encrypted';
       try {
-        encryptedBuffer = await window.safeCryptoPubEncKey.encryptSealed(pubEncKeyHandle, str)
+        encryptedBuffer = await window.safeCryptoPubEncKey.encryptSealed(pubEncKeyHandle, stringOrBuffer)
       } catch(err) {
         return err;
       }
-      return `Returns encrypted data: ${String.fromCharCode.apply(null, new Uint8Array(res))}`;
+      return `Returns encrypted data: ${String.fromCharCode.apply(null, new Uint8Array(encryptedBuffer))}`;
     },
 
     encrypt: async () => {
       // For practical application use, pubEncKeyHandle should be the recipients public key
-      // str can be <utf-8 string> or <buffer>;
+      // stringOrBuffer can be <utf-8 string> or <buffer>;
       // secretKey must be 64-bit value
+      const stringOrBuffer = 'plain string to be encrypted';
       try {
-        encryptedBuffer = await window.safeCryptoPubEncKey.encrypt(pubEncKeyHandle, str, secretKey)
+        encryptedBuffer = await window.safeCryptoPubEncKey.encrypt(pubEncKeyHandle, stringOrBuffer, secEncKeyHandle)
       } catch(err) {
         return err;
       }
-       return `Returns encrypted data: ${String.fromCharCode.apply(null, new Uint8Array(res))}`;
+       return `Returns encrypted data: ${String.fromCharCode.apply(null, new Uint8Array(encryptedBuffer))}`;
     },
 
     free: () => {

safe_web_api_playground/static/js/code-snippets/safeCryptoPubEncKey.js

@@ -11,11 +11,11 @@ module.exports = {
 
     decrypt: async () => {
       try {
-        encryptedBuffer = await window.safeCryptoSecEncKey.decrypt(secEncKeyHandle, cipher, pubEncKeyHandle)
+        decipheredBuffer = await window.safeCryptoSecEncKey.decrypt(secEncKeyHandle, encryptedBuffer, pubEncKeyHandle)
       } catch(err) {
         return err;
       }
-      return `Returns encrypted data: ${String.fromCharCode.apply(null, new Uint8Array(res.buffer))}`;
+      return `Returns deciphered data: ${String.fromCharCode.apply(null, new Uint8Array(decipheredBuffer))}`;
     },
 
     free: () => {

safe_web_api_playground/static/js/code-snippets/safeCryptoSecEncKey.js

@@ -30,7 +30,7 @@ module.exports = {
         await window.safeMutableDataEntries.forEach(entriesHandle, (k, v) => {
 
           let key = String.fromCharCode.apply(null, k);
-          let value = String.fromCharCode.apply(null, new Uint8Array(v.buf));
+          let value = String.fromCharCode.apply(null, v.buf);
 
           console.log(key + ': ' + value);