@abtnode/ux 1.7.3 → 1.7.6

package/lib/issue-passport.js

@@ -25,6 +25,8 @@ var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect
 
 var _context = require("@arcblock/ux/lib/Locale/context");
 
+var _constant = require("@abtnode/constant");
+
 var _wrapLocale = _interopRequireDefault(require("./wrap-locale"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -66,11 +68,18 @@ function IssuePassport(_ref) {
   }
 
   const onLogin = () => {
+    var _window$env;
+
     try {
       session.logout();
     } catch (err) {// Do nothing
     }
 
+    if ((((_window$env = window.env) === null || _window$env === void 0 ? void 0 : _window$env.apiPrefix) || '').startsWith(_constant.WELLKNOWN_SERVICE_PATH_PREFIX)) {
+      history.replace("".concat(_constant.WELLKNOWN_SERVICE_PATH_PREFIX, "/login"));
+      return;
+    }
+
     history.replace('/');
   };
 

package/lib/layout/addon.js

@@ -36,7 +36,11 @@ function HeaderAddon(_ref) {
   let {
     SessionContext,
     webWalletUrl,
-    extraItems
+    extraItems,
+    showLocale,
+    showHelper,
+    showSessionManager,
+    sessionManagerProps
   } = _ref;
   const {
     session
@@ -73,33 +77,41 @@ function HeaderAddon(_ref) {
     w.location.href = "https://docs.arcblock.io/abtnode/".concat(locale).concat(path);
   };
 
-  return /*#__PURE__*/_react.default.createElement(Div, null, extraItems.map(x => x), /*#__PURE__*/_react.default.createElement(_selector.default, {
+  return /*#__PURE__*/_react.default.createElement(Div, null, extraItems.map(x => x), showLocale && /*#__PURE__*/_react.default.createElement(_selector.default, {
     "data-cy": "locale-addon",
     size: 23,
     showText: false,
     className: "locale-addon"
-  }), /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+  }), showHelper && /*#__PURE__*/_react.default.createElement(_IconButton.default, {
     onClick: onHelpClick
   }, /*#__PURE__*/_react.default.createElement(_HelpOutline.default, {
     style: {
       fontSize: 28
     }
-  })), /*#__PURE__*/_react.default.createElement(_SessionManager.default, {
+  })), showSessionManager && /*#__PURE__*/_react.default.createElement(_SessionManager.default, Object.assign({
     session: session,
     webWalletUrl: walletUrl,
     size: 24,
     showRole: true
-  }));
+  }, sessionManagerProps)));
 }
 
 HeaderAddon.propTypes = {
   SessionContext: _propTypes.default.object.isRequired,
   webWalletUrl: _propTypes.default.string,
-  extraItems: _propTypes.default.array
+  extraItems: _propTypes.default.array,
+  showLocale: _propTypes.default.bool,
+  showSessionManager: _propTypes.default.bool,
+  showHelper: _propTypes.default.bool,
+  sessionManagerProps: _propTypes.default.object
 };
 HeaderAddon.defaultProps = {
   webWalletUrl: '',
-  extraItems: []
+  extraItems: [],
+  showLocale: true,
+  showSessionManager: true,
+  showHelper: true,
+  sessionManagerProps: {}
 };
 
 const Div = _styledComponents.default.div.withConfig({

package/lib/lost-passport.js

@@ -41,6 +41,8 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 
+var _constant = require("@abtnode/constant");
+
 var _cardSelector = _interopRequireDefault(require("./card-selector"));
 
 var _wrapLocale = _interopRequireDefault(require("./wrap-locale"));
@@ -129,13 +131,26 @@ function LostPassport(_ref2) {
   };
 
   const onLogin = () => {
+    var _window$env;
+
     try {
       session.logout();
     } catch (err) {// Do nothing
     }
 
-    const redirect = searchParams.get('redirect') || '/';
-    history.replace(redirect);
+    const redirect = searchParams.get('redirect');
+
+    if (redirect) {
+      history.replace(redirect);
+      return;
+    }
+
+    if ((((_window$env = window.env) === null || _window$env === void 0 ? void 0 : _window$env.apiPrefix) || '').startsWith(_constant.WELLKNOWN_SERVICE_PATH_PREFIX)) {
+      history.replace("".concat(_constant.WELLKNOWN_SERVICE_PATH_PREFIX, "/login"));
+      return;
+    }
+
+    history.replace('/');
   };
 
   const handleChange = event => {

package/lib/util/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getAccessUrl = getAccessUrl;
 exports.sleep = sleep;
 exports.validateDomain = void 0;
 
@@ -31,5 +32,53 @@ const validateDomain = function validateDomain(domain) {
 
   return null;
 };
+/**
+ * get access url
+ * auto fix http/https, port, query
+ * docker friendly
+ */
 
-exports.validateDomain = validateDomain;
+
+exports.validateDomain = validateDomain;
+
+function getAccessUrl(hostname) {
+  let path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  let params = arguments.length > 2 ? arguments[2] : undefined;
+
+  if (!hostname) {
+    return '';
+  }
+
+  let protocol = 'http';
+
+  if (window.location.protocol === 'https:') {
+    if (hostname.endsWith(_constant.DEFAULT_IP_DOMAIN_SUFFIX)) {
+      protocol = 'https';
+    }
+
+    if (hostname.endsWith(_constant.DEFAULT_DID_DOMAIN)) {
+      protocol = 'https';
+    }
+  }
+
+  let port = '';
+  const browserPort = Number(window.location.port);
+
+  if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
+    port = ":".concat(browserPort);
+  }
+
+  const urlObj = new URL("".concat(protocol, "://").concat(hostname).concat(port));
+  urlObj.pathname = path;
+  const url = urlObj.href.replace(/\/$/, '');
+
+  if (!params || !Object.keys(params)) {
+    return url;
+  }
+
+  const searchParams = new URLSearchParams();
+  Object.keys(params).forEach(key => {
+    searchParams.append(key, params[key]);
+  });
+  return "".concat(url, "?").concat(searchParams.toString());
+}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.3",
+  "version": "1.7.6",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -14,16 +14,17 @@
     "lint:fix": "eslint src --fix",
     "prepublishOnly": "npm run build",
     "build": "babel src --out-dir lib --copy-files",
-    "watch": "babel src --out-dir lib -w --copy-files"
+    "watch": "babel src --out-dir lib -w --copy-files",
+    "test": "node tools/jest.js"
   },
   "keywords": [],
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.3",
-    "@arcblock/did-connect": "^1.16.61",
-    "@arcblock/ux": "^1.16.61",
-    "@blocklet/meta": "1.7.3",
+    "@abtnode/constant": "1.7.6",
+    "@arcblock/did-connect": "^1.17.0",
+    "@arcblock/ux": "^1.17.0",
+    "@blocklet/meta": "1.7.6",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
     "notistack": "^1.0.6",
@@ -41,5 +42,5 @@
     "babel-plugin-inline-react-svg": "^1.1.1",
     "babel-plugin-styled-components": "^1.10.7"
   },
-  "gitHead": "2b965b42a59a2d98642018749a6afb6e4014a698"
+  "gitHead": "47a9dbd6ea74419ff586336824ebb9b2fe7694aa"
 }