Merge branch 'master' into dev

# Conflicts:
#	node-server/app.js
#	node-server/config.js

Author: brandwe

README.md

@@ -1,12 +1,8 @@
 #Windows Azure Active Directory Sample REST API Service for Node.js using MongoDB and Restify
 
-<<<<<<< HEAD
-This Node.js server will give you with a quick and easy way to set up a REST API Service that's integrated with Azure Active Directory for API protection. It uses the OAuth2 protocol with bearer tokens. The sample server included in the download are designed to run on any platform.
-=======
 [![Join the chat at https://gitter.im/AzureADSamples/WebAPI-Nodejs](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AzureADSamples/WebAPI-Nodejs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-This Node.js server will give you with a quick and easy way to set up a REST API Service that's integrated with Windows Azure Active Directory for API protection using the OAuth2 protocol. The sample server included in the download are designed to run on any platform.
->>>>>>> master
+This Node.js server will give you with a quick and easy way to set up a REST API Service using the OAuth2 protocol. Then this service is integrated with Azure Active Directory for API protection. The sample server included in the download are designed to run on any platform.
 
 This REST API server is built using Restify and MongoDB with the following features:
 
@@ -62,7 +58,7 @@ You will need to update the sample to use your values for audienceURI and for th
 
 
 * `$ cd node-server	`
-* `$ node server.js`
+* `$ node app.js`
 
 **Is the server output hard to understand?:** We use `bunyan` for logging in this sample. The console won't make much sense to you unless you also install bunyan and run the server like above but pipe it through the bunyan binary:
 

node-server/app.js

@@ -193,8 +193,8 @@ function listTasks(req, res, next) {
             log.info(data);
         }
 
-        if (!data.length) {
-            log.warn(err, "There is no tasks in the database. Did you initalize the database as stated in the README?");
+    if (!data.length) {
+            log.warn(err, "There is no tasks in the database. Add one!");
         }
 
         if (!owner) {
@@ -331,8 +331,8 @@ var oidcStrategy = new OIDCBearerStrategy(options,
             if (!user) {
                 // "Auto-registration"
                 log.info('User was added automatically as they were new. Their sub is: ', token.sub);
-                users.push(token);
-                owner = token.sub;
+           users.push(token);
+           owner = token.sub;
                 return done(null, token);
             }
             owner = token.sub;

node-server/config.js

@@ -1,7 +1,6 @@
  // Don't commit this file to your public repos. This config is for first-run
- exports.creds = {
-     mongoose_auth_local: 'mongodb://localhost/tasklist', // Your mongo auth uri goes here
-     issuer: 'https://sts.windows.net/cff56d8f-f602-4afd-94e4-c95b76f1c81e/',
-     audience: 'http://kidventus.com/TodoListService',
-     identityMetadata: 'https://login.microsoftonline.com/common/.well-known/openid-configuration' // For using Microsoft you should never need to change this.
- };
+    exports.creds = {
+    mongoose_auth_local: 'mongodb://localhost/tasklist', // Your mongo auth uri goes here
+    audience: 'http://localhost:8888/', // the Audience is the App URL when you registered the application.
+    identityMetadata: 'https://login.microsoftonline.com/common/'
+  };