@abtnode/ux 1.16.26-beta-cca12425 → 1.16.26-beta-c8902aec

package/lib/blocklet/authentication/oauth/apple.js

@@ -20,6 +20,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const defaultValue = {
+  enabled: false,
+  teamId: '',
+  serviceId: '',
+  keyId: '',
+  authKey: '',
+  bundleId: ''
+};
 function OAuthApple() {
   var _blocklet$meta, _blocklet$settings;
   const {
@@ -32,13 +40,7 @@ function OAuthApple() {
     t
   } = (0, _context.useLocaleContext)();
   const did = blocklet === null || blocklet === void 0 || (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
-  const authData = Object.assign({
-    enabled: false,
-    teamId: '',
-    serviceId: '',
-    keyId: '',
-    authKey: ''
-  }, (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.apple) || {});
+  const authData = Object.assign(_objectSpread({}, defaultValue), (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.apple) || {});
   const {
     handleSubmit,
     control,
@@ -46,7 +48,7 @@ function OAuthApple() {
     watch,
     reset
   } = (0, _reactHookForm.useForm)({
-    defaultValues: (0, _pick.default)(authData, ['enabled', 'teamId', 'serviceId', 'keyId', 'authKey'])
+    defaultValues: (0, _pick.default)(authData, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = (0, _ahooks.useMemoizedFn)(async data => {
@@ -62,13 +64,7 @@ function OAuthApple() {
           })
         }
       });
-      const defaultValues = Object.assign({
-        enabled: false,
-        teamId: '',
-        serviceId: '',
-        keyId: '',
-        authKey: ''
-      }, (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.apple) || {});
+      const defaultValues = Object.assign(_objectSpread({}, defaultValue), (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.apple) || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
       _Toast.default.success(t('oauth.saveSuccess'));
@@ -78,25 +74,31 @@ function OAuthApple() {
   });
   const validateTeamId = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.apple.teamIdDescribe');
+      return t('oauth.apple.teamIdDescription');
     }
     return true;
   });
   const validateServiceId = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.apple.serviceIdDescribe');
+      return t('oauth.apple.serviceIdDescription');
     }
     return true;
   });
   const validateKeyId = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.apple.keyIdDescribe');
+      return t('oauth.apple.keyIdDescription');
     }
     return true;
   });
   const validateAuthKey = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.apple.authKeyDescribe');
+      return t('oauth.apple.authKeyDescription');
+    }
+    return true;
+  });
+  const validateBundleId = (0, _ahooks.useMemoizedFn)(val => {
+    if (!(val !== null && val !== void 0 && val.trim())) {
+      return t('oauth.apple.bundleIdDescription');
     }
     return true;
   });
@@ -148,10 +150,10 @@ function OAuthApple() {
           });
         }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
-        name: "serviceId",
+        name: "bundleId",
         control: control,
         rules: {
-          validate: enabled ? validateServiceId : noop
+          validate: enabled ? validateBundleId : noop
         },
         render: _ref3 => {
           var _formState$errors$fie2;
@@ -162,17 +164,17 @@ function OAuthApple() {
             fullWidth: true,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, _objectSpread(_objectSpread({}, field), {}, {
               error: !!formState.errors[field.name],
-              label: t('oauth.apple.serviceId'),
+              label: t('oauth.apple.bundleId'),
               helperText: ((_formState$errors$fie2 = formState.errors[field.name]) === null || _formState$errors$fie2 === void 0 ? void 0 : _formState$errors$fie2.message) || '　',
               disabled: !enabled
             }))
           });
         }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
-        name: "keyId",
+        name: "serviceId",
         control: control,
         rules: {
-          validate: enabled ? validateKeyId : noop
+          validate: enabled ? validateServiceId : noop
         },
         render: _ref4 => {
           var _formState$errors$fie3;
@@ -183,23 +185,44 @@ function OAuthApple() {
             fullWidth: true,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, _objectSpread(_objectSpread({}, field), {}, {
               error: !!formState.errors[field.name],
-              label: t('oauth.apple.keyId'),
+              label: t('oauth.apple.serviceId'),
               helperText: ((_formState$errors$fie3 = formState.errors[field.name]) === null || _formState$errors$fie3 === void 0 ? void 0 : _formState$errors$fie3.message) || '　',
               disabled: !enabled
             }))
           });
         }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
-        name: "authKey",
+        name: "keyId",
         control: control,
         rules: {
-          validate: enabled ? validateAuthKey : noop
+          validate: enabled ? validateKeyId : noop
         },
         render: _ref5 => {
           var _formState$errors$fie4;
           let {
             field
           } = _ref5;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, _objectSpread(_objectSpread({}, field), {}, {
+              error: !!formState.errors[field.name],
+              label: t('oauth.apple.keyId'),
+              helperText: ((_formState$errors$fie4 = formState.errors[field.name]) === null || _formState$errors$fie4 === void 0 ? void 0 : _formState$errors$fie4.message) || '　',
+              disabled: !enabled
+            }))
+          });
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
+        name: "authKey",
+        control: control,
+        rules: {
+          validate: enabled ? validateAuthKey : noop
+        },
+        render: _ref6 => {
+          var _formState$errors$fie5;
+          let {
+            field
+          } = _ref6;
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
             fullWidth: true,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, _objectSpread(_objectSpread({}, field), {}, {
@@ -208,7 +231,7 @@ function OAuthApple() {
               rows: 4,
               label: t('oauth.apple.authKey'),
               error: !!formState.errors[field.name],
-              helperText: ((_formState$errors$fie4 = formState.errors[field.name]) === null || _formState$errors$fie4 === void 0 ? void 0 : _formState$errors$fie4.message) || '　',
+              helperText: ((_formState$errors$fie5 = formState.errors[field.name]) === null || _formState$errors$fie5 === void 0 ? void 0 : _formState$errors$fie5.message) || '　',
               disabled: !enabled
             }))
           });

package/lib/blocklet/authentication/oauth/auth0.js

@@ -20,6 +20,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const defaultValue = {
+  enabled: false,
+  domain: '',
+  clientId: '',
+  clientSecret: ''
+};
 function OAuthAuth0() {
   var _blocklet$meta, _blocklet$settings;
   const {
@@ -32,12 +38,7 @@ function OAuthAuth0() {
     t
   } = (0, _context.useLocaleContext)();
   const did = blocklet === null || blocklet === void 0 || (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
-  const auth0 = Object.assign({
-    enabled: false,
-    domain: '',
-    clientId: '',
-    clientSecret: ''
-  }, (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.auth0) || {});
+  const auth0 = Object.assign(_objectSpread({}, defaultValue), (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.auth0) || {});
   const {
     handleSubmit,
     control,
@@ -45,7 +46,7 @@ function OAuthAuth0() {
     watch,
     reset
   } = (0, _reactHookForm.useForm)({
-    defaultValues: (0, _pick.default)(auth0, ['domain', 'clientId', 'clientSecret', 'enabled'])
+    defaultValues: (0, _pick.default)(auth0, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = (0, _ahooks.useMemoizedFn)(async data => {
@@ -61,12 +62,7 @@ function OAuthAuth0() {
           })
         }
       });
-      const defaultValues = Object.assign({
-        enabled: false,
-        domain: '',
-        clientId: '',
-        clientSecret: ''
-      }, (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.auth0) || {});
+      const defaultValues = Object.assign(_objectSpread({}, defaultValue), (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.auth0) || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
       _Toast.default.success(t('oauth.saveSuccess'));
@@ -76,13 +72,19 @@ function OAuthAuth0() {
   });
   const validateDomain = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.auth0.domainDescribe');
+      return t('oauth.auth0.domainDescription');
     }
     return true;
   });
   const validateClientId = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.auth0.clientIdDescribe');
+      return t('oauth.auth0.clientIdDescription');
+    }
+    return true;
+  });
+  const validateClientSecret = (0, _ahooks.useMemoizedFn)(val => {
+    if (!(val !== null && val !== void 0 && val.trim())) {
+      return t('oauth.auth0.clientSecretDescription');
     }
     return true;
   });
@@ -158,7 +160,7 @@ function OAuthAuth0() {
         name: "clientSecret",
         control: control,
         rules: {
-          validate: noop
+          validate: enabled ? validateClientSecret : noop
         },
         render: _ref4 => {
           var _formState$errors$fie3;

package/lib/blocklet/authentication/oauth/github.js

@@ -20,6 +20,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const defaultValue = {
+  enabled: false,
+  clientId: '',
+  clientSecret: ''
+};
 function OAuthGithub() {
   var _blocklet$meta, _blocklet$settings;
   const {
@@ -33,11 +38,7 @@ function OAuthGithub() {
   } = (0, _context.useLocaleContext)();
   // TODO: @zhanghan 将来需要换成 permanent did
   const did = blocklet === null || blocklet === void 0 || (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
-  const github = Object.assign({
-    enabled: false,
-    clientId: '',
-    clientSecret: ''
-  }, (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.github) || {});
+  const github = Object.assign(_objectSpread({}, defaultValue), (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.github) || {});
   const {
     handleSubmit,
     control,
@@ -45,7 +46,7 @@ function OAuthGithub() {
     watch,
     reset
   } = (0, _reactHookForm.useForm)({
-    defaultValues: (0, _pick.default)(github, ['clientSecret', 'clientId', 'enabled'])
+    defaultValues: (0, _pick.default)(github, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = (0, _ahooks.useMemoizedFn)(async data => {
@@ -61,11 +62,7 @@ function OAuthGithub() {
           })
         }
       });
-      const defaultValues = Object.assign({
-        enabled: false,
-        clientId: '',
-        clientSecret: ''
-      }, (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.github) || {});
+      const defaultValues = Object.assign(_objectSpread({}, defaultValue), (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.github) || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
       _Toast.default.success(t('oauth.saveSuccess'));
@@ -75,13 +72,13 @@ function OAuthGithub() {
   });
   const validateClientId = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.github.clientIdDescribe');
+      return t('oauth.github.clientIdDescription');
     }
     return true;
   });
   const validateClientSecret = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.github.clientSecretDescribe');
+      return t('oauth.github.clientSecretDescription');
     }
     return true;
   });

package/lib/blocklet/authentication/oauth/google.js

@@ -20,6 +20,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const defaultValue = {
+  enabled: false,
+  clientId: '',
+  clientSecret: ''
+};
 function OAuthGoogle() {
   var _blocklet$meta, _blocklet$settings;
   const {
@@ -32,11 +37,7 @@ function OAuthGoogle() {
     t
   } = (0, _context.useLocaleContext)();
   const did = blocklet === null || blocklet === void 0 || (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
-  const authData = Object.assign({
-    enabled: false,
-    clientId: '',
-    clientSecret: ''
-  }, (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.google) || {});
+  const authData = Object.assign(_objectSpread({}, defaultValue), (blocklet === null || blocklet === void 0 || (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 || (_blocklet$settings = _blocklet$settings.oauth) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.google) || {});
   const {
     handleSubmit,
     control,
@@ -44,7 +45,7 @@ function OAuthGoogle() {
     watch,
     reset
   } = (0, _reactHookForm.useForm)({
-    defaultValues: (0, _pick.default)(authData, ['clientSecret', 'clientId', 'enabled'])
+    defaultValues: (0, _pick.default)(authData, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = (0, _ahooks.useMemoizedFn)(async data => {
@@ -60,11 +61,7 @@ function OAuthGoogle() {
           })
         }
       });
-      const defaultValues = Object.assign({
-        enabled: false,
-        clientId: '',
-        clientSecret: ''
-      }, (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.google) || {});
+      const defaultValues = Object.assign(_objectSpread({}, defaultValue), (blockletChanged === null || blockletChanged === void 0 || (_blockletChanged$sett = blockletChanged.settings) === null || _blockletChanged$sett === void 0 || (_blockletChanged$sett = _blockletChanged$sett.oauth) === null || _blockletChanged$sett === void 0 ? void 0 : _blockletChanged$sett.google) || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
       _Toast.default.success(t('oauth.saveSuccess'));
@@ -74,13 +71,13 @@ function OAuthGoogle() {
   });
   const validateClientId = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.google.clientIdDescribe');
+      return t('oauth.google.clientIdDescription');
     }
     return true;
   });
   const validateClientSecret = (0, _ahooks.useMemoizedFn)(val => {
     if (!(val !== null && val !== void 0 && val.trim())) {
-      return t('oauth.google.clientSecretDescribe');
+      return t('oauth.google.clientSecretDescription');
     }
     return true;
   });