@steedos/accounts 3.0.0-beta.36 → 3.0.0-beta.37

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/user-loader.ts

@@ -1,71 +1,81 @@
-import * as express from 'express';
-import { get, isEmpty, map } from 'lodash';
-import { AccountsServer } from '../server';
-import { db } from '../db';
-import { getSteedosConfig } from '@steedos/objectql';
-import { getSteedosService } from '../core'
+import * as express from "express";
+import { get, isEmpty, map } from "lodash";
+import { AccountsServer } from "../server";
+import { db } from "../db";
+import { getSteedosConfig } from "@steedos/objectql";
+import { getSteedosService } from "../core";
 const config = getSteedosConfig();
 
-export const userLoader = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response,
-  next: any
-) => {
-  let authToken =
-    get(req.cookies, 'X-Auth-Token') ||
-    get(req.headers, 'Authorization') ||
-    get(req.headers, 'authorization');
+export const userLoader =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response, next: any) => {
+    let authToken =
+      get(req.cookies, "X-Auth-Token") ||
+      get(req.headers, "Authorization") ||
+      get(req.headers, "authorization");
 
-  authToken = authToken && authToken.replace('Bearer ', '').replace('BEARER ', '');
-  authToken = authToken && authToken.split(',').length >1?authToken.split(',')[0]:authToken;
+    authToken =
+      authToken && authToken.replace("Bearer ", "").replace("BEARER ", "");
+    authToken =
+      authToken && authToken.split(",").length > 1
+        ? authToken.split(",")[0]
+        : authToken;
 
-  if (!isEmpty(authToken)) {
-    try {
-      (req as any).authToken = authToken;
-      const user: any = await accountsServer.resumeSession(authToken);
-      user.id = user._id;
-      user.userId = user._id;
-      if(user.emails && user.emails.length > 0){
-        user.email = user.emails[0].address;
-      }
-      (req as any).user = user;
-      (req as any).userId = user.id;
-      const spaces = [];
-
-      const userSpaces = await db.find("space_users", {
-        filters: [["user", "=", user.id],["user_accepted", "=", true]],
-        fields: ["space"],
+    if (!isEmpty(authToken)) {
+      try {
+        (req as any).authToken = authToken;
+        const user: any = await accountsServer.resumeSession(authToken);
+        user.id = user._id;
+        user.userId = user._id;
+        if (user.emails && user.emails.length > 0) {
+          user.email = user.emails[0].address;
+        }
+        (req as any).user = user;
+        (req as any).userId = user.id;
+        const spaces = [];
 
-      });
+        const userSpaces = await db.find("space_users", {
+          filters: [
+            ["user", "=", user.id],
+            ["user_accepted", "=", true],
+          ],
+          fields: ["space"],
+        });
 
-      let steedosService = getSteedosService();
+        let steedosService = getSteedosService();
 
-      if(userSpaces && userSpaces.length > 0){
-        const dbSpaces = await db.find('spaces', {
-          filters: [['_id', 'in', map(userSpaces, 'space')]],
-          fields: ["_id", "name", "avatar", "avatar_dark"]
-        });
+        if (userSpaces && userSpaces.length > 0) {
+          const dbSpaces = await db.find("spaces", {
+            filters: [["_id", "in", map(userSpaces, "space")]],
+            fields: ["_id", "name", "avatar", "avatar_dark"],
+          });
 
-        for (let space of dbSpaces) {
-          let logo_url = '';
-          if(steedosService){
-            if (space.avatar_dark) {
-              logo_url = steedosService + "api/files/avatars/" + space.avatar_dark
-            } else if (space.avatar) {
-              logo_url = steedosService + "api/files/avatars/" + space.avatar
+          for (let space of dbSpaces) {
+            let logo_url = "";
+            if (steedosService) {
+              if (space.avatar_dark) {
+                logo_url =
+                  steedosService +
+                  "api/v6/files/cfs.avatars.filerecord/" +
+                  space.avatar_dark;
+              } else if (space.avatar) {
+                logo_url =
+                  steedosService +
+                  "api/v6/files/cfs.avatars.filerecord/" +
+                  space.avatar;
+              }
             }
+            spaces.push({
+              _id: space._id,
+              name: space.name,
+              logo_url,
+            });
           }
-          spaces.push({
-            _id: space._id,
-            name: space.name,
-            logo_url
-          })
         }
+        (req as any).user.spaces = spaces;
+      } catch (e) {
+        console.log(e);
       }
-      (req as any).user.spaces = spaces
-    } catch (e) {
-      console.log(e);
     }
-  }
-  return next();
-};
+    return next();
+  };