@nocobase/plugin-users 0.11.1-alpha.5 → 0.12.0-alpha.2

package/src/server/__tests__/fields.test.ts

@@ -1,90 +0,0 @@
-import Database from '@nocobase/database';
-import PluginACL from '@nocobase/plugin-acl';
-import UsersPlugin from '@nocobase/plugin-users';
-import { mockServer, MockServer } from '@nocobase/test';
-import { userPluginConfig } from './utils';
-describe('createdBy/updatedBy', () => {
-  let api: MockServer;
-  let db: Database;
-
-  beforeEach(async () => {
-    api = mockServer();
-    api.plugin(UsersPlugin, userPluginConfig);
-    api.plugin(PluginACL, { name: 'acl' });
-    await api.loadAndInstall({ clean: true });
-    db = api.db;
-  });
-
-  afterEach(async () => {
-    await db.close();
-  });
-
-  describe('collection definition', () => {
-    it('case 1', async () => {
-      const Post = db.collection({
-        name: 'posts',
-        createdBy: true,
-        updatedBy: true,
-      });
-      expect(Post.hasField('createdBy')).toBeTruthy();
-      expect(Post.hasField('updatedBy')).toBeTruthy();
-    });
-
-    it('case 2', async () => {
-      const Post = db.collection({
-        name: 'posts',
-        createdBy: true,
-        updatedBy: true,
-      });
-      await db.sync();
-      const currentUser = await db.getCollection('users').model.create();
-      await Post.repository.create({
-        context: {
-          state: {
-            currentUser,
-          },
-        },
-      });
-      const p2 = await Post.repository.findOne({
-        appends: ['createdBy', 'updatedBy'],
-      });
-
-      const data = p2.toJSON();
-      expect(data.createdBy.id).toBe(currentUser.get('id'));
-      expect(data.updatedBy.id).toBe(currentUser.get('id'));
-    });
-
-    it('case 3', async () => {
-      const Post = db.collection({
-        name: 'posts',
-        createdBy: true,
-        updatedBy: true,
-      });
-      await db.sync();
-      const user1 = await db.getCollection('users').model.create();
-      const user2 = await db.getCollection('users').model.create();
-      const p1 = await Post.repository.create({
-        context: {
-          state: {
-            currentUser: user1,
-          },
-        },
-      });
-      await Post.repository.update({
-        values: {},
-        filterByTk: p1.id,
-        context: {
-          state: {
-            currentUser: user2,
-          },
-        },
-      });
-      const p2 = await Post.repository.findOne({
-        appends: ['createdBy', 'updatedBy'],
-      });
-      const data = p2.toJSON();
-      expect(data.createdBy.id).toBe(user1.get('id'));
-      expect(data.updatedBy.id).toBe(user2.get('id'));
-    });
-  });
-});

package/src/server/__tests__/utils.ts

@@ -1,8 +0,0 @@
-import { UserPluginConfig } from '../server';
-
-export const userPluginConfig: UserPluginConfig = {
-  name: 'users',
-  jwt: {
-    secret: '09f26e402586e2faa8da4c98a35f1b20d6b033c60',
-  },
-};

package/src/server/actions/users.ts

@@ -1,148 +0,0 @@
-import { Context, Next } from '@nocobase/actions';
-import { PasswordField } from '@nocobase/database';
-import { branch } from '@nocobase/resourcer';
-import crypto from 'crypto';
-import { namespace } from '../';
-
-export async function check(ctx: Context, next: Next) {
-  if (ctx.state.currentUser) {
-    const user = ctx.state.currentUser.toJSON();
-    ctx.body = user;
-  } else {
-    ctx.body = {};
-  }
-  await next();
-}
-
-export async function signin(ctx: Context, next: Next) {
-  const { authenticators, jwtService } = ctx.app.getPlugin('users');
-  const branches = {};
-  for (const [name, authenticator] of authenticators.getEntities()) {
-    branches[name] = authenticator;
-  }
-
-  return branch(branches, (context) => context.action.params.authenticator ?? 'password')(ctx, () => {
-    const user = ctx.state.currentUser.toJSON();
-    const token = jwtService.sign({ userId: user.id });
-    ctx.body = {
-      user,
-      token,
-    };
-
-    return next();
-  });
-}
-
-export async function signout(ctx: Context, next: Next) {
-  ctx.body = ctx.state.currentUser;
-  await next();
-}
-
-export async function signup(ctx: Context, next: Next) {
-  const User = ctx.db.getRepository('users');
-  const { values } = ctx.action.params;
-  const user = await User.create({ values });
-  ctx.body = user;
-  await next();
-}
-
-export async function lostpassword(ctx: Context, next: Next) {
-  const {
-    values: { email },
-  } = ctx.action.params;
-  if (!email) {
-    ctx.throw(400, { code: 'InvalidUserData', message: ctx.t('Please fill in your email address', { ns: namespace }) });
-  }
-  const User = ctx.db.getCollection('users');
-  const user = await User.model.findOne<any>({
-    where: {
-      email,
-    },
-  });
-  if (!user) {
-    ctx.throw(404, {
-      code: 'InvalidUserData',
-      message: ctx.t('The email is incorrect, please re-enter', { ns: namespace }),
-    });
-  }
-  user.resetToken = crypto.randomBytes(20).toString('hex');
-  await user.save();
-  ctx.body = user;
-  await next();
-}
-
-export async function resetpassword(ctx: Context, next: Next) {
-  const {
-    values: { email, password, resetToken },
-  } = ctx.action.params;
-  const User = ctx.db.getCollection('users');
-  const user = await User.model.findOne<any>({
-    where: {
-      email,
-      resetToken,
-    },
-  });
-  if (!user) {
-    ctx.throw(404);
-  }
-  user.token = null;
-  user.resetToken = null;
-  user.password = password;
-  await user.save();
-  ctx.body = user;
-  await next();
-}
-
-export async function getUserByResetToken(ctx: Context, next: Next) {
-  const { token } = ctx.action.params;
-  const User = ctx.db.getCollection('users');
-  const user = await User.model.findOne({
-    where: {
-      resetToken: token,
-    },
-  });
-  if (!user) {
-    ctx.throw(401);
-  }
-  ctx.body = user;
-  await next();
-}
-
-export async function updateProfile(ctx: Context, next: Next) {
-  const { values } = ctx.action.params;
-  const { currentUser } = ctx.state;
-  if (!currentUser) {
-    ctx.throw(401);
-  }
-  const UserRepo = ctx.db.getRepository('users');
-  const result = await UserRepo.update({
-    filterByTk: currentUser.id,
-    values,
-  });
-  ctx.body = result;
-  await next();
-}
-
-export async function changePassword(ctx: Context, next: Next) {
-  const {
-    values: { oldPassword, newPassword },
-  } = ctx.action.params;
-  if (!ctx.state.currentUser) {
-    ctx.throw(401);
-  }
-  const User = ctx.db.getCollection('users');
-  const user = await User.model.findOne<any>({
-    where: {
-      email: ctx.state.currentUser.email,
-    },
-  });
-  const pwd = User.getField<PasswordField>('password');
-  const isValid = await pwd.verify(oldPassword, user.password);
-  if (!isValid) {
-    ctx.throw(401, ctx.t('The password is incorrect, please re-enter', { ns: namespace }));
-  }
-  user.password = newPassword;
-  user.save();
-  ctx.body = ctx.state.currentUser.toJSON();
-  await next();
-}

package/src/server/authenticators/index.ts

@@ -1,26 +0,0 @@
-import path from 'path';
-
-import { requireModule } from '@nocobase/utils';
-import { HandlerType } from '@nocobase/resourcer';
-
-import Plugin from '..';
-
-interface Authenticators {
-  [key: string]: HandlerType;
-}
-
-export default function (plugin: Plugin, more: Authenticators = {}) {
-  const { authenticators } = plugin;
-
-  const natives = ['password'].reduce(
-    (result, key) =>
-      Object.assign(result, {
-        [key]: requireModule(path.isAbsolute(key) ? key : path.join(__dirname, key)) as HandlerType,
-      }),
-    {},
-  );
-
-  for (const [name, authenticator] of Object.entries(<Authenticators>{ ...more, ...natives })) {
-    authenticators.register(name, authenticator);
-  }
-}

package/src/server/authenticators/password.ts

@@ -1,34 +0,0 @@
-import { PasswordField } from '@nocobase/database';
-import { Context, Next } from '@nocobase/actions';
-import { namespace } from '..';
-
-export default async function (ctx: Context, next: Next) {
-  const { uniqueField = 'email', values } = ctx.action.params;
-
-  if (!values[uniqueField]) {
-    return ctx.throw(400, {
-      code: 'InvalidUserData',
-      message: ctx.t('Please fill in your email address', { ns: namespace }),
-    });
-  }
-  const User = ctx.db.getCollection('users');
-  const user = await User.model.findOne<any>({
-    where: {
-      [uniqueField]: values[uniqueField],
-    },
-  });
-
-  if (!user) {
-    return ctx.throw(404, ctx.t('The email is incorrect, please re-enter', { ns: namespace }));
-  }
-
-  const field = User.getField<PasswordField>('password');
-  const valid = await field.verify(values.password, user.password);
-  if (!valid) {
-    return ctx.throw(404, ctx.t('The password is incorrect, please re-enter', { ns: namespace }));
-  }
-
-  ctx.state.currentUser = user;
-
-  return next();
-}

package/src/server/collections/users.ts

@@ -1,89 +0,0 @@
-import { CollectionOptions } from '@nocobase/database';
-
-export default {
-  namespace: 'users.users',
-  duplicator: {
-    dumpable: 'optional',
-    with: 'rolesUsers',
-  },
-  name: 'users',
-  title: '{{t("Users")}}',
-  sortable: 'sort',
-  model: 'UserModel',
-  createdBy: true,
-  updatedBy: true,
-  logging: true,
-  fields: [
-    {
-      name: 'id',
-      type: 'bigInt',
-      autoIncrement: true,
-      primaryKey: true,
-      allowNull: false,
-      uiSchema: { type: 'number', title: '{{t("ID")}}', 'x-component': 'InputNumber', 'x-read-pretty': true },
-      interface: 'id',
-    },
-    {
-      interface: 'input',
-      type: 'string',
-      name: 'nickname',
-      uiSchema: {
-        type: 'string',
-        title: '{{t("Nickname")}}',
-        'x-component': 'Input',
-      },
-    },
-    {
-      interface: 'email',
-      type: 'string',
-      name: 'email',
-      unique: true,
-      uiSchema: {
-        type: 'string',
-        title: '{{t("Email")}}',
-        'x-component': 'Input',
-        'x-validator': 'email',
-        required: true,
-      },
-    },
-    {
-      interface: 'phone',
-      type: 'string',
-      name: 'phone',
-      unique: true,
-      uiSchema: {
-        type: 'string',
-        title: '{{t("Phone")}}',
-        'x-component': 'Input',
-        'x-validator': 'phone',
-        required: true,
-      },
-    },
-    {
-      interface: 'password',
-      type: 'password',
-      name: 'password',
-      hidden: true,
-      uiSchema: {
-        type: 'string',
-        title: '{{t("Password")}}',
-        'x-component': 'Password',
-      },
-    },
-    {
-      type: 'string',
-      name: 'appLang',
-    },
-    {
-      type: 'string',
-      name: 'resetToken',
-      unique: true,
-      hidden: true,
-    },
-    {
-      type: 'json',
-      name: 'systemSettings',
-      defaultValue: {},
-    },
-  ],
-} as CollectionOptions;

package/src/server/index.ts

@@ -1,3 +0,0 @@
-export { default } from './server';
-
-export const namespace = require('../../package.json').name;

package/src/server/jwt-service.ts

@@ -1,34 +0,0 @@
-import jwt from 'jsonwebtoken';
-
-export interface JwtOptions {
-  secret: string;
-  expiresIn?: string;
-}
-
-export class JwtService {
-  constructor(protected options: JwtOptions) {}
-
-  private expiresIn() {
-    return this.options.expiresIn || process.env.JWT_EXPIRES_IN || '7d';
-  }
-
-  private secret() {
-    return this.options.secret || process.env.APP_KEY;
-  }
-
-  sign(payload: any) {
-    return jwt.sign(payload, this.secret(), { expiresIn: this.expiresIn() });
-  }
-
-  decode(token: string): Promise<any> {
-    return new Promise((resolve, reject) => {
-      jwt.verify(token, this.secret(), (err: any, decoded: any) => {
-        if (err) {
-          return reject(err);
-        }
-
-        resolve(decoded);
-      });
-    });
-  }
-}

package/src/server/locale/en-US.ts

@@ -1,10 +0,0 @@
-export default {
-  'The email is incorrect, please re-enter': 'The email is incorrect, please re-enter',
-  'Please fill in your email address': 'Please fill in your email address',
-  'The password is incorrect, please re-enter': 'The password is incorrect, please re-enter',
-  'Not a valid cellphone number, please re-enter': 'Not a valid cellphone number, please re-enter',
-  'The phone number has been registered, please login directly':
-    'The phone number has been registered, please login directly',
-  'The phone number is not registered, please register first':
-    'The phone number is not registered, please register first',
-};

package/src/server/locale/es-ES.ts

@@ -1,8 +0,0 @@
-export default {
-  "The email is incorrect, please re-enter": "El correo electrónico es incorrecto, por favor vuelva a introducirlo",
-  "Please fill in your email address": "Por favor, introduzca su dirección de correo electrónico",
-  "The password is incorrect, please re-enter": "La contraseña es incorrecta, por favor, vuelva a introducirla",
-  "Not a valid cellphone number, please re-enter": "No es un número de móvil válido, por favor, vuelva a introducirlo",
-  "The phone number has been registered, please login directly": "El número de teléfono ha sido registrado, por favor, inicie sesión directamente",
-  "The phone number is not registered, please register first": "El número de teléfono no está registrado, por favor regístrese primero"
-};

package/src/server/locale/fr-FR.ts

@@ -1,11 +0,0 @@
-export default {
-  'The email is incorrect, please re-enter': "L'adresse e-mail est incorrecte, veuillez la saisir à nouveau",
-  'Please fill in your email address': 'Veuillez remplir votre adresse e-mail',
-  'The password is incorrect, please re-enter': 'Le mot de passe est incorrect, veuillez le saisir à nouveau',
-  'Not a valid cellphone number, please re-enter':
-    'Numéro de téléphone portable invalide, veuillez le saisir à nouveau',
-  'The phone number has been registered, please login directly':
-    'Le numéro de téléphone a été enregistré, veuillez vous connecter directement',
-  'The phone number is not registered, please register first':
-    "Le numéro de téléphone n'est pas enregistré, veuillez vous inscrire d'abord",
-};

package/src/server/locale/index.ts

@@ -1,3 +0,0 @@
-export { default as enUS } from './en-US';
-export { default as zhCN } from './zh-CN';
-export { default as ptBR } from './pt-BR';

package/src/server/locale/ja-JP.ts

@@ -1,4 +0,0 @@
-export default {
-  'Please fill in your email address': 'メールアドレスを入力してください',
-  'The password is incorrect, please re-enter': 'パスワードが正しくありません。再度入力してください。',
-};

package/src/server/locale/pt-BR.ts

@@ -1,10 +0,0 @@
-export default {
-  'The email is incorrect, please re-enter': 'O e-mail está incorreto, por favor, digite novamente',
-  'Please fill in your email address': 'Por favor, preencha o seu endereço de e-mail',
-  'The password is incorrect, please re-enter': 'A senha está incorreta, por favor, digite novamente',
-  'Not a valid cellphone number, please re-enter': 'Número de celular inválido, por favor, digite novamente',
-  'The phone number has been registered, please login directly':
-    'O número de celular já está registrado, por favor, faça login diretamente',
-  'The phone number is not registered, please register first':
-    'O número de celular não está registrado, por favor, registre-se primeiro',
-};

package/src/server/locale/zh-CN.ts

@@ -1,8 +0,0 @@
-export default {
-  'The email is incorrect, please re-enter': '邮箱有误，请重新输入',
-  'Please fill in your email address': '请填写邮箱',
-  'The password is incorrect, please re-enter': '密码有误，请重新输入',
-  'Not a valid cellphone number, please re-enter': '不是有效的手机号，请重新输入',
-  'The phone number has been registered, please login directly': '手机号已注册，请直接登录',
-  'The phone number is not registered, please register first': '手机号未注册，请先注册',
-};

package/src/server/middlewares/check.ts

@@ -1,11 +0,0 @@
-// TODO(usage): 拦截用户的处理暂时作为一个中间件导出，应用需要的时候可以直接使用这个中间件
-export function check(options) {
-  return async function check(ctx, next) {
-    const { currentUser } = ctx.state;
-
-    if (!currentUser) {
-      return ctx.throw(401, 'Unauthorized');
-    }
-    return next();
-  };
-}

package/src/server/middlewares/index.ts

@@ -1,2 +0,0 @@
-export { check } from './check';
-export { parseToken } from './parseToken';

package/src/server/migrations/20220818072639-add-users-phone.ts

@@ -1,39 +0,0 @@
-import { Migration } from '@nocobase/server';
-
-export default class AddUsersPhoneMigration extends Migration {
-  async up() {
-    const match = await this.app.version.satisfies('<=0.7.4-alpha.7');
-    if (!match) {
-      return;
-    }
-    const Field = this.context.db.getRepository('fields');
-    const existed = await Field.count({
-      filter: {
-        name: 'phone',
-        collectionName: 'users',
-      },
-    });
-    if (!existed) {
-      await Field.create({
-        values: {
-          name: 'phone',
-          collectionName: 'users',
-          type: 'string',
-          unique: true,
-          interface: 'phone',
-          uiSchema: {
-            type: 'string',
-            title: '{{t("Phone")}}',
-            'x-component': 'Input',
-            'x-validator': 'phone',
-            require: true,
-          },
-        },
-        // NOTE: to trigger hook
-        context: {},
-      });
-    }
-  }
-
-  async down() {}
-}