@sutech_jp/raas-react-client 0.0.41 → 0.0.43

package/dist/config/ReportConfig.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportConfig = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
+var targetOrigin_1 = require("../util/targetOrigin");
 var ReportConfig = function (_a) {
     var session = _a.session, _b = _a.width, width = _b === void 0 ? '100%' : _b, _c = _a.height, height = _c === void 0 ? '100%' : _c, _d = _a.hideTenantInfoConfig, hideTenantInfoConfig = _d === void 0 ? false : _d, _e = _a.toolbarPosition, toolbarPosition = _e === void 0 ? 'bottom' : _e, customStyles = _a.customStyles;
     var iframe = (0, react_1.useRef)(null);
     var handleMessage = (0, react_1.useCallback)(function (e) {
         var _a;
+        if ((0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl) !== '*' && e.origin !== (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl)) {
+            return;
+        }
         var message = e.data;
         var from = message === null || message === void 0 ? void 0 : message.from;
         var action = message === null || message === void 0 ? void 0 : message.action;
@@ -26,9 +30,9 @@ var ReportConfig = function (_a) {
                     toolbarPosition: toolbarPosition,
                     customStyles: customStyles,
                 },
-            }, '*');
+            }, (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl));
         }
-    }, [customStyles, hideTenantInfoConfig, toolbarPosition]);
+    }, [customStyles, hideTenantInfoConfig, session, toolbarPosition]);
     (0, react_1.useEffect)(function () {
         window.addEventListener('message', handleMessage);
         return function () { return window.removeEventListener('message', handleMessage); };

package/dist/designer/ReportDesigner.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportDesigner = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
+var targetOrigin_1 = require("../util/targetOrigin");
 var ReportDesigner = function (_a) {
     var session = _a.session, data = _a.data, _b = _a.width, width = _b === void 0 ? '100%' : _b, _c = _a.height, height = _c === void 0 ? '100%' : _c, customStyles = _a.customStyles, onBack = _a.onBack;
     var iframe = (0, react_1.useRef)(null);
     var handleMessage = (0, react_1.useCallback)(function (e) {
         var _a;
+        if ((0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl) !== '*' && e.origin !== (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl)) {
+            return;
+        }
         var message = e.data;
         var from = message === null || message === void 0 ? void 0 : message.from;
         var action = message === null || message === void 0 ? void 0 : message.action;
@@ -23,12 +27,12 @@ var ReportDesigner = function (_a) {
                 action: 'onRender',
                 data: data,
                 customStyles: customStyles,
-            }, '*');
+            }, (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl));
         }
         else if (action === 'onBack') {
             onBack();
         }
-    }, [customStyles, data, onBack]);
+    }, [customStyles, data, onBack, session]);
     (0, react_1.useEffect)(function () {
         window.addEventListener('message', handleMessage);
         return function () { return window.removeEventListener('message', handleMessage); };

package/dist/form/ReportPaperForm.js

@@ -30,6 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportPaperForm = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
+var targetOrigin_1 = require("../util/targetOrigin");
 var ReportPaperForm = function (_a) {
     var session = _a.session, layoutId = _a.layoutId, data = _a.data, onDataUpdate = _a.onDataUpdate, customData = _a.customData, onCustomDataUpdate = _a.onCustomDataUpdate, onRender = _a.onRender, reportOptions = _a.reportOptions, layout = _a.layout, onLayoutUpdate = _a.onLayoutUpdate, _b = _a.editability, editability = _b === void 0 ? 'none' : _b, _c = _a.layoutEditable, layoutEditable = _c === void 0 ? false : _c, _d = _a.downloadable, downloadable = _d === void 0 ? false : _d, version = _a.version, _e = _a.width, width = _e === void 0 ? '100%' : _e, _f = _a.height, height = _f === void 0 ? 0 : _f, customStyles = _a.customStyles;
     var _g = __read((0, react_1.useState)('unauthorized'), 2), formState = _g[0], setFormState = _g[1];
@@ -54,8 +55,8 @@ var ReportPaperForm = function (_a) {
             layoutEditable: layoutEditable,
             downloadable: downloadable,
             customStyles: customStyles,
-        }, '*');
-    }, [formState, layoutId, editability, layout, layoutEditable, version, customStyles, downloadable]);
+        }, (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl));
+    }, [formState, layoutId, editability, layout, layoutEditable, version, customStyles, downloadable, session]);
     (0, react_1.useEffect)(function () {
         var _a;
         if (formState === 'unauthorized')
@@ -73,9 +74,12 @@ var ReportPaperForm = function (_a) {
             data: data,
             customData: customData,
             options: reportOptions,
-        }, '*');
-    }, [formState, layoutInitialized, data, customData, reportOptions]);
+        }, (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl));
+    }, [formState, layoutInitialized, data, customData, reportOptions, session]);
     var handleMessage = (0, react_1.useCallback)(function (e) {
+        if ((0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl) !== '*' && e.origin !== (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl)) {
+            return;
+        }
         var message = e.data;
         var from = message === null || message === void 0 ? void 0 : message.from;
         var action = message === null || message === void 0 ? void 0 : message.action;
@@ -111,7 +115,7 @@ var ReportPaperForm = function (_a) {
         else if (action === 'onChangeContentHeight') {
             setContentHeight(message === null || message === void 0 ? void 0 : message.contentHeight);
         }
-    }, [data, onDataUpdate, onCustomDataUpdate, onLayoutUpdate, onRender]);
+    }, [session, onRender, onDataUpdate, data, onCustomDataUpdate, onLayoutUpdate]);
     (0, react_1.useEffect)(function () {
         window.addEventListener('message', handleMessage);
         return function () { return window.removeEventListener('message', handleMessage); };

package/dist/gallery/ReportLayoutGallery.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportLayoutGallery = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
+var targetOrigin_1 = require("../util/targetOrigin");
 var ReportLayoutGallery = function (_a) {
     var session = _a.session, _b = _a.width, width = _b === void 0 ? '100%' : _b, _c = _a.height, height = _c === void 0 ? '100%' : _c, customStyles = _a.customStyles, _d = _a.deletable, deletable = _d === void 0 ? false : _d, onSelectLayout = _a.onSelectLayout, onEditLayout = _a.onEditLayout, onCreateLayout = _a.onCreateLayout;
     var iframe = (0, react_1.useRef)(null);
     var handleMessage = (0, react_1.useCallback)(function (e) {
         var _a, _b, _c, _d, _e;
+        if ((0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl) !== '*' && e.origin !== (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl)) {
+            return;
+        }
         var from = (_a = e.data) === null || _a === void 0 ? void 0 : _a.from;
         var action = (_b = e.data) === null || _b === void 0 ? void 0 : _b.action;
         if (from !== 'gallery') {
@@ -36,9 +40,9 @@ var ReportLayoutGallery = function (_a) {
                     deletable: deletable,
                     customStyles: customStyles,
                 },
-            }, '*');
+            }, (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl));
         }
-    }, [customStyles, deletable, onCreateLayout, onEditLayout, onSelectLayout]);
+    }, [customStyles, deletable, onCreateLayout, onEditLayout, onSelectLayout, session]);
     (0, react_1.useEffect)(function () {
         window.addEventListener('message', handleMessage);
         return function () { return window.removeEventListener('message', handleMessage); };

package/dist/index.d.ts

@@ -3,4 +3,5 @@ export { ReportDesigner } from './designer/ReportDesigner';
 export { ReportPaperForm } from './form/ReportPaperForm';
 export { useReportPaperForm, createLocalSession } from './form/useReportPaperForm';
 export { ReportLayoutGallery } from './gallery/ReportLayoutGallery';
+export { ReportTenantInfo } from './tenantInfo/ReportTenantInfo';
 export * from './types';

package/dist/index.js

@@ -14,7 +14,7 @@ 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.ReportLayoutGallery = exports.createLocalSession = exports.useReportPaperForm = exports.ReportPaperForm = exports.ReportDesigner = exports.ReportConfig = void 0;
+exports.ReportTenantInfo = exports.ReportLayoutGallery = exports.createLocalSession = exports.useReportPaperForm = exports.ReportPaperForm = exports.ReportDesigner = exports.ReportConfig = void 0;
 var ReportConfig_1 = require("./config/ReportConfig");
 Object.defineProperty(exports, "ReportConfig", { enumerable: true, get: function () { return ReportConfig_1.ReportConfig; } });
 var ReportDesigner_1 = require("./designer/ReportDesigner");
@@ -26,4 +26,6 @@ Object.defineProperty(exports, "useReportPaperForm", { enumerable: true, get: fu
 Object.defineProperty(exports, "createLocalSession", { enumerable: true, get: function () { return useReportPaperForm_1.createLocalSession; } });
 var ReportLayoutGallery_1 = require("./gallery/ReportLayoutGallery");
 Object.defineProperty(exports, "ReportLayoutGallery", { enumerable: true, get: function () { return ReportLayoutGallery_1.ReportLayoutGallery; } });
+var ReportTenantInfo_1 = require("./tenantInfo/ReportTenantInfo");
+Object.defineProperty(exports, "ReportTenantInfo", { enumerable: true, get: function () { return ReportTenantInfo_1.ReportTenantInfo; } });
 __exportStar(require("./types"), exports);

package/dist/tenantInfo/ReportTenantInfo.d.ts

@@ -0,0 +1,11 @@
+import { VFC } from 'react';
+import { Session } from '../types';
+import { ThemeOptions } from '../types/theme';
+declare type ReportTenantInfoProps = {
+    session: Session | undefined;
+    width?: string | number;
+    height?: string | number;
+    customStyles?: ThemeOptions;
+};
+export declare const ReportTenantInfo: VFC<ReportTenantInfoProps>;
+export {};

package/dist/tenantInfo/ReportTenantInfo.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReportTenantInfo = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = require("react");
+var targetOrigin_1 = require("../util/targetOrigin");
+var ReportTenantInfo = function (_a) {
+    var session = _a.session, _b = _a.width, width = _b === void 0 ? '100%' : _b, _c = _a.height, height = _c === void 0 ? '100%' : _c, customStyles = _a.customStyles;
+    var iframe = (0, react_1.useRef)(null);
+    var handleMessage = (0, react_1.useCallback)(function (e) {
+        var _a;
+        if ((0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl) !== '*' && e.origin !== (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl)) {
+            return;
+        }
+        var message = e.data;
+        var from = message === null || message === void 0 ? void 0 : message.from;
+        var action = message === null || message === void 0 ? void 0 : message.action;
+        if (from !== 'tenantInfo') {
+            return;
+        }
+        if (action === 'onAuthorized') {
+            var iframeWindow = (_a = iframe.current) === null || _a === void 0 ? void 0 : _a.contentWindow;
+            if (!iframeWindow)
+                return;
+            iframeWindow.postMessage({
+                from: 'tenantInfoClient',
+                action: 'onShow',
+                props: {
+                    customStyles: customStyles,
+                },
+            }, (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl));
+        }
+    }, [customStyles, session]);
+    (0, react_1.useEffect)(function () {
+        window.addEventListener('message', handleMessage);
+        return function () { return window.removeEventListener('message', handleMessage); };
+    }, [handleMessage]);
+    return (0, jsx_runtime_1.jsx)("iframe", { ref: iframe, id: "tenantInfo", src: session === null || session === void 0 ? void 0 : session.newUrl, style: { width: width, height: height, border: 0 } });
+};
+exports.ReportTenantInfo = ReportTenantInfo;

package/dist/util/targetOrigin.d.ts

@@ -0,0 +1 @@
+export declare const getTargetOrigin: (source: string | undefined) => string;

package/dist/util/targetOrigin.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTargetOrigin = void 0;
+var getTargetOrigin = function (source) {
+    if (!source)
+        return '*';
+    try {
+        return new URL(source).origin;
+    }
+    catch (e) {
+        return '*';
+    }
+};
+exports.getTargetOrigin = getTargetOrigin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sutech_jp/raas-react-client",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "react client for raas produced by SuTech",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",