@nocobase/plugin-auth 0.10.1-alpha.1 → 0.11.1-alpha.1

package/client.d.ts

@@ -1,3 +1,2 @@
-// @ts-nocheck
-export * from './lib/client';
-export { default } from './lib/client';
+export * from './src/client';
+export { default } from './src/client';

package/lib/client/AuthProvider.d.ts

@@ -0,0 +1,2 @@
+import { FC } from 'react';
+export declare const AuthProvider: FC;

package/lib/client/AuthProvider.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AuthProvider = void 0;
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  return data;
+}
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
+    return data;
+  };
+  return data;
+}
+var _Authenticator = require("./settings/Authenticator");
+var _SigninPage = _interopRequireDefault(require("./basic/SigninPage"));
+var _preset = require("../preset");
+var _SignupPage = _interopRequireDefault(require("./basic/SignupPage"));
+var _locale = require("./locale");
+var _Options = require("./basic/Options");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const AuthProvider = props => {
+  const _useAuthTranslation = (0, _locale.useAuthTranslation)(),
+    t = _useAuthTranslation.t;
+  return _react().default.createElement(_client().SettingsCenterProvider, {
+    settings: {
+      auth: {
+        title: t('Authentication'),
+        icon: 'LoginOutlined',
+        tabs: {
+          authenticators: {
+            title: t('Authenticators'),
+            component: () => _react().default.createElement(_Authenticator.Authenticator, null)
+          }
+        }
+      }
+    }
+  }, _react().default.createElement(_client().OptionsComponentProvider, {
+    authType: _preset.presetAuthType,
+    component: _Options.Options
+  }, _react().default.createElement(_client().SigninPageProvider, {
+    authType: _preset.presetAuthType,
+    tabTitle: t('Sign in via email'),
+    component: _SigninPage.default
+  }, _react().default.createElement(_client().SignupPageProvider, {
+    authType: _preset.presetAuthType,
+    component: _SignupPage.default
+  }, props.children))));
+};
+exports.AuthProvider = AuthProvider;

package/lib/client/index.d.ts

@@ -1,3 +1,5 @@
-import React from 'react';
-declare const _default: (props: any) => React.JSX.Element;
-export default _default;
+import { Plugin } from '@nocobase/client';
+export declare class AuthPlugin extends Plugin {
+    load(): Promise<void>;
+}
+export default AuthPlugin;

package/lib/client/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.AuthPlugin = void 0;
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -11,46 +11,17 @@ function _client() {
   };
   return data;
 }
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
+var _AuthProvider = require("./AuthProvider");
+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); }); }; }
+class AuthPlugin extends _client().Plugin {
+  load() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      _this.app.use(_AuthProvider.AuthProvider);
+    })();
+  }
 }
-var _Authenticator = require("./settings/Authenticator");
-var _SigninPage = _interopRequireDefault(require("./basic/SigninPage"));
-var _preset = require("../preset");
-var _SignupPage = _interopRequireDefault(require("./basic/SignupPage"));
-var _locale = require("./locale");
-var _Options = require("./basic/Options");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var _default = props => {
-  const _useAuthTranslation = (0, _locale.useAuthTranslation)(),
-    t = _useAuthTranslation.t;
-  return _react().default.createElement(_client().SettingsCenterProvider, {
-    settings: {
-      auth: {
-        title: t('Authentication'),
-        icon: 'LoginOutlined',
-        tabs: {
-          authenticators: {
-            title: t('Authenticators'),
-            component: () => _react().default.createElement(_Authenticator.Authenticator, null)
-          }
-        }
-      }
-    }
-  }, _react().default.createElement(_client().OptionsComponentProvider, {
-    authType: _preset.presetAuthType,
-    component: _Options.Options
-  }, _react().default.createElement(_client().SigninPageProvider, {
-    authType: _preset.presetAuthType,
-    tabTitle: t('Sign in via email'),
-    component: _SigninPage.default
-  }, _react().default.createElement(_client().SignupPageProvider, {
-    authType: _preset.presetAuthType,
-    component: _SignupPage.default
-  }, props.children))));
-};
+exports.AuthPlugin = AuthPlugin;
+var _default = AuthPlugin;
 exports.default = _default;

package/lib/client/settings/Options.d.ts

@@ -1,3 +1,16 @@
 /// <reference types="react" />
-export declare const useValuesFromOptions: (options: any) => any;
+export declare const useValuesFromOptions: (options: any) => {
+    state: {};
+    setState: import("ahooks/lib/useSetState").SetState<{}>;
+    loading: boolean;
+    data?: unknown;
+    error?: Error;
+    params: any;
+    cancel: () => void;
+    refresh: () => void;
+    refreshAsync: () => Promise<unknown>;
+    run: (...params: any) => void;
+    runAsync: (...params: any) => Promise<unknown>;
+    mutate: (data?: unknown) => void;
+};
 export declare const Options: import("react").MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;

package/lib/client/settings/Options.js

@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useValuesFromOptions = exports.Options = void 0;
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _react() {
+  const data = require("@formily/react");
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _react() {
-  const data = require("react");
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
 function _react2() {
-  const data = require("@formily/react");
+  const data = require("react");
   _react2 = function _react2() {
     return data;
   };
@@ -39,7 +39,7 @@ const useValuesFromOptions = options => {
   }));
   const run = result.run;
   const ctx = (0, _client().useActionContext)();
-  (0, _react().useEffect)(() => {
+  (0, _react2().useEffect)(() => {
     if (ctx.visible) {
       run();
     }
@@ -47,8 +47,8 @@ const useValuesFromOptions = options => {
   return result;
 };
 exports.useValuesFromOptions = useValuesFromOptions;
-const Options = (0, _react2().observer)(() => {
-  const form = (0, _react2().useForm)();
+const Options = (0, _react().observer)(() => {
+  const form = (0, _react().useForm)();
   const record = (0, _client().useRecord)();
   const component = (0, _client().useOptionsComponent)(form.values.authType || record.authType);
   return component;

package/lib/client/settings/schemas/authenticators.js

@@ -18,17 +18,16 @@ function _client() {
   };
   return data;
 }
-function _react() {
-  const data = require("react");
-  _react = function _react() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-var _authType = require("../authType");
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _react() {
+  const data = require("react");
+  _react = function _react() {
     return data;
   };
   return data;
@@ -40,6 +39,7 @@ function _reactI18next() {
   };
   return data;
 }
+var _authType = require("../authType");
 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); }); }; }
 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; }

package/lib/server/collections/authenticators.d.ts

@@ -1,6 +1,6 @@
 import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
 /**
  * Collection for extended authentication methods,
  */
+declare const _default: CollectionOptions;
 export default _default;

package/lib/server/collections/authenticators.js

@@ -55,7 +55,8 @@ var _default = {
       type: 'string',
       title: '{{t("Title")}}',
       'x-component': 'Input'
-    }
+    },
+    translation: true
   }, {
     interface: 'textarea',
     type: 'string',

package/lib/server/collections/users-authenticators.d.ts

@@ -1,7 +1,7 @@
 import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
 /**
  * Collection for user information of extended authentication methods,
  * such as saml, oicd, oauth, sms, etc.
  */
+declare const _default: CollectionOptions;
 export default _default;

package/package.json

@@ -1,21 +1,39 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "0.10.1-alpha.1",
-  "main": "lib/server/index.js",
+  "version": "0.11.1-alpha.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/cron": "^2.0.1"
+    "@ant-design/icons": "^5.1.4",
+    "@formily/react": "2.2.26",
+    "@formily/shared": "2.2.26",
+    "@nocobase/auth": "0.11.1-alpha.1",
+    "@nocobase/test": "0.11.1-alpha.1",
+    "@types/cron": "^2.0.1",
+    "antd": "^5.6.4",
+    "react": "^18.2.0",
+    "react-i18next": "^11.15.1"
   },
   "dependencies": {
-    "@nocobase/actions": "0.10.1-alpha.1",
-    "@nocobase/client": "0.10.1-alpha.1",
-    "@nocobase/database": "0.10.1-alpha.1",
-    "@nocobase/server": "0.10.1-alpha.1",
+    "@nocobase/actions": "0.11.1-alpha.1",
+    "@nocobase/client": "0.11.1-alpha.1",
+    "@nocobase/database": "0.11.1-alpha.1",
+    "@nocobase/server": "0.11.1-alpha.1",
     "cron": "^2.3.1"
   },
   "displayName": "Authentication",
   "displayName.zh-CN": "用户认证",
   "description": "Basic authentication and authenticator management.",
   "description.zh-CN": "提供基础认证功能和扩展认证器管理功能。",
-  "gitHead": "8f415f5e0ee2e72d681f9ab16af5911b52c374a9"
+  "gitHead": "9ed1dba520bc5f3a7cb1255ea8d92ccbefc11bc8"
 }

package/server.d.ts

@@ -1,3 +1,2 @@
-// @ts-nocheck
-export * from './lib/server';
-export { default } from './lib/server';
+export * from './src/server';
+export { default } from './src/server';

package/src/client/AuthProvider.tsx

@@ -0,0 +1,41 @@
+import {
+  OptionsComponentProvider,
+  SettingsCenterProvider,
+  SigninPageProvider,
+  SignupPageProvider,
+} from '@nocobase/client';
+import React, { FC } from 'react';
+import { Authenticator } from './settings/Authenticator';
+import SigninPage from './basic/SigninPage';
+import { presetAuthType } from '../preset';
+import SignupPage from './basic/SignupPage';
+import { useAuthTranslation } from './locale';
+import { Options } from './basic/Options';
+
+export const AuthProvider: FC = (props) => {
+  const { t } = useAuthTranslation();
+  return (
+    <SettingsCenterProvider
+      settings={{
+        auth: {
+          title: t('Authentication'),
+          icon: 'LoginOutlined',
+          tabs: {
+            authenticators: {
+              title: t('Authenticators'),
+              component: () => <Authenticator />,
+            },
+          },
+        },
+      }}
+    >
+      <OptionsComponentProvider authType={presetAuthType} component={Options}>
+        <SigninPageProvider authType={presetAuthType} tabTitle={t('Sign in via email')} component={SigninPage}>
+          <SignupPageProvider authType={presetAuthType} component={SignupPage}>
+            {props.children}
+          </SignupPageProvider>
+        </SigninPageProvider>
+      </OptionsComponentProvider>
+    </SettingsCenterProvider>
+  );
+};

package/src/client/basic/SigninPage.tsx

@@ -1,5 +1,5 @@
-import { Authenticator, SchemaComponent, SignupPageContext, useSignIn } from '@nocobase/client';
 import { ISchema } from '@formily/react';
+import { Authenticator, SchemaComponent, SignupPageContext, useSignIn } from '@nocobase/client';
 import React, { useContext } from 'react';
 
 const passwordForm: ISchema = {

package/src/client/index.tsx

@@ -1,41 +1,10 @@
-import {
-  OptionsComponentProvider,
-  SettingsCenterProvider,
-  SigninPageProvider,
-  SignupPageProvider,
-} from '@nocobase/client';
-import React from 'react';
-import { Authenticator } from './settings/Authenticator';
-import SigninPage from './basic/SigninPage';
-import { presetAuthType } from '../preset';
-import SignupPage from './basic/SignupPage';
-import { useAuthTranslation } from './locale';
-import { Options } from './basic/Options';
+import { Plugin } from '@nocobase/client';
+import { AuthProvider } from './AuthProvider';
 
-export default (props) => {
-  const { t } = useAuthTranslation();
-  return (
-    <SettingsCenterProvider
-      settings={{
-        auth: {
-          title: t('Authentication'),
-          icon: 'LoginOutlined',
-          tabs: {
-            authenticators: {
-              title: t('Authenticators'),
-              component: () => <Authenticator />,
-            },
-          },
-        },
-      }}
-    >
-      <OptionsComponentProvider authType={presetAuthType} component={Options}>
-        <SigninPageProvider authType={presetAuthType} tabTitle={t('Sign in via email')} component={SigninPage}>
-          <SignupPageProvider authType={presetAuthType} component={SignupPage}>
-            {props.children}
-          </SignupPageProvider>
-        </SigninPageProvider>
-      </OptionsComponentProvider>
-    </SettingsCenterProvider>
-  );
-};
+export class AuthPlugin extends Plugin {
+  async load() {
+    this.app.use(AuthProvider);
+  }
+}
+
+export default AuthPlugin;

package/src/client/settings/Options.tsx

@@ -1,7 +1,6 @@
-import { useRequest, useRecord, useActionContext } from '@nocobase/client';
-import { useEffect } from 'react';
-import { useOptionsComponent } from '@nocobase/client';
 import { observer, useForm } from '@formily/react';
+import { useActionContext, useOptionsComponent, useRecord, useRequest } from '@nocobase/client';
+import { useEffect } from 'react';
 
 export const useValuesFromOptions = (options) => {
   const record = useRecord();

package/src/client/settings/schemas/authenticators.ts

@@ -1,10 +1,10 @@
-import { uid } from '@formily/shared';
 import { ISchema } from '@formily/react';
+import { uid } from '@formily/shared';
 import { useAPIClient, useActionContext, useRequest } from '@nocobase/client';
-import { useContext } from 'react';
-import { AuthTypeContext } from '../authType';
 import { message } from 'antd';
+import { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
+import { AuthTypeContext } from '../authType';
 
 const collection = {
   name: 'authenticators',

package/src/server/actions/authenticators.ts

@@ -1,8 +1,8 @@
 import { Context, Next } from '@nocobase/actions';
-import { namespace } from '../../preset';
 import { Model, Repository } from '@nocobase/database';
+import { namespace } from '../../preset';
 
-async function checkCount(repository: Repository, id: number) {
+async function checkCount(repository: Repository, id: number[]) {
   // TODO(yangqia): This is a temporary solution, may cause concurrency problem.
   const count = await repository.count({
     filter: {

package/src/server/collections/authenticators.ts

@@ -56,6 +56,7 @@ export default {
         title: '{{t("Title")}}',
         'x-component': 'Input',
       },
+      translation: true,
     },
     {
       interface: 'textarea',