@sap-ux/preview-middleware 0.1.0 → 0.3.0

package/README.md

@@ -3,22 +3,35 @@
 The `@sap-ux/preview-middleware` is a [Custom UI5 Server Middleware](https://sap.github.io/ui5-tooling/pages/extensibility/CustomServerMiddleware) for previewing an application in a local Fiori launchpad . It can be used either with the `ui5 serve` or the `fiori run` commands.
 
 ## Configuration Options
-| Option       | Type  | Default Value | Description |
-| ------------ | ------| ------------- | ----------- |
-| `flp`        |           |                  |Optional configuration object for the local Fiori launchpad |
-| `flp.path`   | `string`  | `/test/flp.html` | The mount point of the local Fiori launchpad. |
-| `flp.apps`   | `array`   | `[]`          | Optional additional local apps that are available in local Fiori launchpad |
-| `debug`      | `boolean` | false         | Enables debug output |
+| Option                 | Type      | Default Value    | Description                                                                                                                         |
+| ---------------------- | --------- | ---------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `flp`                  |           |                  | Optional configuration object for the local Fiori launchpad                                                                         |
+| `flp.path`             | `string`  | `/test/flp.html` | The mount point of the local Fiori launchpad.                                                                                       |
+| `flp.intent`           |           |                  | Optional intent to be used for the application                                                                                      |
+| `flp.intent.object`    | `string`  | `app`            | Optional intent object                                                                                                              |
+| `flp.intent.action`    | `string`  | `preview`        | Optional intent action                                                                                                              |
+| `flp.apps`             | `array`   | `[]`             | Optional additional local apps that are available in local Fiori launchpad                                                          |
+| `adp.target`           |           |                  | Required configuration for adaptation projects defining the connected backend                                                       |
+| `adp.ignoreCertErrors` | `boolean` | `false`          | Optional setting to ignore certification validation errors when working with e.g. development systems with self signed certificates |
+| `debug`                | `boolean` | false            | Enables debug output                                                                                                                |
 
 ### `flp.apps`
 Array of additional application configurations:
-| Option       | Type  | Default Value | Description |
-| ------------ | ------| ------------- | ----------- |
-| `target`        | `string` |  | Target path of the additional application |
-| `local`         | `string` |  | Local path to the folder containing the application |
-| `intent`        |          |  | Optional intent to be used for the application |
-| `intent.object` | `string` | `(calculated)`| Optional intent object, if it is not provided then it will be calculated based on the application id |
-| `intent.action` | `string` | `preview` | Optional intent action |
+| Option          | Type     | Default Value  | Description                                                                                          |
+| --------------- | -------- | -------------- | ---------------------------------------------------------------------------------------------------- |
+| `target`        | `string` |                | Target path of the additional application                                                            |
+| `local`         | `string` |                | Local path to the folder containing the application                                                  |
+| `intent`        |          |                | Optional intent to be used for the application                                                       |
+| `intent.object` | `string` | `(calculated)` | Optional intent object, if it is not provided then it will be calculated based on the application id |
+| `intent.action` | `string` | `preview`      | Optional intent action                                                                               |
+
+### `adp.target`
+| Option        | Type                           | Description                                                                                                                                     |
+| ------------- | ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| `url`         | `string` mandatory (local)     | Mandatory URL pointing to the backend system. *Not required if destination is provided and the proxy is running SAP Business Application Studio |
+| `destination` | `string` mandatory (if no url) | Required if the backend system is available as destination in SAP Business Application Studio.                                                  |
+| `client`      | `string` optional              | sap-client parameter                                                                                                                            |
+| `scp`         | `boolean` optional             | If set to true the proxy will execute the required OAuth routine for the ABAP environment on SAP BTP                                            |
 
 ## Usage
 The middleware can be used without configuration. However, since the middleware intercepts a few requests that might otherwise be handled by a different middleware, it is strongly recommended to run other file serving middlewares after the `preview-middleware` e.g. `backend-proxy-middleware` and `ui5-proxy-middleware` (and the corresponding middlewares in the `@sap/ux-ui5-tooling`).
@@ -59,3 +72,32 @@ server:
         - local: ../local-folder
           target: /apps/other-app
 ```
+
+### Adaptation Project
+If you want to use the middleware in an adaption project, the additional `adp` object needs to be configured. This example would preview a local adaptation project merged with its reference application from the target system at `http://sap.example` and it will ignore certification validation errors.
+```Yaml
+server:
+  customMiddleware:
+  - name: preview-middleware
+    afterMiddleware: compression
+    configuration:
+      adp: 
+        target: 
+          url: http://sap.example
+        ignoreCertErrors: true
+```
+### Programmatic Usage
+Alternatively you can use the underlying middleware fuction programmatically, e.g. for the case when you want to incorporate the `preview-middleware` functionality in your own middleware.
+
+```
+import { FlpSandbox } from '@sap-ux/preview-middleware';
+const flp = new FlpSandbox(flpConfig, rootProject, middlewareUtil, logger);
+const files = await resources.rootProject.byGlob('/manifest.json');
+flp.init(JSON.parse(await files[0].getString()));
+
+return flp.router
+```
+- `flpConfig` - the FLP configuration
+- `rootProject` - [Reader](https://sap.github.io/ui5-tooling/stable/api/@ui5_fs_AbstractReader.html) to access resources of the root project
+- `middlewareUtil` - [MiddlewareUtil](https://sap.github.io/ui5-tooling/v3/api/@ui5_server_middleware_MiddlewareUtil.html) of the UI5 server
+- `logger` - Logger instance for use in the middleware.

package/dist/base/flp.d.ts

@@ -38,7 +38,7 @@ export declare class FlpSandbox {
     private readonly utils;
     private readonly logger;
     protected templateConfig: TemplateConfig;
-    protected readonly config: FlpConfig;
+    readonly config: FlpConfig;
     readonly router: any;
     /**
      * Constructor setting defaults and keeping reference to workspace resources.
@@ -53,8 +53,10 @@ export declare class FlpSandbox {
      * Initialize the FLP sandbox router.
      *
      * @param manifest application manifest
+     * @param componentId optional componentId e.g. for adaptation projects
+     * @param resources optional additional resource mappings
      */
-    init(manifest: Manifest): Promise<void>;
+    init(manifest: Manifest, componentId?: string, resources?: Record<string, string>): Promise<void>;
     /**
      * Try finding the locate-reuse-libs script.
      *

package/dist/base/flp.js

@@ -23,6 +23,13 @@ const DEFAULT_THEME = 'sap_horizon';
  * Default path for mounting the local FLP.
  */
 const DEFAULT_PATH = '/test/flp.html';
+/**
+ * Default intent
+ */
+const DEFAULT_INTENT = {
+    object: 'app',
+    action: 'preview'
+};
 /**
  * Class handling preview of a sandbox FLP.
  */
@@ -36,13 +43,14 @@ class FlpSandbox {
      * @param logger logger instance
      */
     constructor(config, project, utils, logger) {
-        var _a, _b;
+        var _a, _b, _c;
         this.project = project;
         this.utils = utils;
         this.logger = logger;
         this.config = {
             path: (_a = config.path) !== null && _a !== void 0 ? _a : DEFAULT_PATH,
-            apps: (_b = config.apps) !== null && _b !== void 0 ? _b : [],
+            intent: (_b = config.intent) !== null && _b !== void 0 ? _b : DEFAULT_INTENT,
+            apps: (_c = config.apps) !== null && _c !== void 0 ? _c : [],
             rta: config.rta
         };
         logger.debug(`Config: ${JSON.stringify(this.config)}`);
@@ -52,9 +60,11 @@ class FlpSandbox {
      * Initialize the FLP sandbox router.
      *
      * @param manifest application manifest
+     * @param componentId optional componentId e.g. for adaptation projects
+     * @param resources optional additional resource mappings
      */
-    init(manifest) {
-        var _a, _b, _c, _d, _e;
+    init(manifest, componentId, resources = {}) {
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const flex = this.createFlexHandler();
             const supportedThemes = (_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.supportedThemes) !== null && _b !== void 0 ? _b : [DEFAULT_THEME];
@@ -64,27 +74,26 @@ class FlpSandbox {
                     libs: Object.keys((_e = (_d = (_c = manifest['sap.ui5']) === null || _c === void 0 ? void 0 : _c.dependencies) === null || _d === void 0 ? void 0 : _d.libs) !== null && _e !== void 0 ? _e : {}).join(','),
                     theme: supportedThemes.includes(DEFAULT_THEME) ? DEFAULT_THEME : supportedThemes[0],
                     flex,
-                    resources: {}
+                    resources: Object.assign({}, resources)
                 },
                 locateReuseLibsScript: yield this.findLocateReuseLibsScript()
             };
             this.addApp(manifest, {
-                target: '/',
+                componentId,
+                target: (_f = resources[componentId !== null && componentId !== void 0 ? componentId : manifest['sap.app'].id]) !== null && _f !== void 0 ? _f : '/',
                 local: '.',
-                intent: {
-                    object: 'app',
-                    action: 'preview'
-                }
+                intent: this.config.intent
             });
             // add route for the sandbox.html
             this.router.get(this.config.path, (req, res) => {
                 var _a, _b;
                 const config = Object.assign({}, this.templateConfig);
-                if (req.query['fiori-tools-rta-mode']) {
+                const fioriToolsRtaMode = req.query['fiori-tools-rta-mode'];
+                if (fioriToolsRtaMode) {
                     if ((_a = this.config.rta) === null || _a === void 0 ? void 0 : _a.layer) {
                         config.flex = {
                             layer: (_b = this.config.rta) === null || _b === void 0 ? void 0 : _b.layer,
-                            developerMode: false
+                            developerMode: fioriToolsRtaMode === 'forAdaptation'
                         };
                     }
                     else {
@@ -195,7 +204,7 @@ class FlpSandbox {
      * @param app configuration for the preview
      */
     addApp(manifest, app) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const id = manifest['sap.app'].id;
         (_a = app.intent) !== null && _a !== void 0 ? _a : (app.intent = {
             object: id.replace(/\./g, ''),
@@ -205,7 +214,7 @@ class FlpSandbox {
         this.templateConfig.apps[`${(_b = app.intent) === null || _b === void 0 ? void 0 : _b.object}-${(_c = app.intent) === null || _c === void 0 ? void 0 : _c.action}`] = {
             title: (_d = manifest['sap.app'].title) !== null && _d !== void 0 ? _d : id,
             description: (_e = manifest['sap.app'].description) !== null && _e !== void 0 ? _e : '',
-            additionalInformation: `SAPUI5.Component=${id}`,
+            additionalInformation: `SAPUI5.Component=${(_f = app.componentId) !== null && _f !== void 0 ? _f : id}`,
             applicationType: 'URL',
             url: app.target
         };

package/dist/base/index.d.ts

@@ -0,0 +1,2 @@
+export { FlpSandbox } from './flp';
+//# sourceMappingURL=index.d.ts.map

package/dist/base/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlpSandbox = void 0;
+var flp_1 = require("./flp");
+Object.defineProperty(exports, "FlpSandbox", { enumerable: true, get: function () { return flp_1.FlpSandbox; } });
+//# sourceMappingURL=index.js.map

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './ui5/middleware';
+export { FlpSandbox } from './base';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,5 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlpSandbox = void 0;
 __exportStar(require("./ui5/middleware"), exports);
+var base_1 = require("./base");
+Object.defineProperty(exports, "FlpSandbox", { enumerable: true, get: function () { return base_1.FlpSandbox; } });
 //# sourceMappingURL=index.js.map

package/dist/types/index.d.ts

@@ -1,20 +1,27 @@
+import type { AdpPreviewConfig } from '@sap-ux/adp-tooling';
 import type { UI5FlexLayer } from '@sap-ux/project-access';
+interface Intent {
+    object: string;
+    action: string;
+}
 /**
  * Configuration for additional applications
  */
 export interface App {
     target: string;
     local: string;
-    intent?: {
-        object: string;
-        action: string;
-    };
+    /**
+     * Optional component id if it differs from the manifest (e.g. for adaptation projects)
+     */
+    componentId?: string;
+    intent?: Intent;
 }
 /**
  * FLP preview configuration.
  */
 export interface FlpConfig {
     path: string;
+    intent?: Intent;
     rta?: {
         layer?: UI5FlexLayer;
     };
@@ -25,6 +32,8 @@ export interface FlpConfig {
  */
 export interface Config {
     flp?: Partial<FlpConfig>;
+    adp?: AdpPreviewConfig;
     debug?: boolean;
 }
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/ui5/middleware.js

@@ -11,6 +11,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@sap-ux/logger");
 const flp_1 = require("../base/flp");
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+/**
+ * Initialize the preview for an adaptation project.
+ *
+ * @param rootProject reference to the project
+ * @param config configuration from the ui5.yaml
+ * @param flp FlpSandbox instance
+ * @param logger logger instance
+ */
+function initAdp(rootProject, config, flp, logger) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const files = yield rootProject.byGlob('/manifest.appdescr_variant');
+        if (files.length === 1) {
+            const adp = new adp_tooling_1.AdpPreview(config, logger);
+            const layer = yield adp.init(JSON.parse(yield files[0].getString()), yield rootProject.byGlob('**/*.*'));
+            flp.config.rta = { layer };
+            yield flp.init(adp.descriptor.manifest, adp.descriptor.name, adp.resources);
+            flp.router.use(adp.descriptor.url, adp.proxy.bind(adp));
+        }
+        else {
+            throw new Error('ADP configured but no manifest.appdescr_variant found.');
+        }
+    });
+}
 /**
  * Create the router that is to be exposed as UI5 middleware.
  *
@@ -29,12 +53,17 @@ function createRouter({ resources, options, middlewareUtil }, logger) {
         (_b = config.flp) !== null && _b !== void 0 ? _b : (config.flp = {});
         // configure the FLP sandbox based on information from the manifest
         const flp = new flp_1.FlpSandbox(config.flp, resources.rootProject, middlewareUtil, logger);
-        const files = yield resources.rootProject.byGlob('/manifest.json');
-        if (files.length === 1) {
-            yield flp.init(JSON.parse(yield files[0].getString()));
+        if (config.adp) {
+            yield initAdp(resources.rootProject, config.adp, flp, logger);
         }
         else {
-            throw new Error('No manifest.json found.');
+            const files = yield resources.rootProject.byGlob('/manifest.json');
+            if (files.length === 1) {
+                yield flp.init(JSON.parse(yield files[0].getString()));
+            }
+            else {
+                throw new Error('No manifest.json found.');
+            }
         }
         return flp.router;
     });

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.1.0",
+  "version": "0.3.0",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -23,15 +23,19 @@
   ],
   "dependencies": {
     "ejs": "3.1.7",
-    "@sap-ux/logger": "0.3.7"
+    "@sap-ux/logger": "0.3.7",
+    "@sap-ux/adp-tooling": "0.1.0"
   },
   "devDependencies": {
     "@types/ejs": "3.1.0",
     "@types/express": "4.17.13",
+    "@types/prompts": "2.0.14",
     "@types/supertest": "2.0.12",
     "express": "4.18.2",
+    "nock": "13.2.1",
     "supertest": "6.3.2",
-    "@sap-ux/project-access": "1.10.0"
+    "@sap-ux/project-access": "1.11.0",
+    "@sap-ux/store": "0.3.12"
   },
   "peerDependencies": {
     "express": "4"