first working code

Author: data-henrik

README.md

@@ -1,8 +1,8 @@
 # Modern Web Application using MEAN stack
 
-This is a basic boilerplate for the MEAN stack ([MongoDB](https://www.mongodb.org/), [Express](http://expressjs.com/), [AngularJS](https://angularjs.org/) and [Node.js](https://nodejs.org)) on [IBM Cloud](http://bluemix.net).
+This is a basic boilerplate for the MEAN stack ([MongoDB](https://www.mongodb.org/), [Express](http://expressjs.com/), [AngularJS](https://angularjs.org/) and [Node.js](https://nodejs.org)) on [IBM Cloud](https://cloud.ibm.com).
 
-This application uses the [Compose for MongoDB service](https://console.bluemix.net/catalog/services/compose-for-mongodb) and [Node.js runtime](https://www.ng.bluemix.net/docs/starters/nodejs/index.html) on IBM Cloud.
+This application uses the [IBM Cloud Databases for MongoDB service](https://cloud.ibm.com/catalog/services/databases-for-mongodb) and [Node.js runtime](https://cloud.ibm.com/docs/runtimes/nodejs?topic=Nodejs-nodejs_runtime) on IBM Cloud.
 
 <img src="ReadME-Images/Architecture2.png">
 
@@ -12,13 +12,13 @@ This application uses the [Compose for MongoDB service](https://console.bluemix.
 - Authentication with username/password
 - Protected routes that can only be accessed by authenticated users
 - Bootstrap CSS framework & [Cosmo theme](https://bootswatch.com/cosmo/)
-- HTTPS built-in if deployed to [IBM Cloud](#deploy-to-bluemix)
+- HTTPS built-in if deployed to [IBM Cloud](#deploy-to-ibm-cloud)
 - [Mongoose](https://github.com/Automattic/mongoose) for MongoDB interactions.
 - [PassportJS](http://passportjs.org) for authentication, with over 300 authentication strategies to pick from.
 
 ## Application Requirements
 - [Node.js & NPM](https://nodejs.org/en/download/)
-- [Compose for MongoDB database](https://console.bluemix.net/catalog/compose-for-mongodb)
+- [IBM Cloud Databases for MongoDB](https://cloud.ibm.com/catalog/services/databases-for-mongodb)
 - [Cloud Foundry Command Line Tool](https://docs.cloudfoundry.org/devguide/installcf/)
 
 ## Getting Started
@@ -35,31 +35,30 @@ This application uses the [Compose for MongoDB service](https://console.bluemix.
 
 Option 1 (launch this app directly from this repo):
 
-[![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/IBM-Bluemix/Nodejs-MEAN-Stack)
+[![Deploy to IBM Cloud](https://cloud.ibm.com/devops/setup/deploy/button.png)](https://cloud.ibm.com/devops/setup/deploy?repository=https://github.com/IBM-Cloud/nodejs-MEAN-stack)
 
 Option 2 (deploy from your local machine):
 
 1. Clone or download this repo onto your machine.
 2. Open a terminal prompt to the directory of your application.
-3. If you don't have an account, [create a free one here](https://console.ng.bluemix.net/registration/).
-4. Set your Cloud Foundry CLI tool's API endpoint to: `ibmcloud api https://api.ng.bluemix.net `
-5. Login to your account via the command line: `ibmcloud login`
-6. Target your account ORG and SPACE  `ibmcloud target -o ORG -s SPACE`
-7. Create the instance of Compose for MongoDB on IBM Cloud:  `ibmcloud cf create-service compose-for-mongodb Standard mean-starter-mongodb`
-8. Push your app to IBM Cloud with `ibmcloud cf push`
-9. Done, the app should be looking like:<img src="ReadME-Images/live-app.png">
+3. If you don't have an account, [create a free one here](https://cloud.ibm.com).
+4. Login to your account via the command line: `ibmcloud login`
+5. Target your account ORG and SPACE  `ibmcloud target --cf`
+6. Create the instance of Compose for MongoDB on IBM Cloud:  `ibmcloud cf create-service databases-for-mongodb standard mean-starter-mongodb`
+7. Push your app to IBM Cloud with `ibmcloud cf push`
+8. Done, the app should be looking like:<img src="ReadME-Images/live-app.png">
 
 
 
 #### Problems or Questions?
 
-Create a [GitHub issue](https://github.com/IBM-Bluemix/nodejs-MEAN-stack/issues/new) for questions or problems occurs using this demo. 
+Create a [GitHub issue](https://github.com/IBM-Cloud/nodejs-MEAN-stack/issues/new) for questions or problems occurs using this demo. 
 
 ## Critical Files & Folders
 
 | File                               | Description                                                  |
 | ---------------------------------- | ------------------------------------------------------------ |
-| [**manifest.yml**](./manifest.yml) | File that defines deployment paramaters. [More info here](https://www.ng.bluemix.net/docs/manageapps/depapps.html#appmanifest)
+| [**manifest.yml**](./manifest.yml) | File that defines deployment paramaters. [More info here](http://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html)
 | [**.env.example**](./.env.example) | Set custom [environment variables](https://en.wikipedia.org/wiki/Environment_variable) for your application. This is the proper way to store credentials and other sensitive values.
 | [**server.js**](./server.js) | Main server file that the Node.js runtime uses. It contains all the server logic.
 | [**/server**](./server) | Folder for files used by the Node.js server
@@ -92,7 +91,7 @@ If you are not sure what your application name is, use this command to print you
   $ ibmcloud cf apps
   ```
 
-For more detailed information on troubleshooting your application, see the [Troubleshooting section](https://www.ng.bluemix.net/docs/troubleshoot/tr.html) in the documentation.
+For more detailed information on troubleshooting your application, see the [Troubleshooting section](https://cloud.ibm.com/docs/cloud-foundry-public?topic=cloud-foundry-public-ts-cf-apps) in the documentation.
 
 ## License
-See [LICENSE.MD](https://github.com/IBM-Bluemix/Nodejs-MEAN-Stack/blob/master/LICENSE.md) for license information.
+See [LICENSE.MD](https://github.com/IBM-Cloud/nodejs-MEAN-stack/blob/master/LICENSE.md) for license information.

manifest.yml

@@ -1,13 +1,13 @@
 ---
 applications:
 - name: mean-stack
-  host: mean-${random-word}
+  random-route: true
   memory: 256M
   services:
   - mean-starter-mongodb
   env:
     NODE_ENV: cloud-foundry
 declared-services:
   mean-starter-mongodb:
-    label: compose-for-mongodb
-    plan: Standard
+    label: databases-for-mongodb
+    plan: standard

package.json

@@ -1,16 +1,16 @@
 {
-  "name": "mean-boilerplate-ibm-bluemix",
-  "version": "1.0.0",
-  "description": "MEAN (Mongo, Express, Angular, Node.js) Boilerplate for IBM Bluemix",
+  "name": "mean-boilerplate-ibm-cloud",
+  "version": "1.1.0",
+  "description": "MEAN (Mongo, Express, Angular, Node.js) Boilerplate for IBM Cloud",
   "main": "server.js",
-  "engines" : { "node" : ">=4.4.5" },
+  "engines" : { "node" : "6.*" },
   "scripts": {
     "start": "node server.js",
     "dev": "nodemon server.js"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/IBM-Bluemix/Nodejs-MEAN-Stack.git"
+    "url": "https://github.com/IBM-Cloud/nodejs-MEAN-stack.git"
   },
   "keywords": [
     "Node.js",
@@ -20,25 +20,24 @@
     "javascript",
     "boilerplate"
   ],
-  "author": "IBM Bluemix",
+  "author": "IBM Cloud",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/IBM-Bluemix/Nodejs-MEAN-Stack/issues"
+    "url": "https://github.com/IBM-Cloud/nodejs-MEAN-stack/issues"
   },
-  "homepage": "https://github.com/IBM-Bluemix/Nodejs-MEAN-Stack",
+  "homepage": "https://github.com/IBM-Cloud/nodejs-MEAN-stack",
   "dependencies": {
     "bcrypt": "^2.0.0",
     "body-parser": "^1.14.1",
-    "cf-deployment-tracker-client": "0.0.8",
-    "cfenv": "1.0.x",
-    "connect-mongo": "^1.1.0",
+    "cfenv": "^1.0.x",
+    "connect-mongo": "^2.0.2",
     "cookie-parser": "^1.4.0",
-    "dotenv": "^1.2.0",
-    "express": "4.12.x",
+    "dotenv": "^4.0.0",
+    "express": "^4.15.x",
     "express-session": "^1.12.1",
     "express-validator": "^2.18.0",
-    "mongoose": "^4.2.6",
-    "passport": "^0.3.2",
+    "mongoose": "^5.1.0",
+    "passport": "^0.4.0",
     "passport-local": "^1.0.0"
   },
   "devDependencies": {}

server.js

@@ -13,7 +13,7 @@ var express = require('express'),// server middleware
     expressValidator = require('express-validator'), // validation tool for processing user input
     cookieParser = require('cookie-parser'),
     session = require('express-session'),
-    MongoStore = require('connect-mongo/es5')(session), // store sessions in MongoDB for persistence
+    MongoStore = require('connect-mongo')(session), // store sessions in MongoDB for persistence
     bcrypt = require('bcrypt'), // middleware to encrypt/decrypt passwords
     sessionDB,
 
@@ -40,20 +40,16 @@ if(appEnv.isLocal){
     sessionDB = process.env.LOCAL_MONGODB_URL;
     console.log('Your MongoDB is running at ' + process.env.LOCAL_MONGODB_URL);
 }
-// Connect to MongoDB Service on Bluemix
+// Connect to MongoDB Service on IBM Cloud
 else if(!appEnv.isLocal) {
     var mongoDbUrl, mongoDbOptions = {};
-    var mongoDbCredentials = appEnv.services["compose-for-mongodb"][0].credentials;
-    var ca = [new Buffer(mongoDbCredentials.ca_certificate_base64, 'base64')];
-    mongoDbUrl = mongoDbCredentials.uri;
+    var mongoDbCredentials = appEnv.services["databases-for-mongodb"][0].credentials.connection.mongodb;
+    var ca = Buffer.from(mongoDbCredentials.certificate.certificate_base64, 'base64');
+    mongoDbUrl = mongoDbCredentials.composed[0];
     mongoDbOptions = {
-      mongos: {
-        ssl: true,
-        sslValidate: true,
-        sslCA: ca,
+        useNewUrlParser: true,
         poolSize: 1,
         reconnectTries: 1
-      }
     };
 
     console.log("Your MongoDB is running at ", mongoDbUrl);
@@ -72,7 +68,7 @@ Express Settings
 ********************************/
 var app = express();
 app.enable('trust proxy');
-// Use SSL connection provided by Bluemix. No setup required besides redirecting all HTTP requests to HTTPS
+// Use SSL connection provided by IBM Cloud. No setup required besides redirecting all HTTP requests to HTTPS
 if (!appEnv.isLocal) {
     app.use(function (req, res, next) {
         if (req.secure) // returns true is protocol = https
@@ -89,10 +85,7 @@ app.use(cookieParser());
 app.use(session({
     secret: process.env.SESSION_SECRET || 'this_is_a_default_session_secret_in_case_one_is_not_defined',
     resave: true,
-    store: new MongoStore({
-        url: sessionDB,
-        autoReconnect: true
-    }),
+    store: new MongoStore({ mongooseConnection: mongoose.connection }),
     saveUninitialized : false,
     cookie: { secure: true }
 }));
@@ -314,4 +307,4 @@ Ports
 ********************************/
 app.listen(appEnv.port, appEnv.bind, function() {
   console.log("Node server running on " + appEnv.url);
-});
+});