@nebula.js/cli-serve 3.0.4 → 3.1.0-alpha.1

package/dist/{eDev.html → index.html}

@@ -1,16 +1,23 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"/><base href="/"/><title>Nebula dev</title><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet"/><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:light" rel="stylesheet"/><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:semibold" rel="stylesheet"/><style>html,
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><base href="/"/><title>Nebula hub</title><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet"/><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:light" rel="stylesheet"/><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:semibold" rel="stylesheet"/><style>html,
       body {
         height: 100%;
         margin: 0;
         padding: 0;
-        overflow: hidden;
+        overflow: auto;
       }
 
       body {
-        background: #ddd;
-        -webkit-font-smoothing: antialiased;
+        color: #404040;
         font: normal 14px/16px 'Source Sans Pro', Arial, sans-serif;
+        -webkit-font-smoothing: antialiased;
+        background: linear-gradient(110deg, #91298c 0%, #45b3b2 100%);
+      }
+      code {
+        background-color: rgba(0, 0, 0, 0.05);
+        padding: 0 2px;
+        font-family: Monaco, monospace;
+        font-size: 0.9em;
       }
       #app {
         height: 100%;
-      }</style><link rel="icon" href="njs.png"><script defer="defer" src="eDev.js"></script></head><body dir="ltr"><div id="app"></div></body></html>
+      }</style><link rel="icon" href="/njs.png"><script defer="defer" src="/eHub.js"></script></head><body dir="ltr"><div id="app"></div></body></html>

package/dist/json.worker.js.LICENSE.txt

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.34.0(9d278685b078158491964f8fd7ac9628fffa0f30)
+ * Version: 0.34.1(547870b6881302c5b4ff32173c16d06009e3588f)
  * Released under the MIT license
  * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
  *-----------------------------------------------------------------------------*/

package/lib/serve.js

@@ -153,6 +153,7 @@ module.exports = async (argv) => {
     port,
     disableHostCheck: serveConfig.disableHostCheck,
     enigmaConfig,
+    clientId: serveConfig.clientId,
     webIntegrationId: serveConfig.webIntegrationId,
     snName: serveConfig.type || snName,
     snUrl,

package/lib/webpack.build.js

@@ -20,7 +20,6 @@ const cfg = ({ srcDir, distDir, dev = false, serveConfig = {} }) => {
     mode: dev ? 'development' : 'production',
     entry: {
       eRender: [path.resolve(srcDir, 'eRender')],
-      eDev: [path.resolve(srcDir, 'eDev')],
       eHub: [path.resolve(srcDir, 'eHub')],
       fixtures: [path.resolve(__dirname, './fixtures.js')],
     },
@@ -28,6 +27,7 @@ const cfg = ({ srcDir, distDir, dev = false, serveConfig = {} }) => {
     output: {
       path: distDir,
       filename: '[name].js',
+      publicPath: '/',
     },
     resolve: {
       alias: {
@@ -100,14 +100,8 @@ const cfg = ({ srcDir, distDir, dev = false, serveConfig = {} }) => {
         stylesheets: serveConfig.stylesheets,
       }),
       new HtmlWebpackPlugin({
-        template: path.resolve(srcDir, 'eDev.html'),
-        filename: 'eDev.html',
-        chunks: ['eDev'],
-        favicon,
-      }),
-      new HtmlWebpackPlugin({
-        template: path.resolve(srcDir, 'eHub.html'),
-        filename: 'eHub.html',
+        template: path.resolve(srcDir, 'index.html'),
+        filename: 'index.html',
         chunks: ['eHub'],
         favicon,
       }),

package/lib/webpack.prod.js

@@ -58,12 +58,6 @@ const cfg = ({ srcDir = path.resolve(__dirname, '../dist'), serveConfig = {} })
         stylesheets: serveConfig.stylesheets,
         chunks: ['fixtures'],
       }),
-      new HtmlWebpackPlugin({
-        template: path.resolve(srcDir, 'eDev.html'),
-        filename: 'eDev.html',
-        inject: 'head',
-        chunks: [],
-      }),
     ],
   };
 

package/lib/webpack.serve.js

@@ -4,6 +4,7 @@ const chalk = require('chalk');
 const express = require('express');
 const fs = require('fs');
 const homedir = require('os').homedir();
+const { Auth, AuthType } = require('@qlik/sdk');
 
 const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
@@ -14,11 +15,25 @@ const snapshotRouter = require('./snapshot-router');
 const httpsKeyPath = path.join(homedir, '.certs/key.pem');
 const httpsCertPath = path.join(homedir, '.certs/cert.pem');
 
+let authInstance = null;
+const getAuthInstance = (returnToOrigin, host, clientId) => {
+  if (authInstance) return authInstance;
+
+  authInstance = new Auth({
+    authType: AuthType.OAuth2,
+    host,
+    clientId,
+    redirectUri: `${returnToOrigin}/login/callback`,
+  });
+  return authInstance;
+};
+
 module.exports = async ({
   host,
   port,
   disableHostCheck,
   enigmaConfig,
+  clientId,
   webIntegrationId,
   snName,
   snUrl,
@@ -93,9 +108,7 @@ module.exports = async ({
     port,
     allowedHosts: disableHostCheck ? 'all' : 'auto',
     open,
-    historyApiFallback: {
-      index: '/eHub.html',
-    },
+    historyApiFallback: true,
     // Disable nebula serve dev env when in MFE mode
     static: !serveConfig.mfe && {
       directory: contentBase,
@@ -142,7 +155,10 @@ module.exports = async ({
         res.set(devServer.options.headers);
         res.json({
           enigma: enigmaConfig,
+          clientId,
           webIntegrationId,
+          isClientIdProvided: Boolean(clientId),
+          isWebIntegrationIdProvided: Boolean(webIntegrationId),
           supernova: {
             name: snName,
             url: snUrl,
@@ -157,6 +173,95 @@ module.exports = async ({
         });
       });
 
+      let cachedHost = null;
+      let cachedClientId = null;
+
+      app.get('/oauth', async (req, res) => {
+        const { host: qHost, clientId: qClientId } = req.query;
+        if (!cachedHost && !cachedClientId) {
+          cachedHost = qHost;
+          cachedClientId = qClientId;
+        }
+
+        const returnTo = `${req.protocol}://${req.get('host')}`;
+        const instacne = getAuthInstance(returnTo, qHost, qClientId);
+        const isAuthorized = await instacne.isAuthorized();
+        if (!isAuthorized) {
+          const { url: redirectUrl } = await instacne.generateAuthorizationUrl();
+          res.status(200).json({ redirectUrl });
+        } else {
+          const redirectUrl = `${req.protocol}://${req.get(
+            'host'
+          )}/app-list?engine_url=wss://${cachedHost}&qlik-client-id=${cachedClientId}&shouldFetchAppList=true`;
+          cachedHost = null;
+          cachedClientId = null;
+          res.redirect(redirectUrl);
+        }
+      });
+
+      app.get('/login/callback', async (req, res) => {
+        const authLink = new URL(req.url, `http://${req.headers.host}`).href;
+        try {
+          // TODO:
+          // this is a temp fix in front end side
+          // (temp workaround of not presisting origin while backend tries to authorize user)
+          // they need to handle this in qlik-sdk-typescript repo
+          // and will notify us about when they got fixed it,
+          // but until then, we need to take care of it here!
+          authInstance.rest.interceptors.request.use((_req) => {
+            // eslint-disable-next-line no-param-reassign, dot-notation
+            _req[1]['headers'] = { origin: 'http://localhost:8000' };
+            return _req;
+          });
+          await authInstance.authorize(authLink);
+          res.redirect(301, '/oauth/');
+        } catch (err) {
+          console.log({ err });
+          res.status(401).send(JSON.stringify(err, null, 2));
+        }
+      });
+
+      app.get('/getSocketUrl/:appId', async (req, res) => {
+        const { appId } = req.params;
+        const webSocketUrl = await authInstance.generateWebsocketUrl(appId, true);
+        res.status(200).json({ webSocketUrl });
+      });
+
+      app.get('/deauthorize', async (req, res) => {
+        try {
+          await authInstance.deauthorize();
+          res.status(200).json({
+            deauthorize: true,
+          });
+        } catch (error) {
+          console.log({ error });
+        }
+      });
+
+      app.get('/isAuthorized', async (req, res) => {
+        if (!authInstance) {
+          res.status(200).json({
+            isAuthorized: false,
+          });
+        } else {
+          const isAuthorized = await authInstance.isAuthorized();
+          res.status(200).json({
+            isAuthorized,
+          });
+        }
+      });
+
+      app.get('/apps', async (req, res) => {
+        const appsListUrl = `/items?resourceType=app&limit=30&sort=-updatedAt`;
+        const { data = [] } = await (await authInstance.rest(appsListUrl)).json();
+        res.status(200).json(
+          data.map((d) => ({
+            qDocId: d.resourceId,
+            qTitle: d.name,
+          }))
+        );
+      });
+
       if (serveConfig.resources) {
         app.use('/resources', express.static(serveConfig.resources));
       }
@@ -170,12 +275,6 @@ module.exports = async ({
         ignorePath: true,
         logLevel: 'error',
       },
-      {
-        context: '/dev',
-        target: `${url}/eDev.html`,
-        ignorePath: true,
-        logLevel: 'error',
-      },
     ],
     server: HTTPS
       ? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nebula.js/cli-serve",
-  "version": "3.0.4",
+  "version": "3.1.0-alpha.1",
   "description": "",
   "license": "MIT",
   "author": "QlikTech International AB",
@@ -20,6 +20,9 @@
     "dist",
     "lib"
   ],
+  "engines": {
+    "node": ">=18.10.0"
+  },
   "scripts": {
     "build": "cross-env NODE_ENV=production DEFAULTS=true webpack --config ./lib/webpack.build.js",
     "build:dev": "cross-env NODE_ENV=development DEFAULTS=true webpack --config ./lib/webpack.build.js",
@@ -27,46 +30,48 @@
     "prepublishOnly": "rm -rf dist && yarn run build"
   },
   "dependencies": {
-    "@nebula.js/cli-build": "^3.0.4",
-    "body-parser": "1.20.0",
+    "@nebula.js/cli-build": "^3.1.0-alpha.1",
+    "body-parser": "1.20.1",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
     "cross-env": "7.0.3",
-    "express": "4.18.1",
+    "express": "4.18.2",
     "extend": "3.0.2",
     "html-webpack-plugin": "5.5.0",
     "portfinder": "1.0.32",
     "puppeteer": "14.4.1",
-    "regenerator-runtime": "0.13.9",
-    "source-map-loader": "4.0.0",
+    "regenerator-runtime": "0.13.10",
+    "source-map-loader": "4.0.1",
     "webpack": "5.74.0",
     "webpack-dev-server": "4.11.1",
-    "ws": "8.9.0",
+    "ws": "8.10.0",
     "yargs": "17.6.0"
   },
   "devDependencies": {
-    "@babel/core": "7.19.3",
-    "@babel/preset-env": "7.19.3",
+    "@babel/core": "7.19.6",
+    "@babel/preset-env": "7.19.4",
     "@babel/preset-react": "7.18.6",
-    "@mui/material": "^5.10.8",
-    "@nebula.js/enigma-mocker": "^3.0.4",
-    "@nebula.js/nucleus": "^3.0.4",
-    "@nebula.js/snapshooter": "^3.0.4",
-    "@nebula.js/stardust": "^3.0.4",
-    "@nebula.js/ui": "^3.0.4",
-    "@qlik/sdk": "^0.10.2",
+    "@mui/material": "^5.10.12",
+    "@mui/system": "^5.10.12",
+    "@nebula.js/enigma-mocker": "^3.1.0-alpha.1",
+    "@nebula.js/nucleus": "^3.1.0-alpha.1",
+    "@nebula.js/snapshooter": "^3.1.0-alpha.1",
+    "@nebula.js/stardust": "^3.1.0-alpha.1",
+    "@nebula.js/ui": "^3.1.0-alpha.1",
+    "@qlik/sdk": "^0.14.3",
     "autosuggest-highlight": "3.3.4",
-    "babel-loader": "8.2.5",
+    "babel-loader": "9.1.0",
     "d3-require": "1.3.0",
     "enigma.js": "2.10.0",
     "eslint-import-resolver-alias": "1.1.2",
     "eslint-import-resolver-webpack": "0.13.2",
     "file-loader": "^6.2.0",
-    "monaco-editor": "0.34.0",
+    "monaco-editor": "0.34.1",
     "monaco-editor-webpack-plugin": "7.0.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
+    "react-router-dom": "6.4.2",
     "webpack-cli": "4.10.0"
   },
-  "gitHead": "419f994f8f5e15235fa20057bc9085b03a9a904b"
+  "gitHead": "62d1862cc80fca13ab2753702ce2c396fed4b9d8"
 }