updated server to use forge api modules

package.json

@@ -15,12 +15,9 @@
   "license": "ISC",
   "dependencies": {
     "axios": "^0.24.0",
-    "body-parser": "^1.19.0",
     "cookie-session": "^1.4.0",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
-    "forge-apis": "^0.8.6",
-    "puppeteer": "^10.4.0",
-    "querystring": "^0.2.1"
+    "forge-apis": "^0.8.6"
   }
 }

server.js

@@ -1,12 +1,9 @@
 const path = require('path');
 const express = require('express');
 const cookieSession = require('cookie-session');
-const querystring = require('querystring');
-const axios = require('axios');
-const bodyParser = require('body-parser');
 require('dotenv').config();
 
-const PORT = process.env.PORT || 3000;
+const ForgeSDK = require('forge-apis');
 
 /*
 	Resources used:
@@ -20,69 +17,76 @@ const PORT = process.env.PORT || 3000;
     FORGE_CALLBACK_URL (should be 'http://localhost:3000/callback/') should be the same in the .env
     and in the Forge API project console.
 
-    Usage: node server.js or npm start
+    Usage: node test.js or npm start
     Navigate to http://localhost:3000/auth/ to get started
     Browser should then go through the Autodesk Auth screen and display Auth token.
 */
 
-if (process.env.FORGE_CLIENT_ID == null || process.env.FORGE_CLIENT_SECRET == null) {
-    console.error('Missing FORGE_CLIENT_ID or FORGE_CLIENT_SECRET env. variables.');
-    return;
+
+/*
+	Function to start the server
+	TODO: return both the oAuth2ThreeLegged and credentials objects, these will be needed for other API wrappers
+*/
+function createServer() {
+	const app = express();
+	const PORT = process.env.PORT || 3000;
+	const scopes = ['bucket:create', 'bucket:read', 'data:read', 'data:create', 'data:write'];
+	const oAuth2ThreeLegged = new ForgeSDK.AuthClientThreeLegged(
+		process.env.FORGE_CLIENT_ID,
+		process.env.FORGE_CLIENT_SECRET,
+		process.env.FORGE_CALLBACK_URL,
+		scopes,
+		true
+	);
+
+	if (process.env.FORGE_CLIENT_ID == null || process.env.FORGE_CLIENT_SECRET == null) {
+			console.error('Missing FORGE_CLIENT_ID or FORGE_CLIENT_SECRET env. variables.');
+			return;
+	}
+
+	app.use(express.static(path.join(__dirname, 'public')));
+	app.use(cookieSession({
+			name: 'forge_session',
+			keys: ['forge_secure_key'],
+			maxAge: 14 * 24 * 60 * 60 * 1000 // 14 days, same as refresh token
+	}));
+
+	// Endpoint to begin authentication process 
+	app.get('/auth', function (req, res) {
+			res.redirect(oAuth2ThreeLegged.generateAuthUrl());
+	});
+
+	// Endpoint Forge redirects to after consent screen
+	app.get('/callback', function (req, res) {
+		oAuth2ThreeLegged.getToken(req.query.code).then(function (credentials) {
+			console.log(credentials)
+			res.send('Generated token: ' + credentials.access_token);
+		}, function(err){
+			console.error(err);
+			res.send('Failed to authenticate');
+		});
+	});
+
+	app.use((err, req, res, next) => {
+			console.error(err);
+			res.status(err.statusCode).json(err);
+	});
+
+	const server = app.listen(PORT, () => { console.log(`Server listening on port ${PORT}`); });
+
+	return server;
 }
 
-const scopes = ['bucket:create', 'bucket:read', 'data:read', 'data:create', 'data:write'];
-
-let app = express();
-app.use(express.static(path.join(__dirname, 'public')));
-app.use(cookieSession({
-    name: 'forge_session',
-    keys: ['forge_secure_key'],
-    maxAge: 14 * 24 * 60 * 60 * 1000 // 14 days, same as refresh token
-}));
-
-app.get('/auth', function (req, res) {
-    var redirect_uri = 'https://developer.api.autodesk.com/authentication/v1/authorize?'
-    + 'response_type=code'
-    + '&client_id=' + process.env.FORGE_CLIENT_ID
-    + '&redirect_uri=' + process.env.FORGE_CALLBACK_URL
-    + '&scope=' + scopes.join(' ');
-    console.log(redirect_uri);
-    res.redirect(redirect_uri);
-});
-
-app.get('/callback', function (req, res) {
-    axios({
-        method: 'POST',
-        url: 'https://developer.api.autodesk.com/authentication/v1/gettoken',
-        headers: {
-            'content-type': 'application/x-www-form-urlencoded',
-        },
-        data: querystring.stringify({
-            client_id: process.env.FORGE_CLIENT_ID,
-            client_secret: process.env.FORGE_CLIENT_SECRET,
-            grant_type: 'authorization_code',
-            code: req.query.code,
-            redirect_uri: process.env.FORGE_CALLBACK_URL
-        })
-    })
-        .then(function (response) {
-            // Success
-            access_token = response.data.access_token;
-            console.log(response);
-            res.send('<p>Authentication success! Here is your token:</p>' + access_token);
-        })
-        .catch(function (error) {
-            // Failed
-            console.log(error);
-            res.send('Failed to authenticate');
-        });
-});
-
-app.use((err, req, res, next) => {
-    console.error(err);
-    res.status(err.statusCode).json(err);
-});
-
-app.use(bodyParser.json());
-
-app.listen(PORT, () => { console.log(`Server listening on port ${PORT}`); });
+/*
+	Function to shutdown the server
+*/
+function shutdownServer(server) {
+	server.close(() => {
+			console.log('Closing connections');
+			return;
+	});
+}
+
+
+module.exports.create = createServer;
+module.exports.shutdown = shutdownServer;

test.js

@@ -0,0 +1,19 @@
+const authServer = require('./server');
+
+/*
+  Look at this for fetching new auth tokens in a loop:
+  https://nodejs.org/en/docs/guides/timers-in-node/
+*/
+
+function intervalFunc() {
+  console.log('Running every 15 sec');
+}
+
+(async () => {
+  let server = await authServer.create();
+})();
+
+/*
+  Testing setInterval function, will likely need to use this for refreshing auth tokens
+*/
+setInterval(intervalFunc, 15000);