@steedos/accounts 2.6.1-beta.7 → 2.6.2-beta.2

package/lib/rest-express/endpoints/steedos/settings.js

@@ -10,10 +10,10 @@ var validator = require('validator');
 var clone = require('clone');
 var config = (0, objectql_1.getSteedosConfig)();
 var getSettings = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var tenant, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo, _tenant;
-    var _a, _b;
-    return tslib_1.__generator(this, function (_c) {
-        switch (_c.label) {
+    var tenant, platform, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo, _tenant;
+    var _a, _b, _c;
+    return tslib_1.__generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 tenant = {
                     name: "Steedos",
@@ -28,18 +28,21 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
                     enable_bind_mobile: false,
                     enable_bind_email: false,
                     enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true),
-                    enable_open_geetest: validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED || 'false')
+                    enable_open_geetest: validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED || 'false'),
+                    page_login: process.env.STEEDOS_TENANT_PAGE_LOGIN,
+                    page_logout: process.env.STEEDOS_TENANT_PAGE_LOGOUT
                 };
                 if (config.tenant) {
                     _.assignIn(tenant, config.tenant);
                 }
                 if (!tenant._id) {
-                    tenant._id = process.env.STEEDOS_CLOUD_SPACE_ID;
+                    tenant._id = process.env.STEEDOS_TENANT_ID;
                 }
+                platform = ((_a = global.Meteor.settings.public) === null || _a === void 0 ? void 0 : _a.platform) || {};
                 if (!tenant._id) return [3, 2];
-                return [4, db_1.db.findOne("spaces", tenant._id, { fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo"] })];
+                return [4, db_1.db.findOne("spaces", tenant._id, { fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo", "favicon"] })];
             case 1:
-                spaceDoc = _c.sent();
+                spaceDoc = _d.sent();
                 steedosService = (0, core_1.getSteedosService)();
                 if (steedosService && spaceDoc) {
                     _.assignIn(tenant, spaceDoc);
@@ -55,8 +58,11 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
                     if (spaceDoc.background) {
                         tenant.background_url = steedosService + "api/files/avatars/" + spaceDoc.background;
                     }
+                    if ((platform === null || platform === void 0 ? void 0 : platform.is_oem) && spaceDoc.favicon) {
+                        tenant.favicon_url = steedosService + "api/files/avatars/" + spaceDoc.favicon;
+                    }
                 }
-                _c.label = 2;
+                _d.label = 2;
             case 2:
                 already_mail_service = (0, core_1.canSendEmail)();
                 already_sms_service = true || (0, core_1.canSendSMS)();
@@ -71,12 +77,14 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
                 }
                 res.json({
                     tenant: _tenant,
-                    password: config.password ? config.password : (((_a = config.public) === null || _a === void 0 ? void 0 : _a.password) ? (_b = config.public) === null || _b === void 0 ? void 0 : _b.password : {}),
+                    password: config.password ? config.password : (((_b = config.public) === null || _b === void 0 ? void 0 : _b.password) ? (_c = config.public) === null || _c === void 0 ? void 0 : _c.password : {}),
                     root_url: process.env.ROOT_URL,
                     already_mail_service: already_mail_service,
                     already_sms_service: already_sms_service,
                     serverInitInfo: serverInitInfo,
-                    redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST
+                    redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST,
+                    platform: platform,
+                    public: global.Meteor.settings.public || {}
                 });
                 return [2];
         }

package/lib/rest-express/endpoints/steedos/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}

package/lib/rest-express/express-middleware.js

@@ -23,6 +23,8 @@ var login_1 = require("./endpoints/login");
 var spaces_1 = require("./endpoints/spaces");
 var verify_1 = require("./endpoints/password/verify");
 var geetest_init_1 = require("./endpoints/geetestV3/geetest-init");
+var accept_invitation_1 = require("./endpoints/steedos/accept_invitation");
+var decline_invitation_1 = require("./endpoints/steedos/decline_invitation");
 var defaultOptions = {
     path: '/accounts',
 };
@@ -43,6 +45,8 @@ var accountsExpress = function (accountsServer, options) {
     router.get("".concat(path, "/user/spaces"), (0, user_loader_1.userLoader)(accountsServer), (0, spaces_1.getMySpaces)(accountsServer));
     router.get("".concat(path, "/settings"), (0, user_loader_1.userLoader)(accountsServer), (0, settings_1.getSettings)(accountsServer));
     router.get("".concat(path, "/tenant/:id"), (0, user_loader_1.userLoader)(accountsServer), (0, get_tenant_1.getTenant)(accountsServer));
+    router.post("".concat(path, "/acceptInvitation"), (0, user_loader_1.userLoader)(accountsServer), (0, accept_invitation_1.AcceptInvitation)(accountsServer));
+    router.post("".concat(path, "/declineInvitation"), (0, user_loader_1.userLoader)(accountsServer), (0, decline_invitation_1.DeclineInvitation)(accountsServer));
     router.post("".concat(path, "/refreshTokens"), (0, refresh_access_token_1.refreshAccessToken)(accountsServer));
     router.post("".concat(path, "/logout"), (0, user_loader_1.userLoader)(accountsServer), (0, logout_1.logout)(accountsServer));
     router.post("".concat(path, "/:service/authenticate"), (0, service_authenticate_1.serviceAuthenticate)(accountsServer));

package/lib/rest-express/express-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../../src/rest-express/express-middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../../src/rest-express/express-middleware.ts"],"names":[],"mappings":";;;AAAA,yEAAuE;AACvE,oDAAmF;AACnF,kEAA6G;AAE7G,4CAA8C;AAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEtC,yEAAsE;AACtE,iDAA+C;AAC/C,uDAAsD;AACtD,mDAAkD;AAClD,6CAA4C;AAC5C,yEAAuE;AACvE,6DAA2D;AAC3D,0DAAiE;AAEjE,wEAAsE;AACtE,6CAA2C;AAE3C,6DAA2D;AAE3D,yDAA2D;AAC3D,2DAA+D;AAC/D,2CAA0C;AAC1C,6CAAiD;AACjD,sDAAyE;AACzE,mEAAkF;AAClF,2EAAyE;AACzE,6EAA0E;AAE1E,IAAM,cAAc,GAA2B;IAC7C,IAAI,EAAE,WAAW;CAClB,CAAC;AAEF,IAAM,eAAe,GAAG,UACtB,cAA8B,EAC9B,OAAoC;IAApC,wBAAA,EAAA,YAAoC;IAEpC,OAAO,yCAAQ,cAAc,GAAK,OAAO,CAAE,CAAC;IACtC,IAAA,IAAI,GAAK,OAAO,KAAZ,CAAa;IAGvB,IAAI,IAAI,KAAK,GAAG,EAAE;QAChB,IAAI,GAAG,EAAE,CAAC;KACX;IAED,IAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,EAAE,CAAC;IACzD,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3B,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,iBAAc,EAAE,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAC,CAAC;IAEhE,MAAM,CAAC,GAAG,CAAC,UAAG,IAAI,eAAY,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,qBAAS,EAAC,cAAc,CAAC,CAAC,CAAC;IAEvF,MAAM,CAAC,GAAG,CAAC,UAAG,IAAI,UAAO,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,kBAAO,EAAC,cAAc,CAAC,CAAC,CAAC;IAChF,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,UAAO,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,kBAAO,EAAC,cAAc,CAAC,CAAC,CAAC;IACjF,MAAM,CAAC,GAAG,CAAC,UAAG,IAAI,UAAO,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,kCAAkB,EAAC,cAAc,CAAC,CAAC,CAAC;IAC3F,MAAM,CAAC,GAAG,CAAC,UAAG,IAAI,iBAAc,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,oBAAW,EAAC,cAAc,CAAC,CAAC,CAAC;IAE3F,MAAM,CAAC,GAAG,CAAC,UAAG,IAAI,cAAW,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,sBAAW,EAAC,cAAc,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,GAAG,CAAC,UAAG,IAAI,gBAAa,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,sBAAS,EAAC,cAAc,CAAC,CAAC,CAAC;IAExF,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,sBAAmB,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,oCAAgB,EAAC,cAAc,CAAC,CAAC,CAAC;IACtG,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,uBAAoB,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,sCAAiB,EAAC,cAAc,CAAC,CAAC,CAAC;IACxG,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,mBAAgB,EAAE,IAAA,yCAAkB,EAAC,cAAc,CAAC,CAAC,CAAC;IAEzE,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,YAAS,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC;IAElF,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,2BAAwB,EAAE,IAAA,0CAAmB,EAAC,cAAc,CAAC,CAAC,CAAC;IAElF,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,sBAAmB,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,8BAAa,EAAC,cAAc,CAAC,CAAC,CAAC;IAGnG,IAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;IAG9C,IAAI,QAAQ,CAAC,QAAQ,EAAE;QAGrB,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,oBAAiB,EAAE,IAAA,aAAK,EAAC,cAAc,CAAC,CAAC,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,uBAAoB,EAAE,IAAA,2BAAgB,EAAC,cAAc,CAAC,CAAC,CAAC;QAE3E,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,0BAAuB,EAAE,IAAA,0BAAW,EAAC,cAAc,CAAC,CAAC,CAAC;QAEzE,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,4BAAyB,EAAE,IAAA,qBAAa,EAAC,cAAc,CAAC,CAAC,CAAC;QAE7E,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,oCAAiC,EAAE,IAAA,oCAAqB,EAAC,cAAc,CAAC,CAAC,CAAC;QAE7F,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,mCAAgC,EAAC,+BAAgB,EAAE,IAAA,mCAAoB,EAAC,cAAc,CAAC,CAAC,CAAC;QAE5G,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,qCAAkC,EAAE,IAAA,8BAAsB,EAAC,cAAc,CAAC,CAAC,CAAC;QAE/F,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,2BAAwB,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,qBAAY,EAAC,cAAc,CAAC,CAAC,CAAC;QACvG,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,4BAAyB,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EAAE,IAAA,sBAAa,EAAC,cAAc,CAAC,CAAC,CAAC;QAEzG,MAAM,CAAC,IAAI,CAAC,UAAG,IAAI,0BAAuB,EAAE,IAAA,2BAAY,EAAC,cAAc,CAAC,CAAC,CAAC;QAE1E,MAAM,CAAC,IAAI,CACT,UAAG,IAAI,6BAA0B,EACjC,IAAA,wBAAU,EAAC,cAAc,CAAC,EAC1B,IAAA,gCAAc,EAAC,cAAc,CAAC,CAC/B,CAAC;KAEH;IAGD,IAAI,QAAQ,CAAC,KAAK,EAAE;QAClB,MAAM,CAAC,GAAG,CAAC,UAAG,IAAI,8BAA2B,EAAE,IAAA,oCAAgB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;KAC3F;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}

package/lib/server/accounts-server.js

@@ -434,7 +434,7 @@ var AccountsServer = (function () {
                         });
                         return [3, 4];
                     case 3: throw new Error("Session is no longer valid");
-                    case 4: return [3, 6];
+                    case 4: return [2, session];
                     case 5:
                         error_1 = _a.sent();
                         this.hooks.emit(server_hooks_1.ServerHooks.LogoutError, error_1);

package/lib/server/accounts-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"accounts-server.js","sourceRoot":"","sources":["../../src/server/accounts-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accounts-server.js","sourceRoot":"","sources":["../../src/server/accounts-server.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.6.1-beta.7",
+  "version": "2.6.2-beta.2",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -19,7 +19,7 @@
     "start": "tsc && cross-env NODE_ENV=development nodemon -w src -x ts-node steedos-server.ts",
     "cstart": "yarn build && yarn start",
     "server": "cross-env NODE_ENV=development nodemon -w src -x ts-node server.ts",
-    "build": "tsc",
+    "build": "rm -rf ./lib && tsc",
     "compile": "tsc",
     "pubNext": "npm publish --tag next --registry https://registry.npmjs.org"
   },
@@ -46,7 +46,6 @@
     "lodash": "^4.17.21",
     "mem": "^5.1.1",
     "mongodb": "^3.7.3",
-    "mongoose": "^5.12.13",
     "nodemailer": "^6.3.0",
     "pug": "^3.0.2",
     "request-ip": "^2.2.0",
@@ -56,20 +55,20 @@
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.6.1-beta.7",
-    "@steedos/meteor-bundle-runner": "2.6.1-beta.7",
-    "@steedos/objectql": "2.6.1-beta.7",
+    "@steedos/auth": "2.6.2-beta.2",
+    "@steedos/meteor-bundle-runner": "2.6.2-beta.2",
+    "@steedos/objectql": "2.6.2-beta.2",
     "@types/dotenv-flow": "^3.0.0",
     "@types/node": "12.6.8",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.1.0",
     "nodemon": "^2.0.19",
-    "steedos-server": "2.6.1-beta.7",
+    "steedos-server": "2.6.2-beta.2",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+  "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }

package/src/database-mongo/mongo.ts

@@ -6,7 +6,7 @@ import {
   Session,
   User,
 } from '../types';
-import { get, merge, trim, map } from 'lodash';
+import { get, merge, trim, map, find } from 'lodash';
 import { Collection, Db, ObjectId } from 'mongodb';
 
 import { AccountsMongoOptions, MongoUser } from './types';
@@ -931,8 +931,8 @@ export class Mongo implements DatabaseInterface {
   public async getMySpaces(userId: string): Promise<any | null> {
     const userSpaces: any = await this.db
       .collection("space_users")
-      .find({ user: userId })
-      .project({ space: 1 })
+      .find({ user: userId, invite_state: {$ne: "refused"} })
+      .project({ space: 1, user_accepted: 1, invite_state: 1 })
       .toArray();
     const spaceIds = map(userSpaces, "space");
     const spaces = await this.db
@@ -941,7 +941,24 @@ export class Mongo implements DatabaseInterface {
       .project({ name: 1 })
       .toArray();
 
-    return spaces;
+    return map(spaces, function(space) {
+      const spaceUser = find(userSpaces, (item)=>{
+        return item.space == space._id;
+      });
+      return {
+        ...space,
+        user_accepted: spaceUser.user_accepted,
+        invite_state: spaceUser.invite_state
+      }
+    });
+  }
+
+
+  public async getFirstSpace(): Promise<any | null> {
+    const space = await this.db
+      .collection("spaces")
+      .findOne()
+    return space;
   }
 
   public async updateMeteorSession(

package/src/index.ts

@@ -1,6 +1,5 @@
 import * as express from 'express';
 import * as path from 'path';
-import * as mongoose from 'mongoose';
 import * as mongodb from 'mongodb';
 import { AccountsServer, generateRandomToken } from './server';
 import { AccountsPassword } from './password';
@@ -10,7 +9,7 @@ import MongoDBInterface from './database-mongo';
 // import accountsSamlIdp from './saml-idp';
 import { userLoader } from './rest-express/user-loader';
 import { mongoUrl } from './db';
-import { getSteedosConfig, getSteedosSchema, getMongoFieldEncryptionConsts } from '@steedos/objectql'
+import { getSteedosConfig, getDataSource } from '@steedos/objectql'
 import { URL } from 'url';
 import * as bodyParser from 'body-parser';
 import { sendMail, sendSMS } from './core';
@@ -21,32 +20,24 @@ export { getMergedTenant } from './core';
 declare var WebApp;
 
 const config = getSteedosConfig();
+let accountsServer;
 
-function getAccountsServer() {
+export function getAccountsServer() {
+  return accountsServer;
+}
+
+export async function createAccountsServer() {
   let accountsConfig = config.tenant || {};
   let emailConfig = config.email || {};
   let tokenSecret = accountsConfig.tokenSecret || generateRandomToken();
   let accessTokenExpiresIn = accountsConfig.accessTokenExpiresIn || "90d";
   let refreshTokenExpiresIn = accountsConfig.refreshTokenExpiresIn || "7d";
   let mailSignname = emailConfig.signname || "华炎魔方";
+  const driver = getDataSource('default').adapter as any;
+  await driver.connect();
+  const client = driver.getClient();
 
-  if (process.env.STEEDOS_CSFLE_MASTER_KEY) {
-    const { keyVaultNamespace, getKMSProviders } = getMongoFieldEncryptionConsts();
-    const kmsProvider = getKMSProviders();
-    mongoose.connect(mongoUrl, {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-      monitorCommands: true,
-      autoEncryption: {
-        keyVaultNamespace: keyVaultNamespace,
-        kmsProviders: kmsProvider,
-        bypassAutoEncryption: true,
-      }
-    } as any);
-  } else {
-    mongoose.connect(mongoUrl, { useNewUrlParser: true, useUnifiedTopology: true });
-  }
-  const connection = mongoose.connection;
+  const connection = client.db();
 
   const rootUrl = process.env.ROOT_URL
     ? process.env.ROOT_URL
@@ -138,10 +129,11 @@ function getAccountsServer() {
   return accountsServer;
 }
 
-export const accountsServer = getAccountsServer()
 
 export async function getAccountsRouter(context) {
 
+  accountsServer = await createAccountsServer();
+
   const router = accountsExpress(accountsServer, {
     path: '/accounts',
   });

package/src/password/accounts-password.ts

@@ -691,6 +691,29 @@ export default class AccountsPassword implements AuthenticationService {
     return await this.passwordAuthenticator({email: email}, password);
   }
 
+  public async foundUser(user: string | LoginUserIdentity,){
+    const { username, email, id, mobile } = typeof user == 'string'
+    ? this.toMobileAndEmail({ user })
+    : this.toMobileAndEmail({ ...user });
+
+    let foundUser: any | null = null;
+
+    if (id) {
+      // this._validateLoginWithField('id', user);
+      foundUser = await this.db.findUserById(id);
+    } else if (username) {
+      // this._validateLoginWithField('username', user);
+      foundUser = await this.db.findUserByUsername(username);
+    } else if (mobile) {
+      // this._validateLoginWithField('username', user);
+      foundUser = await this.db.findUserByMobile(mobile);
+    } else if (email) {
+      // this._validateLoginWithField('email', user);
+      foundUser = await this.db.findUserByEmail(email);
+    }
+    return foundUser;
+  }
+
   public async passwordAuthenticator(
     user: string | LoginUserIdentity,
     password: PasswordType,
@@ -754,8 +777,13 @@ export default class AccountsPassword implements AuthenticationService {
     if (!isPasswordValid) {
       if(!saas){
         const userProfile = await this.getUserProfile(foundUser.id);
-
-        await this.db.updateUser(foundUser.id, {$inc: {login_failed_number: 1}});
+        const login_failed_lockout_time = foundUser.login_failed_lockout_time;
+        // 重置密码错误次数
+        if(userProfile.lockout_interval !=0 && moment(login_failed_lockout_time).isBefore(new Date())){
+          await this.db.updateUser(foundUser.id, {$set: {login_failed_number: 1}});
+        }else{
+          await this.db.updateUser(foundUser.id, {$inc: {login_failed_number: 1}});
+        }
 
         const user: any = await this.db.findUserById(foundUser.id);
         if(user.login_failed_number >= userProfile.max_login_attempts){

package/src/rest-express/endpoints/login.ts

@@ -1,20 +1,32 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:35:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-09-18 17:57:53
+ * @Description: 
+ */
 import * as express from 'express';
 import * as requestIp from 'request-ip';
 import { AccountsServer, generateRandomToken } from '../../server';
 import { getUserAgent } from '../utils/get-user-agent';
 import { sendError } from '../utils/send-error';
 import { setAuthCookies } from '../utils/steedos-auth';
+import isMobile from 'ismobilejs';
+import { getObject } from '@steedos/objectql';
+import { db } from '../../db';
+import { getFirstSpace } from './spaces';
 
 export const login = (accountsServer: AccountsServer) => async (
   req: express.Request,
   res: express.Response
 ) => {
-
+  let userAgent = getUserAgent(req) || '';
+  const ip = requestIp.getClientIp(req);
+  let status = 'success';
+  let message = '';
+  let result: any = null;
   try {
-    let userAgent = getUserAgent(req) || '';
-    const ip = requestIp.getClientIp(req);
-    
-    const result: any = await accountsServer.loginWithService('password', req.body, {
+    result = await accountsServer.loginWithService('password', req.body, {
       ip,
       userAgent
     });
@@ -34,6 +46,53 @@ export const login = (accountsServer: AccountsServer) => async (
     return;
   } catch (err) {
     console.log(err)
+    status = 'fail';
+    message = err.message;
     sendError(res, {message: err.message});
+  } finally {
+      let is_phone = false;
+      let is_tablet = false;
+      if (userAgent) {
+        try {
+          const { phone, tablet } = isMobile(userAgent);
+          is_phone = phone;
+          is_tablet = tablet;
+        } catch (Exception) {
+          console.log(`Exception`, Exception);
+        }
+      }
+      const space = await getFirstSpace(accountsServer);
+
+      let remote_user = null;
+      if(!result){
+        let foundUser: any | null = await accountsServer.getServices()["password"].foundUser(req.body.user);
+        remote_user = foundUser?foundUser._id:null
+      }else{
+        remote_user = result?.user?._id
+      }
+
+      if(space){
+        // 记录登录日志, 不记录密码.
+        const { password, ...data} = req.body;
+        await getObject('operation_logs').insert({
+          name: '登录',
+          type: 'login',
+          remote_user: remote_user,
+          remote_addr: ip,
+          http_user_agent: userAgent,
+          is_mobile: is_phone,
+          is_tablet,
+          object: 'users',
+          status: status,
+          create: new Date(),
+          space: space._id,
+          message: message,
+          data: JSON.stringify(data),
+          related_to: {
+            o: "users",
+            ids: [remote_user]
+          }
+        })
+      }
   }
 }

package/src/rest-express/endpoints/logout.ts

@@ -1,9 +1,19 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:35:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-09-19 09:23:20
+ * @Description: 
+ */
 import * as express from 'express';
 import { get, isEmpty, map } from 'lodash';
 import { AccountsServer } from '../../server';
 import { sendError } from '../utils/send-error';
 import { clearAuthCookies } from '../utils/steedos-auth';
-
+import { getObject } from '@steedos/objectql';
+import * as requestIp from 'request-ip';
+import { getUserAgent } from '../utils/get-user-agent';
+import isMobile from 'ismobilejs';
 export const logout = (accountsServer: AccountsServer) => async (
   req: express.Request,
   res: express.Response
@@ -18,10 +28,49 @@ export const logout = (accountsServer: AccountsServer) => async (
   authToken = authToken && authToken.split(',').length >1?authToken.split(',')[0]:authToken;
 
   clearAuthCookies(req, res);
+  let session = null;
   try {
-    await accountsServer.logout(authToken);
+    session = await accountsServer.logout(authToken);
   } catch (err) {
     //sendError(res, err);
+  }finally{
+    let userAgent = getUserAgent(req) || '';
+    const ip = requestIp.getClientIp(req);
+    let status = 'success';
+    let message = '';
+    let is_phone = false;
+    let is_tablet = false;
+    if (userAgent) {
+      try {
+        const { phone, tablet } = isMobile(userAgent);
+        is_phone = phone;
+        is_tablet = tablet;
+      } catch (Exception) {
+        console.log(`Exception`, Exception);
+      }
+    }
+    await getObject('operation_logs').insert({
+      name: '注销',
+      type: 'logout',
+      remote_user: session?.userId,
+      remote_addr: ip,
+      http_user_agent: userAgent,
+      is_mobile: is_phone,
+      is_tablet,
+      object: 'users',
+      status: status,
+      create: new Date(),
+      space: session?.space,
+      message: message,
+      data: JSON.stringify({
+        authToken: authToken,
+        session: session
+      }),
+      related_to: {
+        o: "users",
+        ids: [session?.userId]
+      }
+    })
   }
   res.json(null);
 };