typos and system variables

Author: cyrillef

.gitignore

@@ -32,4 +32,7 @@ credentials.js
 
 # webstorm project files
 .idea
-credentials_.js
+
+.DS_store
+Thumbs.db
+*.bak

README-stg.md

@@ -43,11 +43,11 @@ get model URNs - as explained in the Setup/Usage Instructions.
     ```
     cp credentials_.js credentials.js  
 	```
-* Replace the placeholder with your own keys in credentials.js, line #23 and #24 <br />
+* Replace the placeholders with your own keys in credentials.js, line #23 and #24 <br />
   ```
-  credentials.ClientId = '<replace with your consumer key>';
+  credentials.ConsumerKey =process.env.CONSUMERKEY || '<replace with your consumer key>';
 
-  credentials.ClientSecret = '<replace with your consumer secret>';
+  credentials.ConsumerSecret =process.env.CONSUMERSECRET || '<replace with your consumer secret>';
   ```
 * In file credentials.js line #26, replace the BaseUrl address by the staging server address <br />
   ```
@@ -56,7 +56,7 @@ get model URNs - as explained in the Setup/Usage Instructions.
 * Upload one of your models to your account and get its URN using another workflow sample, for example,
   - [this workflow sample in .Net WPF application](https://github.com/Developer-Autodesk/workflow-wpf-view.and.data.api) if you are using windows 
   - or [this workflow sample in Mac OS Swift](https://github.com/Developer-Autodesk/workflow-macos-swift-view.and.data.api) if you are using Mac
-  - or this [WEB page](http://javalmvwalkthrough-vq2mmximxb.elasticbeanstalk.com/)
+  - or this [WEB page](http://models.autodesk.io/) or this [one](http://javalmvwalkthrough-vq2mmximxb.elasticbeanstalk.com/)
 * Copy the URN which was generated in the previous step in  file /www/index.js at line #18 <br />
   ```
   var defaultUrn = '<replace with your encoded urn>';

README.md

@@ -34,16 +34,16 @@ get model URNs - as explained in the Setup/Usage Instructions.
     ```
     cp credentials_.js credentials.js  
 	```
-* Replace the placeholder with your own keys in credentials.js, line #23 and #24 <br />
+* Replace the placeholders with your own keys in credentials.js, line #23 and #24 <br />
   ```
-  credentials.ClientId = '<replace with your consumer key>';
+  credentials.ConsumerKey =process.env.CONSUMERKEY || '<replace with your consumer key>';
 
-  credentials.ClientSecret = '<replace with your consumer secret>';
+  credentials.ConsumerSecret =process.env.CONSUMERSECRET || '<replace with your consumer secret>';
   ```
 * Upload one of your models to your account and get its URN using another workflow sample, for example,
   - [this workflow sample in .Net WPF application](https://github.com/Developer-Autodesk/workflow-wpf-view.and.data.api) if you are using windows 
   - or [this workflow sample in Mac OS Swift](https://github.com/Developer-Autodesk/workflow-macos-swift-view.and.data.api) if you are using Mac
-  - or this [WEB page](http://javalmvwalkthrough-vq2mmximxb.elasticbeanstalk.com/)
+  - or this [WEB page](http://models.autodesk.io/) or this [one](http://javalmvwalkthrough-vq2mmximxb.elasticbeanstalk.com/)
 * Copy the URN which was generated in the previous step in file /www/index.js at line #18 <br />
   ```
   var defaultUrn = '<replace with your encoded urn>';

credentials_.js

@@ -20,8 +20,8 @@ var credentials ={} ;
 
 // Replace placeholder below by the Consumer Key and Consumer Secret you got from
 // http://developer.autodesk.com/ for the production server
-credentials.ClientId ='<replace with your consumer key>' ;
-credentials.ClientSecret ='<replace with your consumer secret>' ;
+credentials.ConsumerKey =process.env.CONSUMERKEY || '<replace with your consumer key>' ;
+credentials.ConsumerSecret =process.env.CONSUMERSECRET || '<replace with your consumer secret>' ;
 
 // If you which to use the Autodesk View & Data API on the staging server, change this url
 credentials.BaseUrl = 'https://developer.api.autodesk.com' ;

package.json

@@ -1,29 +1,28 @@
 {
   "name": "AdnViewerBasic",
-  "version": "0.0.0",
+    "description": "A basic node.js server sample",
+    "version": "1.0.0",
   "dependencies": {
-    "aws-sign2": "^0.5.0",
-    "bl": "^0.9.4",
-    "caseless": "^0.10.0",
-    "combine-stream": "0.0.4",
-    "combined-stream": "0.0.7",
-    "express": "*",
-    "forever-agent": "^0.6.1",
-    "form-data": "^0.2.0",
-    "har-validator": "^1.6.1",
-    "hawk": "^2.3.1",
-    "http-signature": "^0.11.0",
-    "isstream": "^0.1.2",
-    "json-stringify-safe": "^5.0.0",
-    "mime-types": "^2.0.10",
-    "node-uuid": "^1.4.3",
-    "oauth-sign": "^0.7.0",
-    "qs": "^2.4.1",
-    "request": "*",
-    "router": "^1.1.0",
-    "serve-favicon": "*",
-    "stringstream": "0.0.4",
-    "tough-cookie": "^0.13.0",
-    "tunnel-agent": "^0.4.0"
+        "serve-favicon": ">= 2.2.0",
+        "express": ">= 4.12.3",
+        "request": ">= 2.55.0"
+    },
+    "files": [
+        "LICENSE",
+        "README.md"
+    ],
+    "engines": {
+        "node": ">= 0.10.0"
+    },
+    "contributors": [
+        "Philippe Leefsma <[email protected]>"
+    ],
+    "license": "MIT",
+    "scripts": {
+        "start": "node server.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Developer-Autodesk/workflow-node.js-view.and.data.api.git"
   }
 }

routes/api.js

@@ -15,8 +15,14 @@
 // DOES NOT WARRANT THAT THE OPERATION OF THE PROGRAM WILL BE
 // UNINTERRUPTED OR ERROR FREE.
 /////////////////////////////////////////////////////////////////////////////////
-var credentials = require('../credentials');
-
+var fs = require('fs');
+var credentials ;
+if ( !fs.existsSync ('credentials.js') ) {
+	console.log ('No credentials.js file present, assuming using CONSUMERKEY & CONSUMERSECRET system variables.') ;
+    credentials =require('../credentials_') ;
+} else {
+	credentials =require('../credentials') ;
+}
 var express = require('express');
 var request = require('request');
 
@@ -27,10 +33,10 @@ var router = express.Router();
 ///////////////////////////////////////////////////////////////////////////////
 router.get('/token', function (req, res) {
     var params = {
-        client_id: credentials.ClientId,
-        client_secret: credentials.ClientSecret,
+        client_id: credentials.ConsumerKey,
+        client_secret: credentials.ConsumerSecret,
         grant_type: 'client_credentials'
-    }
+    } ;
 
     request.post(
         credentials.BaseUrl + '/authentication/v1/authenticate',