@nocobase/plugin-api-keys 0.10.1-alpha.1 → 0.11.1-alpha.1

package/lib/client/Configuration/ExpiresSelect.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const ExpiresSelect: React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
+declare const ExpiresSelect: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
 export { ExpiresSelect };

package/lib/client/Configuration/ExpiresSelect.js

@@ -25,6 +25,13 @@ function _client() {
   };
   return data;
 }
+function _client2() {
+  const data = require("@nocobase/utils/client");
+  _client2 = function _client2() {
+    return data;
+  };
+  return data;
+}
 function _ahooks() {
   const data = require("ahooks");
   _ahooks = function _ahooks() {
@@ -39,13 +46,6 @@ function _antd() {
   };
   return data;
 }
-function _moment() {
-  const data = _interopRequireDefault(require("moment"));
-  _moment = function _moment() {
-    return data;
-  };
-  return data;
-}
 function _react2() {
   const data = _interopRequireWildcard(require("react"));
   _react2 = function _react2() {
@@ -56,7 +56,6 @@ function _react2() {
 var _locale = require("../locale");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -68,7 +67,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-const TOMORROW = (0, _moment().default)().add(1, 'days');
+const TOMORROW = (0, _client2().dayjs)().add(1, 'days');
 const spaceCSS = (0, _css().css)`
   width: 100%;
   & > .ant-space-item {
@@ -93,8 +92,8 @@ const InternalExpiresSelect = props => {
     }
   };
   const onDatePickerChange = v => {
-    v = v.milliseconds(0).second(0);
-    const NOW = (0, _moment().default)().milliseconds(0).seconds(0);
+    v = v.millisecond(0).second(0);
+    const NOW = (0, _client2().dayjs)().millisecond(0).second(0);
     const value = `${v.diff(NOW, 'd')}d`;
     onChange(value);
   };
@@ -104,8 +103,8 @@ const InternalExpiresSelect = props => {
     value: isCustom ? 'custom' : props.value,
     onChange: onSelectChange
   })), isCustom ? _react2().default.createElement(_antd().DatePicker, {
-    disabledDate: time => {
-      return time.isSameOrBefore();
+    disabledDate: date => {
+      return date.isSameOrBefore();
     },
     defaultValue: TOMORROW,
     onChange: onDatePickerChange,
@@ -121,7 +120,7 @@ const ReadPretty = () => {
     t = _useTranslation.t;
   const expiresDate = (0, _react2().useMemo)(() => {
     if (expiresIn === 'never') return t('Never expires');
-    return (0, _moment().default)(createdAt).add((expiresIn === null || expiresIn === void 0 ? void 0 : expiresIn.replace('d', '')) || 0, 'days').format('YYYY-MM-DD HH:mm:ss');
+    return (0, _client2().dayjs)(createdAt).add((expiresIn === null || expiresIn === void 0 ? void 0 : expiresIn.replace('d', '')) || 0, 'days').format('YYYY-MM-DD HH:mm:ss');
   }, [createdAt, expiresIn]);
   return _react2().default.createElement(_antd().Typography.Text, null, expiresDate);
 };

package/lib/client/index.d.ts

@@ -1,3 +1,5 @@
-import React from 'react';
-declare const ApiKeysProvider: React.NamedExoticComponent<object>;
-export default ApiKeysProvider;
+import { Plugin } from '@nocobase/client';
+declare class APIKeysPlugin extends Plugin {
+    load(): Promise<void>;
+}
+export default APIKeysPlugin;

package/lib/client/index.js

@@ -21,6 +21,8 @@ function _react() {
 var _Configuration = require("./Configuration");
 var _locale = require("./locale");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 const ApiKeysProvider = _react().default.memo(props => {
   const _useTranslation = (0, _locale.useTranslation)(),
     t = _useTranslation.t;
@@ -42,5 +44,13 @@ const ApiKeysProvider = _react().default.memo(props => {
   }, props.children));
 });
 ApiKeysProvider.displayName = 'ApiKeysProvider';
-var _default = ApiKeysProvider;
+class APIKeysPlugin extends _client().Plugin {
+  load() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      _this.app.addProvider(ApiKeysProvider);
+    })();
+  }
+}
+var _default = APIKeysPlugin;
 exports.default = _default;

package/package.json

@@ -4,21 +4,36 @@
   "displayName.zh-CN": "API keys",
   "description": "Allow users to use API key to access NocoBase's api",
   "description.zh-CN": "允许用户使用 API key 访问 NocoBase 的 api",
-  "version": "0.10.1-alpha.1",
+  "version": "0.11.1-alpha.1",
   "license": "AGPL-3.0",
-  "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
-  "dependencies": {
-    "@nocobase/actions": "0.10.1-alpha.1",
-    "@nocobase/database": "0.10.1-alpha.1",
-    "@nocobase/resourcer": "0.10.1-alpha.1",
-    "@nocobase/server": "0.10.1-alpha.1",
-    "@nocobase/utils": "0.10.1-alpha.1",
-    "jsonwebtoken": "^8.5.1"
-  },
+  "main": "./lib/server/index.js",
+  "files": [
+    "lib",
+    "src",
+    "README.md",
+    "README.zh-CN.md",
+    "CHANGELOG.md",
+    "server.js",
+    "server.d.ts",
+    "client.js",
+    "client.d.ts"
+  ],
   "devDependencies": {
-    "@nocobase/test": "0.10.1-alpha.1",
-    "@types/jsonwebtoken": "^8.5.8"
+    "@formily/react": "2.2.26",
+    "@formily/shared": "2.2.26",
+    "@nocobase/actions": "0.11.1-alpha.1",
+    "@nocobase/client": "0.11.1-alpha.1",
+    "@nocobase/database": "0.11.1-alpha.1",
+    "@nocobase/resourcer": "0.11.1-alpha.1",
+    "@nocobase/server": "0.11.1-alpha.1",
+    "@nocobase/test": "0.11.1-alpha.1",
+    "@nocobase/utils": "0.11.1-alpha.1",
+    "antd": "^5.6.4",
+    "dayjs": "^1.11.8",
+    "i18next": "^22.4.9",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-i18next": "^11.15.1"
   },
-  "gitHead": "8f415f5e0ee2e72d681f9ab16af5911b52c374a9"
+  "gitHead": "9ed1dba520bc5f3a7cb1255ea8d92ccbefc11bc8"
 }

package/src/client/Configuration/ExpiresSelect.tsx

@@ -1,13 +1,13 @@
 import { css } from '@emotion/css';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
 import { useRecord } from '@nocobase/client';
+import { dayjs } from '@nocobase/utils/client';
 import { useBoolean } from 'ahooks';
 import { DatePicker, Select, Space, Typography } from 'antd';
-import moment from 'moment';
 import React, { useMemo } from 'react';
 import { useTranslation } from '../locale';
 
-const TOMORROW = moment().add(1, 'days');
+const TOMORROW = dayjs().add(1, 'days');
 
 const spaceCSS = css`
   width: 100%;
@@ -30,9 +30,9 @@ const InternalExpiresSelect = (props) => {
     }
   };
 
-  const onDatePickerChange = (v: moment.Moment) => {
-    v = v.milliseconds(0).second(0);
-    const NOW = moment().milliseconds(0).seconds(0);
+  const onDatePickerChange = (v: dayjs.Dayjs) => {
+    v = v.millisecond(0).second(0);
+    const NOW = dayjs().millisecond(0).second(0);
     const value = `${v.diff(NOW, 'd')}d`;
     onChange(value);
   };
@@ -42,8 +42,8 @@ const InternalExpiresSelect = (props) => {
       <Select {...props} value={isCustom ? 'custom' : props.value} onChange={onSelectChange}></Select>
       {isCustom ? (
         <DatePicker
-          disabledDate={(time) => {
-            return time.isSameOrBefore();
+          disabledDate={(date) => {
+            return date.isSameOrBefore();
           }}
           defaultValue={TOMORROW}
           onChange={onDatePickerChange}
@@ -61,7 +61,7 @@ const ReadPretty = () => {
   const expiresDate = useMemo(() => {
     if (expiresIn === 'never') return t('Never expires');
 
-    return moment(createdAt)
+    return dayjs(createdAt)
       .add(expiresIn?.replace('d', '') || 0, 'days')
       .format('YYYY-MM-DD HH:mm:ss');
   }, [createdAt, expiresIn]);

package/src/client/index.tsx

@@ -1,4 +1,4 @@
-import { SchemaComponentOptions, SettingsCenterProvider } from '@nocobase/client';
+import { Plugin, SchemaComponentOptions, SettingsCenterProvider } from '@nocobase/client';
 import React from 'react';
 import { Configuration } from './Configuration';
 import { useTranslation } from './locale';
@@ -26,4 +26,10 @@ const ApiKeysProvider = React.memo((props) => {
 });
 ApiKeysProvider.displayName = 'ApiKeysProvider';
 
-export default ApiKeysProvider;
+class APIKeysPlugin extends Plugin {
+  async load() {
+    this.app.addProvider(ApiKeysProvider);
+  }
+}
+
+export default APIKeysPlugin;

package/docs/en-US/changelog.md

@@ -1 +0,0 @@
-# API keys Changelog

package/docs/en-US/index.md

@@ -1,9 +0,0 @@
-# API keys
-
-## Introduction
-
-This plugin allows you to create and manage API keys. The generated API key can be used to access all `NocoBase` APIs.
-
-## Access Control
-
-When creating an API key, you can bind it to a role, and the role's permissions will be the same as the Key's permissions.

package/docs/en-US/tabs.json

@@ -1,14 +0,0 @@
-[
-  {
-    "title": "Introduction",
-    "path": "index"
-  },
-  {
-    "title": "Usage",
-    "path": "usage"
-  },
-  {
-    "title": "Changelog",
-    "path": "changelog"
-  }
-]

package/docs/en-US/usage.md

@@ -1,19 +0,0 @@
-# API keys Usage
-
-## Creating an API key
-
-After enabling the plugin, go to the API keys plugin management page, click `Add API key`, fill in the relevant information, and click Save to create an API key.
-
-## Using an API key
-
-Add the `Authorization` field to the request header, with the value of `Bearer ${API_KEY}`, to access all `NocoBase` APIs using the API key.
-
-Here's an example using cURL:
-
-```bash
-curl '{domain}/api/roles:check' -H 'Authorization: Bearer {API key}'
-```
-
-## Deleting an API key
-
-After deleting the API key, it will no longer be usable.

package/docs/zh-CN/changelog.md

@@ -1 +0,0 @@
-# API keys 更新日志

package/docs/zh-CN/index.md

@@ -1,10 +0,0 @@
-# API keys
-
-## 简介
-
-该插件允许你创建和管理 API keys，生成的 API key 可以用于访问 `NocoBase` 所有 API。
-
-
-## 权限控制
-
-创建 API key 时，可以为该 Key 绑定角色，角色的权限就是 Key 的权限。

package/docs/zh-CN/tabs.json

@@ -1,14 +0,0 @@
-[
-  {
-    "title": "介绍",
-    "path": "index"
-  },
-  {
-    "title": "用法",
-    "path": "usage"
-  },
-  {
-    "title": "日志",
-    "path": "changelog"
-  }
-]

package/docs/zh-CN/usage.md

@@ -1,19 +0,0 @@
-# API keys 使用方法
-
-## 创建 API key
-
-当你启用插件后，前往 API keys 的插件管理页面，点击 `添加 API key` 并填写相关信息，点击 `保存` 即可创建 API key。
-
-## 使用 API key
-
-在请求头中添加 `Authorization` 字段，值为 `Bearer ${API_KEY}`，即可使用 API key 访问 `NocoBase` 所有 API。
-
-cURL 的例子如下
-
-```bash
-curl '{domain}/api/roles:check' -H 'Authorization: Bearer {API key}'
-```
-
-## 删除 API key
-
-删除 API key 后，该 Key 将无法继续使用。