using std naming convention

Author: cyrillef

README-stg.md

@@ -45,9 +45,9 @@ get model URNs - as explained in the Setup/Usage Instructions.
 	```
 * Replace the placeholders with your own keys in credentials.js, line #23 and #24 <br />
   ```
-  credentials.ConsumerKey =process.env.CONSUMERKEY || '<replace with your consumer key>';
+  client_id: process.env.CONSUMERKEY || '<replace with your consumer key>';
 
-  credentials.ConsumerSecret =process.env.CONSUMERSECRET || '<replace with your consumer secret>';
+  client_secret: process.env.CONSUMERSECRET || '<replace with your consumer secret>';
   ```
 * In file credentials.js line #26, replace the BaseUrl address by the staging server address <br />
   ```

README.md

@@ -41,9 +41,9 @@ get model URNs - as explained in the Setup/Usage Instructions.
 	```
 * Replace the placeholders with your own keys in credentials.js, line #23 and #24 <br />
   ```
-  credentials.ConsumerKey =process.env.CONSUMERKEY || '<replace with your consumer key>';
+  client_id: process.env.CONSUMERKEY || '<replace with your consumer key>';
 
-  credentials.ConsumerSecret =process.env.CONSUMERSECRET || '<replace with your consumer secret>';
+  client_secret: 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 

credentials_.js

@@ -15,15 +15,21 @@
 // DOES NOT WARRANT THAT THE OPERATION OF THE PROGRAM WILL BE
 // UNINTERRUPTED OR ERROR FREE.
 /////////////////////////////////////////////////////////////////////////////////
+var credentials ={
 
-var credentials ={} ;
+	credentials: {
+		// Replace placeholder below by the Consumer Key and Consumer Secret you got from
+		// http://developer.autodesk.com/ for the production server
+		client_id: process.env.CONSUMERKEY || '<replace with your consumer key>',
+		client_secret: process.env.CONSUMERSECRET || '<replace with your consumer secret>',
+		grant_type: 'client_credentials'
+	},
+	
+	// If you which to use the Autodesk View & Data API on the staging server, change this url
+	BaseUrl: 'https://developer.api.autodesk.com',
+	Version: 'v1'
+} ;
 
-// Replace placeholder below by the Consumer Key and Consumer Secret you got from
-// http://developer.autodesk.com/ for the production server
-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' ;
+credentials.Authentication =credentials.BaseUrl + '/authentication/' + credentials.Version + '/authenticate'
 
 module.exports =credentials ;

package.json

@@ -1,28 +1,29 @@
 {
 	"name": "AdnViewerBasic",
-    "description": "A basic node.js server sample",
-    "version": "1.0.0",
-    "dependencies": {
-        "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 <philippe.leefsma@autodesk.com>"
-    ],
-    "license": "MIT",
-    "scripts": {
-        "start": "node server.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Developer-Autodesk/workflow-node.js-view.and.data.api.git"
-    }
+	"description": "A basic node.js server sample",
+	"version": "1.0.0",
+	"dependencies": {
+		"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 <philippe.leefsma@autodesk.com>",
+		"Cyrille Fauvel <cyrille@autodesk.com>"
+	],
+	"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,37 +15,25 @@
 // DOES NOT WARRANT THAT THE OPERATION OF THE PROGRAM WILL BE
 // UNINTERRUPTED OR ERROR FREE.
 /////////////////////////////////////////////////////////////////////////////////
-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');
+var credentials =(require ('fs').existsSync ('credentials.js') ?
+	  require('../credentials')
+	: (console.log ('No credentials.js file present, assuming using CONSUMERKEY & CONSUMERSECRET system variables.'), require('../credentials_'))) ;
+var express =require ('express') ;
+var request =require ('request') ;
 
-var router = express.Router();
+var router =express.Router () ;
 
 ///////////////////////////////////////////////////////////////////////////////
 // Generates access token
 ///////////////////////////////////////////////////////////////////////////////
-router.get('/token', function (req, res) {
-    var params = {
-        client_id: credentials.ConsumerKey,
-        client_secret: credentials.ConsumerSecret,
-        grant_type: 'client_credentials'
-    } ;
-
-    request.post(
-        credentials.BaseUrl + '/authentication/v1/authenticate',
-        { form: params },
+router.get ('/token', function (req, res) {
+    request.post (
+        credentials.Authentication,
+        { form: credentials.credentials },
         function (error, response, body) {
-            if (!error && response.statusCode == 200) {
-                res.send(body);
-            }
-        });
-});
+            if ( !error && response.statusCode == 200 )
+                res.send (body) ;
+        }) ;
+}) ;
 
-module.exports = router;
+module.exports =router ;