update deps. versions and modules related to viewer

Autodesk-Forge · Aug 15, 2018 · db667ce · db667ce
1 parent 5178d63
commit db667ce
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -8,17 +8,17 @@
 [![oAuth2](https://img.shields.io/badge/oAuth2-v1-green.svg)](http://developer.autodesk.com/)
 [![OSS](https://img.shields.io/badge/OSS-v2-green.svg)](http://developer.autodesk.com/)
 [![Model-Derivative](https://img.shields.io/badge/Model%20Derivative-v2-green.svg)](http://developer.autodesk.com/)
-[![Viewer](https://img.shields.io/badge/Viewer-v3.3-green.svg)](http://developer.autodesk.com/)
+[![Viewer](https://img.shields.io/badge/Viewer-v6.0-green.svg)](http://developer.autodesk.com/)
 
 # Description
 
 This sample use [Model Derivative API](https://developer.autodesk.com/en/docs/model-derivative/v2/overview/) to translate [Box](https://www.box.com/about-us) files into [Viewer](https://developer.autodesk.com/en/docs/viewer/v2/overview/). The front-end will look like:
-  
+
 ![thumbnail](www/img/indexpage.png)
 
 ## Live version
 
-See it live at [forgeboxviewer.herokuapp.com](http://forgeboxviewer.herokuapp.com/). 
+See it live at [forgeboxviewer.herokuapp.com](http://forgeboxviewer.herokuapp.com/).
 
 # Setup
 
@@ -34,7 +34,7 @@ Clone this project or download it. It's recommended to install [GitHub desktop](
 
     git clone https://github.com/autodesk-forge/model.derivative-nodejs-box.viewer
 
-To run it, install the required packages, set the enviroment variables with your client ID & secret and finally start it. Via command line, navigate to the folder where this repository was cloned and use the following:
+To run it, install the required packages, set the environment variables with your client ID & secret and finally start it. Via command line, navigate to the folder where this repository was cloned and use the following:
 
 Mac OSX/Linux (Terminal)
 

diff --git a/package.json b/package.json
@@ -9,10 +9,7 @@
     "cookie-parser": "*",
     "express": "*",
     "express-session": "*",
-    "forge-data-management": "*",
-    "forge-model-derivative": "*",
-    "forge-oauth2": "*",
-    "forge-oss": "*",
+    "forge-apis": "0.4.3",
     "jquery": "3.2.1",
     "jstree": "3.3.4",
     "moment": "2.19.4",
@@ -28,6 +25,6 @@
     "dev": "node start.js",
     "nodemon": "nodemon start.js --ignore www/"
   },
-  "author": "Augusto Goncalves (Forge Partner Development)",
+  "author": "Vadym Kuzin (Forge Partner Development)",
   "license": "MIT"
 }
diff --git a/www/index.html b/www/index.html
@@ -12,14 +12,13 @@
   <script language="JavaScript" src="/js/moment.min.js"></script>
   <script language="JavaScript" src="/js/notify.min.js"></script>
   <!-- Autodesk Forge Viewer files -->
-  <link rel="stylesheet" href="https://developer.api.autodesk.com/modelderivative/v2/viewers/style.min.css?v=v3.3" type="text/css">
+  <link rel="stylesheet" href="https://developer.api.autodesk.com/modelderivative/v2/viewers/style.min.css?v=v6.0" type="text/css">
   <script language="JavaScript" src="https://developer.api.autodesk.com/modelderivative/v2/viewers/three.min.js"></script>
-  <script language="JavaScript" src="https://developer.api.autodesk.com/modelderivative/v2/viewers/viewer3D.min.js?v=v3.3"></script>
+  <script language="JavaScript" src="https://developer.api.autodesk.com/modelderivative/v2/viewers/viewer3D.min.js?v=v6.0"></script>
   <!-- this project main script -->
   <link rel="shortcut icon" href=/img/favicon.ico type=image/x-icon>
   <link rel="stylesheet" href="/css/main.css"/>
-  <script language="JavaScript" src="/js/oauth.js"></script>
-  <script language="JavaScript" src="/js/viewer.js"></script>
+  <script language="JavaScript" src="/js/ForgeViewer.js"></script>
   <script language="JavaScript" src="/js/box.js"></script>
 </head>
 <body>
@@ -47,4 +46,4 @@
   <div style="float:right;"><img src="/img/github-logo.png" height="20"/> <a href="https://github.com/Autodesk-Forge/model.derivative-nodejs-box.viewer">Source code</a></div>
 </footer>
 </body>
-</html>
+</html>
diff --git a/www/js/viewer.js → www/js/ForgeViewer.js b/www/js/viewer.js → www/js/ForgeViewer.js
@@ -16,6 +16,19 @@
 // UNINTERRUPTED OR ERROR FREE.
 /////////////////////////////////////////////////////////////////////
 
+function getForgeToken() {
+  var token = '';
+  jQuery.ajax({
+    url: '/oauth/token',
+    success: function (res) {
+      token = res;
+    },
+    async: false // this request must be synchronous for the Forge Viewer
+  });
+  if (token != '') console.log('2 legged token (App level public token): ' + token); // debug
+  return token;
+}
+
 function launchViewer(div, urn) {
   console.log("Launching Autodesk Viewer for: " + urn);
   var options = {

diff --git a/www/js/oauth.js b/www/js/oauth.js