@steedos/accounts 3.0.0-beta.15 → 3.0.0-beta.151

package/src/rest-express/endpoints/service-authenticate.ts

@@ -1,76 +1,95 @@
-import * as express from 'express';
-import * as requestIp from 'request-ip';
-import { AccountsServer } from '../../server';
-import { getUserAgent } from '../utils/get-user-agent';
-import { sendError } from '../utils/send-error';
-import { setAuthCookies, hashStampedToken } from '../utils/steedos-auth';
-import { db } from '../../db';
-import * as _ from 'lodash';
-import { getUserSpace } from '../utils/users'
+import * as express from "express";
+import { getClientIp } from "../utils/getClientIp";
+import { AccountsServer } from "../../server";
+import { getUserAgent } from "../utils/get-user-agent";
+import { sendError } from "../utils/send-error";
+import { setAuthCookies, hashStampedToken } from "../utils/steedos-auth";
+import { db } from "../../db";
+import * as _ from "lodash";
+import { getUserSpace } from "../utils/users";
 
-export const serviceAuthenticate = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response
-) => {
-  try {
-    const serviceName = req.params.service;
-    let userAgent = getUserAgent(req) || '';
-    const ip = requestIp.getClientIp(req);
-    const email = req.body.user.email;
-    const spaceId = req.body.spaceId;
-    let services: any = accountsServer.getServices();
-    let db = services[serviceName].db;
+export const serviceAuthenticate =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    try {
+      const serviceName = req.params.service;
+      let userAgent = getUserAgent(req) || "";
+      const ip = getClientIp(req);
+      const email = req.body.user.email;
+      const spaceId = req.body.spaceId;
+      let services: any = accountsServer.getServices();
+      let db = services[serviceName].db;
 
-    if(email && email.indexOf("@") < 0){
-      req.body.user.username = email
-    }
+      if (email && email.indexOf("@") < 0) {
+        req.body.user.username = email;
+      }
 
-    const loggedInUser: any = await accountsServer.loginWithService(serviceName, req.body, {
-      ip,
-      userAgent
-    });
+      const loggedInUser: any = await accountsServer.loginWithService(
+        serviceName,
+        req.body,
+        {
+          ip,
+          userAgent,
+        },
+      );
 
-    //获取user session
-    let session:any = await accountsServer.findSessionByAccessToken(loggedInUser.tokens.accessToken)
+      //获取user session
+      let session: any = await accountsServer.findSessionByAccessToken(
+        loggedInUser.tokens.accessToken,
+      );
 
-    //获取用户有效的工作区Id，并且写入Sessions中
-    let validSpaceId = await getUserSpace(session.userId, spaceId);
-    if(validSpaceId){
-      userAgent = `${userAgent} Space/${validSpaceId}`
-      db.updateSession(loggedInUser.sessionId, {
-        ip,
-        userAgent});
-    }
+      //获取用户有效的工作区Id，并且写入Sessions中
+      let validSpaceId = await getUserSpace(session.userId, spaceId);
+      if (validSpaceId) {
+        userAgent = `${userAgent} Space/${validSpaceId}`;
+        db.updateSession(loggedInUser.sessionId, {
+          ip,
+          userAgent,
+        });
+      }
 
-    //确认用户密码是否过期
-    let user = await db.collection.findOne({_id: session.userId}, { password_expired: 1 })
+      //确认用户密码是否过期
+      let user = await db.collection.findOne(
+        { _id: session.userId },
+        { password_expired: 1 },
+      );
 
-    //创建Meteor token
-    let authToken = null;
-    let stampedAuthToken = {
-      token: session.token,
-      when: new Date
-    };
-    authToken = stampedAuthToken.token;
-    let hashedToken = hashStampedToken(stampedAuthToken);
-    let _user = await db.collection.findOne({_id: session.userId}, { services:1 })
-    if(!_user['services']){
-      _user['services'] = {}
-    }
-    if (!_user['services']['resume']) {
-      _user['services']['resume'] = {loginTokens: []}
-    }
-    if (!_user['services']['resume']['loginTokens']) {
-      _user['services']['resume']['loginTokens'] = [];
-    }
-    _user['services']['resume']['loginTokens'].push(hashedToken)
-    let data = { services: _user['services'] }
-    await db.collection.updateOne({_id: session.userId}, {$set: data});
-    // 设置cookies
-    setAuthCookies(req, res, session.userId, authToken, loggedInUser.tokens.accessToken, validSpaceId);
+      //创建Meteor token
+      let authToken = null;
+      let stampedAuthToken = {
+        token: session.token,
+        when: new Date(),
+      };
+      authToken = stampedAuthToken.token;
+      let hashedToken = hashStampedToken(stampedAuthToken);
+      let _user = await db.collection.findOne(
+        { _id: session.userId },
+        { services: 1 },
+      );
+      if (!_user["services"]) {
+        _user["services"] = {};
+      }
+      if (!_user["services"]["resume"]) {
+        _user["services"]["resume"] = { loginTokens: [] };
+      }
+      if (!_user["services"]["resume"]["loginTokens"]) {
+        _user["services"]["resume"]["loginTokens"] = [];
+      }
+      _user["services"]["resume"]["loginTokens"].push(hashedToken);
+      let data = { services: _user["services"] };
+      await db.collection.updateOne({ _id: session.userId }, { $set: data });
+      // 设置cookies
+      setAuthCookies(
+        req,
+        res,
+        session.userId,
+        authToken,
+        loggedInUser.tokens.accessToken,
+        validSpaceId,
+      );
 
-    res.json(loggedInUser);
-  } catch (err) {
-    sendError(res, err);
-  }
-};
+      res.json(loggedInUser);
+    } catch (err) {
+      sendError(res, err);
+    }
+  };

package/src/rest-express/endpoints/steedos/get-tenant.ts

@@ -1,44 +1,62 @@
-import * as express from 'express';
-import { AccountsServer } from '../../../server';
-import { sendError } from '../../utils/send-error';
-import { getSteedosConfig } from '@steedos/objectql'
-import { db } from '../../../db';
-import {getSteedosService } from '../../../core'
+import * as express from "express";
+import { AccountsServer } from "../../../server";
+import { sendError } from "../../utils/send-error";
+import { getSteedosConfig } from "@steedos/objectql";
+import { db } from "../../../db";
+import { getSteedosService } from "../../../core";
 
-export const getTenant = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response
-) => {
-  try {
+export const getTenant =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    try {
+      const spaceId = req.params.id;
+      if (!spaceId) throw new Error("accounts.tenant_id_required");
 
-    const spaceId = req.params.id;
-    if (!spaceId)
-      throw new Error("accounts.tenant_id_required")
-    
-    const spaceDoc = await db.findOne("spaces", spaceId, {fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo"]})
-
-    if(!spaceDoc){
-      return res.send({
-          exists: false
+      const spaceDoc = await db.findOne("spaces", spaceId, {
+        fields: [
+          "name",
+          "avatar",
+          "avatar_dark",
+          "background",
+          "enable_register",
+          "account_logo",
+        ],
       });
-    }
-    
-    let steedosService = getSteedosService();
 
-    if (steedosService) {
-      if (spaceDoc.account_logo) {
-        spaceDoc.logo_url = steedosService + "api/files/avatars/" + spaceDoc.account_logo
-      } else if (spaceDoc.avatar_dark) {
-        spaceDoc.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar_dark
-      } else if (spaceDoc.avatar) {
-        spaceDoc.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar
-      } 
-      if (spaceDoc.background) {
-        spaceDoc.background_url = steedosService + "api/files/avatars/" + spaceDoc.background
+      if (!spaceDoc) {
+        return res.send({
+          exists: false,
+        });
+      }
+
+      let steedosService = getSteedosService();
+
+      if (steedosService) {
+        if (spaceDoc.account_logo) {
+          spaceDoc.logo_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.account_logo;
+        } else if (spaceDoc.avatar_dark) {
+          spaceDoc.logo_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.avatar_dark;
+        } else if (spaceDoc.avatar) {
+          spaceDoc.logo_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.avatar;
+        }
+        if (spaceDoc.background) {
+          spaceDoc.background_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.background;
+        }
       }
+      res.json(spaceDoc);
+    } catch (err) {
+      sendError(res, err);
     }
-    res.json(spaceDoc);
-  } catch (err) {
-    sendError(res, err);
-  }
-};
+  };

package/src/rest-express/endpoints/steedos/settings.ts

@@ -3,110 +3,139 @@
  * @Date: 2022-03-28 09:35:34
  * @LastEditors: baozhoutao@steedos.com
  * @LastEditTime: 2025-02-21 14:33:10
- * @Description: 
+ * @Description:
  */
-import * as express from 'express';
-import * as _ from 'lodash';
-import { AccountsServer } from '../../../server';
-import { getSteedosConfig, getSteedosSchema } from '@steedos/objectql'
-import { db } from '../../../db';
-import { canSendEmail, canSendSMS, getSteedosService } from '../../../core';
-const validator = require('validator');
-const util = require('@steedos/utils')
-const clone = require('clone');
+import * as express from "express";
+import * as _ from "lodash";
+import { AccountsServer } from "../../../server";
+import { getSteedosConfig, getSteedosSchema } from "@steedos/objectql";
+import { db } from "../../../db";
+import { canSendEmail, canSendSMS, getSteedosService } from "../../../core";
+const validator = require("validator");
+const util = require("@steedos/utils");
+const clone = require("clone");
 
 const config = getSteedosConfig();
 
-export const getSettings = (accountsServer: AccountsServer) => async (
-    req: express.Request,
-    res: express.Response
-  ) => {
-  let tenant: any = {
-    name: "Steedos",
-    logo_url: undefined,
-    background_url: undefined,
-    enable_create_tenant: true,
-    enable_register: true,
-    enable_forget_password: true,
-    enable_password_login: true,
-    enable_mobile_code_login: false,
-    enable_email_code_login: false,
-    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'),
-    page_login: process.env.STEEDOS_TENANT_PAGE_LOGIN,
-    page_logout: process.env.STEEDOS_TENANT_PAGE_LOGOUT
-  }
+export const getSettings =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    let tenant: any = {
+      name: "Steedos",
+      logo_url: undefined,
+      background_url: undefined,
+      enable_create_tenant: true,
+      enable_register: true,
+      enable_forget_password: true,
+      enable_password_login: true,
+      enable_mobile_code_login: false,
+      enable_email_code_login: false,
+      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",
+      ),
+      page_login: process.env.STEEDOS_TENANT_PAGE_LOGIN,
+      page_logout: process.env.STEEDOS_TENANT_PAGE_LOGOUT,
+    };
 
-  if (config.tenant) {
-    _.assignIn(tenant, config.tenant)
-  }
+    if (config.tenant) {
+      _.assignIn(tenant, config.tenant);
+    }
 
-  if(!tenant._id){
-    tenant._id = process.env.STEEDOS_TENANT_ID
-  }
+    if (!tenant._id) {
+      tenant._id = process.env.STEEDOS_TENANT_ID;
+    }
 
-  const platform = (global as any).Steedos.settings.public?.platform || {}
-  
+    const platform = (global as any).Steedos.settings.public?.platform || {};
 
-  if (tenant._id) {
-    let spaceDoc = await db.findOne("spaces", tenant._id, {fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo", "favicon"]})
-    let steedosService = getSteedosService();
-    if (steedosService && spaceDoc) {
+    if (tenant._id) {
+      let spaceDoc = await db.findOne("spaces", tenant._id, {
+        fields: [
+          "name",
+          "avatar",
+          "avatar_dark",
+          "background",
+          "enable_register",
+          "account_logo",
+          "favicon",
+        ],
+      });
+      let steedosService = getSteedosService();
+      if (steedosService && spaceDoc) {
         _.assignIn(tenant, spaceDoc);
-      if (spaceDoc.account_logo) {
-        tenant.logo_url = steedosService + "api/files/avatars/" + spaceDoc.account_logo
-      } else if (spaceDoc.avatar_dark) {
-        tenant.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar_dark
-      } else if (spaceDoc.avatar) {
-        tenant.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar
-      } 
-      if (spaceDoc.background) {
-        tenant.background_url = steedosService + "api/files/avatars/" + spaceDoc.background
-      }
-      if (platform?.is_oem && spaceDoc.favicon){
-        tenant.favicon_url = steedosService + "api/files/avatars/" + spaceDoc.favicon
+        if (spaceDoc.account_logo) {
+          tenant.logo_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.account_logo;
+        } else if (spaceDoc.avatar_dark) {
+          tenant.logo_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.avatar_dark;
+        } else if (spaceDoc.avatar) {
+          tenant.logo_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.avatar;
+        }
+        if (spaceDoc.background) {
+          tenant.background_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.background;
+        }
+        if (platform?.is_oem && spaceDoc.favicon) {
+          tenant.favicon_url =
+            steedosService +
+            "api/v6/files/cfs.avatars.filerecord/" +
+            spaceDoc.favicon;
+        }
       }
     }
-  }
-
-  let already_mail_service = canSendEmail();
-  let already_sms_service = true || canSendSMS();
 
-  //allowInit
-  const broker = getSteedosSchema().broker;
-  const serverInitInfo = {
-    
-  };
+    let already_mail_service = canSendEmail();
+    let already_sms_service = true || canSendSMS();
 
-  const _tenant = clone(tenant);
+    //allowInit
+    const broker = getSteedosSchema().broker;
+    const serverInitInfo = {};
 
-  delete _tenant['tokenSecret'];
-  delete _tenant['accessTokenExpiresIn']
-  delete _tenant['refreshTokenExpiresIn']
+    const _tenant = clone(tenant);
 
-  if(tenant.enable_saas){
-    delete _tenant._id;
-  }
+    delete _tenant["tokenSecret"];
+    delete _tenant["accessTokenExpiresIn"];
+    delete _tenant["refreshTokenExpiresIn"];
 
+    if (tenant.enable_saas) {
+      delete _tenant._id;
+    }
 
-  let settings = {};
+    let settings = {};
 
-  if(tenant._id){
-    settings = await util.getSettings(tenant._id, true)
-  }
+    if (tenant._id) {
+      settings = await util.getSettings(tenant._id, true);
+    }
 
-  res.json({
-    tenant: _tenant,
-    password: config.password ? config.password : ( config.public?.password ? config.public?.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,
-    platform: platform,
-    public: (global as any).Steedos.settings.public || {},
-    settings: settings
-  })
-}
+    res.json({
+      tenant: _tenant,
+      password: config.password
+        ? config.password
+        : config.public?.password
+          ? config.public?.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,
+      platform: platform,
+      public: (global as any).Steedos.settings.public || {},
+      settings: settings,
+    });
+  };

package/src/rest-express/endpoints/update-session.ts

@@ -1,46 +1,54 @@
-import * as express from 'express';
-import * as requestIp from 'request-ip';
-import { AccountsServer } from '../../server';
-import { getUserAgent } from '../utils/get-user-agent';
-import { sendError } from '../utils/send-error';
-import { setAuthCookies, getAuthTokenCookie } from '../utils/steedos-auth';
-import { db } from '../../db';
-import { getUserSpace } from '../utils/users'
-import * as _ from 'lodash';
+import * as express from "express";
+import { getClientIp } from "../utils/getClientIp";
+import { AccountsServer } from "../../server";
+import { getUserAgent } from "../utils/get-user-agent";
+import { sendError } from "../utils/send-error";
+import { setAuthCookies, getAuthTokenCookie } from "../utils/steedos-auth";
+import { db } from "../../db";
+import { getUserSpace } from "../utils/users";
+import * as _ from "lodash";
 
-export const updateSession = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response
-) => {
-  try {
-    const userId = (req as any).user._id;
-    const serviceName = req.params.service;
-    let userAgent = getUserAgent(req) || '';
-    const ip = requestIp.getClientIp(req);
-    let services: any = accountsServer.getServices();
-    let db = services[serviceName].db;
-    const spaceId = req.body.spaceId;
-    let accessToken = req.body.accessToken;
-    let session:any = await accountsServer.findSessionByAccessToken(accessToken)
+export const updateSession =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    try {
+      const userId = (req as any).user._id;
+      const serviceName = req.params.service;
+      let userAgent = getUserAgent(req) || "";
+      const ip = getClientIp(req);
+      let services: any = accountsServer.getServices();
+      let db = services[serviceName].db;
+      const spaceId = req.body.spaceId;
+      let accessToken = req.body.accessToken;
+      let session: any =
+        await accountsServer.findSessionByAccessToken(accessToken);
 
-    if(!session){
-      throw new Error('Invalid accessToken');
-    }
+      if (!session) {
+        throw new Error("Invalid accessToken");
+      }
 
-    //获取用户有效的工作区Id，并且写入Sessions中
-    let validSpaceId = await getUserSpace(userId, spaceId);
-    if(validSpaceId){
-      userAgent = `${userAgent} Space/${validSpaceId}`
-      db.updateSession(session.id, {
-        ip,
-        userAgent});
-    }
-    
-    // 设置cookies
-    setAuthCookies(req, res, session.userId, getAuthTokenCookie(req, res), accessToken, validSpaceId);
+      //获取用户有效的工作区Id，并且写入Sessions中
+      let validSpaceId = await getUserSpace(userId, spaceId);
+      if (validSpaceId) {
+        userAgent = `${userAgent} Space/${validSpaceId}`;
+        db.updateSession(session.id, {
+          ip,
+          userAgent,
+        });
+      }
 
-    res.json({});
-  } catch (err) {
-    sendError(res, err);
-  }
-};
+      // 设置cookies
+      setAuthCookies(
+        req,
+        res,
+        session.userId,
+        getAuthTokenCookie(req, res),
+        accessToken,
+        validSpaceId,
+      );
+
+      res.json({});
+    } catch (err) {
+      sendError(res, err);
+    }
+  };