Staging

.dockerignore

@@ -1,5 +1,5 @@
 .git/
-#node_modules/
+node_modules/
 config/cloudboost.json
 .vscode/
 *.suo

.snyk

@@ -0,0 +1,17 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.8.0
+ignore: {}
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  'npm:debug:20170905':
+    - nodemailer-mailgun-transport > mailgun-js > debug:
+        patched: '2017-11-21T04:47:12.009Z'
+  'npm:ms:20170412':
+    - nodemailer-mailgun-transport > mailgun-js > debug > ms:
+        patched: '2017-11-21T04:47:12.009Z'
+  'npm:qs:20140806-1':
+    - winston-bishop-slack > winston > request > qs:
+        patched: '2017-11-21T04:47:12.009Z'
+  'npm:request:20160119':
+    - winston-bishop-slack > winston > request:
+        patched: '2017-11-21T04:47:12.009Z'

.travis.yml

@@ -28,22 +28,20 @@ install:
   fi
 - docker run --name cloudboost -e  MAIL_PROVIDER=$MAIL_PROVIDER -e  MAIL_PROVIDER_API_KEY=$MAIL_PROVIDER_API_KEY -e  DOMAIN=$DOMAIN -e  FROM_EMAIL=$FROM_EMAIL -e  FROM_NAME=$FROM_NAME -p 4730:4730 -it --link redis:redis --link mongo:mongo -d cloudboost/cloudboost:2.0.$TRAVIS_BUILD_NUMBER
 - sleep 30s
-- git clone https://github.com/cloudboost/javascriptsdk
-- cd javascriptsdk
-- npm install
+- docker logs cloudboost
+- webpack
 - grunt
 - npm test
-- cd ..
 after_success:
 - if [ "$TRAVIS_BRANCH" == "staging" ]; then
-    docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD --email $DOCKEREMAIL;
+    docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD;
     docker push cloudboost/cloudboost:staging;
     git clone https://github.com/CloudBoost/kube-cred.git;
     cd kube-cred;
-    openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC;
+    openssl enc -in config_staging.enc -out config -d -aes256 -k $KUBE_ENC;
     mkdir ~/.kube;
     mv config ~/.kube/;
-    kubectl rolling-update cloudboost-engine-staging --image=cloudboost/cloudboost:staging --image-pull-policy=Always;
+    kubectl rolling-update cloudboost-api-staging --image=cloudboost/cloudboost:staging --image-pull-policy=Always;
   fi
 before_deploy:
   - git config --global user.email "builds@travis-ci.com"
@@ -62,19 +60,29 @@ deploy:
 after_deploy:
 # Docker Deploy.
 - if [ "$TRAVIS_BRANCH" == "master" ]; then
-  docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD --email $DOCKEREMAIL;
+  docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD;
   docker push cloudboost/cloudboost:2.0.$TRAVIS_BUILD_NUMBER;
   docker push cloudboost/cloudboost:latest;
   git clone https://github.com/CloudBoost/kube-cred.git;
   cd kube-cred;
   openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC;
   mkdir ~/.kube;
   mv config ~/.kube/;
-  kubectl rolling-update cloudboost-engine --image=cloudboost/cloudboost:latest --image-pull-policy=Always;
+  kubectl rolling-update cloudboost-api --image=cloudboost/cloudboost:latest --image-pull-policy=Always;
+   # publish to npm
+  cd sdk
+  npm install
+  npm set init.author.name $NPM_USERNAME
+  npm set init.author.email $NPM_EMAIL
+  npm set init.author.url "https://cloudboost.io"
+  npm --no-git-tag-version version 2.0.$TRAVIS_BUILD_NUMBER --force
+  echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
+  sleep 10s
+  npm publish
   fi
 branches:
   except:
     - /^*-v[0-9]/
 #Notify Team on Slack
 notifications:
-  slack: cloudboost:gm7nWJDLDtBRyF75VKLKOoMW
+  slack: hackerbaycompany:gm7nWJDLDtBRyF75VKLKOoMW

Dockerfile

@@ -2,7 +2,7 @@
 # CloudBoost Dockerfile
 #
 # Pull base image nodejs image.
-FROM node:7.5.0
+FROM node:6.12.0
 
 #Maintainer.
 MAINTAINER Nawaz Dhandala <nawazdhandala@outlook.com>

README.md

@@ -1,17 +1,16 @@
-<img src="https://www.dropbox.com/s/7ghf1kl7crp5bvy/CbLogoIcon.png?raw=1" height="80" />
+<img src="https://www.dropbox.com/s/gpdhpr3c63dquby/CLoudBoostLogo-Circle-250.png?dl=0&raw=1" height="150" style="text-align: center;" />
 
 [![Build Status](https://travis-ci.org/CloudBoost/cloudboost.svg?branch=master)](https://travis-ci.org/CloudBoost/cloudboost)
 [![OpenCollective](https://opencollective.com/cloudboost/backers/badge.svg)](#backers) 
 
-CloudBoost is the complete serverless platform for your app. **Think of CloudBoost as Parse + Firebase + Algolia + Iron.io all combined into one** :
+CloudBoost is the complete cloud platform for your app. **Think of CloudBoost as Parse + Firebase + Algolia + Iron.io all combined into one** :
  - Data-Storage / JSON Storage / BLOB Storage
  - 100% data ownership
  - Realtime
- - Search
- - Cache
- - Queues
- - More - ACL's, User Authentication, Server-less apps and more.
+ - Search 
+ - More - ACL's, User Authentication, and more.
 
+CloudBoost also has a [managed service](https://www.cloudboost.io), so you don't have to install or configure anything. You can sign up for the managed service [here.](https://www.cloudboost.io)
 
 
 ## Deploy with Docker (recommended)
@@ -137,6 +136,73 @@ Once your app is ready, You can then get the latest SDK from  https://tutorials.
 
 You can then follow rest of the documentation from https://tutorials.cloudboost.io. You can also check out API Reference on https://docs.cloudboost.io
 
+## JavaScript SDK
+
+JavaScript SDK can be found in the `sdk` folder of this repo. 
+
+### NPM Installation
+```
+npm install cloudboost
+```
+
+### NodeJS Usage
+
+``` js
+
+var CB = require('cloudboost');
+
+```
+
+### Bower Installation
+```
+bower install cloudboost
+```
+
+### JavaScript Usage
+
+``` js
+<script src="bower_components/cloudboost/dist/cloudboost.js"></script>
+```
+
+### Module Bundlers
+
+``` js
+// For ES6/ES7 , TypeScript(typings included)
+import * as CB from 'cloudboost';
+
+//For ES5 (requireJs)
+var CB = require('cloudboost');
+
+```
+
+### Sample Code
+
+``` js
+
+// AppID and AppKey are your App ID and key of the application created in CloudBoost Dashboard.
+
+//Init your Application
+CB.CloudApp.init('YourAppId','YourAppKey');
+
+//Data Storage : Create a CloudObject of type 'Custom' (Note: You need to create a table 'Custom' on CloudBoost Dashboard)
+
+var obj = new CB.CloudObject('Custom');
+
+//Set the property 'name' (Note: Create a column 'name' of type text on CloudBoost Dashboard)
+obj.set('name','CloudBoost');
+
+//Save the object
+obj.save({
+    success:function(res){
+        console.log("object saved successfully");
+    },
+    error:function(err){
+        console.log("error while saving object");
+    }
+});
+
+```
+
 ## Cluster Maintenance, Scale, and Updates
 
 CloudBoost runs on MongoDB and Redis. You're responsible for managing the [uptime](https://en.wikipedia.org/wiki/Uptime), [replication](https://en.wikipedia.org/wiki/Replication_(computing)), [sharding](https://en.wikipedia.org/wiki/Shard_(database_architecture)), [backups](https://en.wikipedia.org/wiki/Backup) of your data in each of these databases. 
@@ -156,6 +222,10 @@ To read more about app settings, check [Click here](https://github.com/CloudBoos
 - Email: [support@cloudboost.io](support@cloudboost.io)
 - Twitter: [@cloudboostio](https://twitter.com/cloudboostio)
 
+# Tests
+
+Tests are in a seperate repository. You can find them [here.](https://www.github.com/cloudboost/javascriptsdk)  
+
 # Contributing
 
 [Pull requests](https://help.github.com/articles/about-pull-requests/) are very welcome!

api/app/Admin.js

@@ -8,63 +8,63 @@ module.exports = function() {
 
     //Change MasterKey/ClientKey
     global.app.put('/admin/:appId/clientkey',function(req, res) { 
-        console.log("++++ Change ClientKey ++++++");
+
 
         try{          
 
             var appId = req.params.appId;   
 
             if (global.keys.secureKey === req.body.secureKey) {
-                console.log("Secure Key Valid. Changing ClientKey...");
+
 
                 global.appService.changeAppClientKey(appId,req.body.value).then(function (app){
-                    console.log("Success : Changing ClientKey.");
+
                     res.status(200).json(app);
                 }, function (err){
-                    console.log("Error : Changing ClientKey.");
-                    console.log(err);
+
+
                     res.status(500).send("Error");
                 });
 
             } else {
-                console.log("Unauthorized: Invalid Secure Key ");
+
                 res.status(401).send("Unauthorized");
             }        
 
 
         }catch(e){
-            console.log(e);
+
         }
     });
 
     //Change MasterKey/ClientKey
     global.app.put('/admin/:appId/masterkey',function(req, res) {
-        console.log("++++ Change Masterkey ++++++");
+
 
         try{          
 
             var appId = req.params.appId;   
 
             if (global.keys.secureKey === req.body.secureKey) {
-                console.log("Secure Key Valid. Changing Masterkey...");
+
 
                 global.appService.changeAppMasterKey(appId,req.body.value).then(function (app){
-                    console.log("Success : Changing Masterkey.");
+
                     res.status(200).json(app);
                 }, function (err){
-                    console.log("Error : Changing Masterkey.");
-                    console.log(err);
+
+
                     res.status(500).send("Error");
                 });
 
             } else {
-                console.log("Unauthorized: Invalid Secure Key ");
+
                 res.status(401).send("Unauthorized");
             }        
 
 
         }catch(e){
-            console.log(e);
+
         }
     });
 
@@ -78,7 +78,7 @@ module.exports = function() {
     -Error : Error Data( 'Server Error' : status 500 )
     */
     global.app.post('/admin/dbaccess/enable/:appId',function(req, res) {
-        console.log("++++ MongoDb Native Access ++++++");
+
         try {
             if (global.keys.secureKey === req.body.secureKey) {
                 global.appService.createDatabaseUser(req.params.appId).then(function (userData){
@@ -87,12 +87,12 @@ module.exports = function() {
                     res.status(500).send("Server Erorr");
                 });
             } else {
-                console.log("Unauthorized: Invalid Secure Key ");
+
                 res.status(401).send("Unauthorized");
             } 
 
         } catch(e){
-            console.log(e);
+
         }
     });
 };