@abtnode/ux 1.16.26-beta-351de484 → 1.16.26-beta-63f52a83

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;
   });