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

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

@@ -3,80 +3,82 @@
  * @Date: 2022-03-28 09:35:34
  * @LastEditors: baozhoutao@steedos.com
  * @LastEditTime: 2024-01-23 14:24:35
- * @Description: 
+ * @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';
-import { getSteedosSchema } from '@steedos/objectql'
-export const logout = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response
-) => { 
-  
-  let authToken =
-    get(req.cookies, 'X-Auth-Token') ||
-    get(req.headers, 'Authorization') ||
-    get(req.headers, 'authorization');
+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 { getClientIp } from "../utils/getClientIp";
+import { getUserAgent } from "../utils/get-user-agent";
+import isMobile from "ismobilejs";
+import { getSteedosSchema } from "@steedos/objectql";
+export const logout =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    let authToken =
+      get(req.cookies, "X-Auth-Token") ||
+      get(req.headers, "Authorization") ||
+      get(req.headers, "authorization");
 
-  authToken = authToken && authToken.replace('Bearer ', 'token');
-  authToken = authToken && authToken.split(',').length >1?authToken.split(',')[0]:authToken;
+    authToken = authToken && authToken.replace("Bearer ", "token");
+    authToken =
+      authToken && authToken.split(",").length > 1
+        ? authToken.split(",")[0]
+        : authToken;
 
-  clearAuthCookies(req, res);
-  let session = null;
-  try {
-    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);
+    clearAuthCookies(req, res);
+    let session = null;
+    try {
+      session = await accountsServer.logout(authToken);
+    } catch (err) {
+      //sendError(res, err);
+    } finally {
+      let userAgent = getUserAgent(req) || "";
+      const ip = 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]
+      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],
+        },
+      });
+      if (authToken) {
+        const broker = getSteedosSchema().broker;
+        broker.broadcast("$user.logout", {
+          authToken: authToken,
+        });
       }
-    });
-
-    const broker = getSteedosSchema().broker;
-    broker.broadcast("$user.logout", {
-      authToken: authToken
-    });
-  }
-  res.json(null);
-};
+    }
+    res.json(null);
+  };

package/src/rest-express/endpoints/oauth/provider-callback.ts

@@ -1,46 +1,53 @@
-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 { AccountsExpressOptions } from '../../types';
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2025-02-17 09:39:59
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-09-12 14:29:52
+ * @FilePath: /steedos-platform-3.0/packages/accounts/src/rest-express/endpoints/oauth/provider-callback.ts
+ * @Description:
+ */
+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 { AccountsExpressOptions } from "../../types";
 
 interface RequestWithSession extends express.Request {
   session: any;
 }
 
-export const providerCallback = (
-  accountsServer: AccountsServer,
-  options?: AccountsExpressOptions
-) => async (req: express.Request, res: express.Response) => {
-  try {
-    const userAgent = getUserAgent(req);
-    const ip = requestIp.getClientIp(req);
-    const loggedInUser = await accountsServer.loginWithService(
-      'oauth',
-      {
-        ...(req.params || {}),
-        ...(req.query || {}),
-        ...(req.body || {}),
-        ...((req as RequestWithSession).session || {}),
-      },
-      { ip, userAgent }
-    );
+export const providerCallback =
+  (accountsServer: AccountsServer, options?: AccountsExpressOptions) =>
+  async (req: express.Request, res: express.Response) => {
+    try {
+      const userAgent = getUserAgent(req);
+      const ip = getClientIp(req);
+      const loggedInUser = await accountsServer.loginWithService(
+        "oauth",
+        {
+          ...(req.params || {}),
+          ...(req.query || {}),
+          ...(req.body || {}),
+          ...((req as RequestWithSession).session || {}),
+        },
+        { ip, userAgent },
+      );
 
-    if (options && options.onOAuthSuccess) {
-      options.onOAuthSuccess(req, res, loggedInUser);
-    }
+      if (options && options.onOAuthSuccess) {
+        options.onOAuthSuccess(req, res, loggedInUser);
+      }
 
-    if (options && options.transformOAuthResponse) {
-      res.json(options.transformOAuthResponse(loggedInUser));
-    } else {
-      res.json(loggedInUser);
-    }
-  } catch (err) {
-    if (options && options.onOAuthError) {
-      options.onOAuthError(req, res, err);
-    }
+      if (options && options.transformOAuthResponse) {
+        res.json(options.transformOAuthResponse(loggedInUser));
+      } else {
+        res.json(loggedInUser);
+      }
+    } catch (err) {
+      if (options && options.onOAuthError) {
+        options.onOAuthError(req, res, err);
+      }
 
-    sendError(res, err);
-  }
-};
+      sendError(res, err);
+    }
+  };

package/src/rest-express/endpoints/password/change-password.ts

@@ -1,103 +1,114 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-19 11:38:30
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-09-18 17:58:22
- * @Description: 
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-09-12 14:29:58
+ * @Description:
  */
-import * as express from 'express';
-import { AccountsServer } from '../../../server';
-import { sendError } from '../../utils/send-error';
-import { getSteedosConfig, getObject } from '@steedos/objectql'
-import { hashPassword } from '../../../password/utils';
+import * as express from "express";
+import { AccountsServer } from "../../../server";
+import { sendError } from "../../utils/send-error";
+import { getSteedosConfig, getObject } from "@steedos/objectql";
+import { hashPassword } from "../../../password/utils";
 
-import * as requestIp from 'request-ip';
-import { getUserAgent } from '../../utils/get-user-agent';
+import { getClientIp } from "../../utils/getClientIp";
+import { getUserAgent } from "../../utils/get-user-agent";
 import isMobile from "ismobilejs";
-import { db } from '../../../db';
+import { db } from "../../../db";
 
 const config = getSteedosConfig();
 declare var Creator;
 
-export const changePassword = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response
-) => {
-  try {
-    if (!(req as any).userId) {
-      res.status(401);
-      res.json({ message: 'Unauthorized' });
-      return;
-    }
-    // oldPassword 、newPassword 已经是 sha256之后的
-    const { oldPassword, newPassword } = req.body;
+export const changePassword =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    try {
+      if (!(req as any).userId) {
+        res.status(401);
+        res.json({ message: "Unauthorized" });
+        return;
+      }
+      // oldPassword 、newPassword 已经是 sha256之后的
+      const { oldPassword, newPassword } = req.body;
 
-    // let passworPolicy = ((config as any).password || {}).policy
+      // let passworPolicy = ((config as any).password || {}).policy
 
-    // if(passworPolicy){
-    //   if(!(new RegExp(passworPolicy)).test(newPassword || '')){
-    //       sendError(res, new Error((config as any).password.policyError));
-    //       return;
-    //   }
-    // }
-    
-    const password: any = accountsServer.getServices().password;
+      // if(passworPolicy){
+      //   if(!(new RegExp(passworPolicy)).test(newPassword || '')){
+      //       sendError(res, new Error((config as any).password.policyError));
+      //       return;
+      //   }
+      // }
 
-    await password.changePassword((req as any).userId, oldPassword, newPassword);
-    password.db.collection.updateOne({_id: (req as any).userId}, {$set: {password_expired: false}})
-    try {
-      Creator.getCollection('space_users').update({user: (req as any).userId}, {$set: {password_expired: false}}, {
-        multi: true
-      })
+      const password: any = accountsServer.getServices().password;
+
+      await password.changePassword(
+        (req as any).userId,
+        oldPassword,
+        newPassword,
+      );
+      password.db.collection.updateOne(
+        { _id: (req as any).userId },
+        { $set: { password_expired: false } },
+      );
+      try {
+        await db.updateMany(
+          "space_users",
+          [["user", "=", (req as any).userId]],
+          { password_expired: false },
+        );
 
-      const userAgent = getUserAgent(req);
-      const ip = requestIp.getClientIp(req);
-      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 userAgent = getUserAgent(req);
+        const ip = getClientIp(req);
+        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 userSpaces = await db.find("space_users", {
-        filters: [["user", "=", (req as any).userId],["user_accepted", "=", true]],
-        fields: ["space"],
-      });
+        const userSpaces = await db.find("space_users", {
+          filters: [
+            ["user", "=", (req as any).userId],
+            ["user_accepted", "=", true],
+          ],
+          fields: ["space"],
+        });
 
-      if(userSpaces && userSpaces.length > 0){
-        for (let userSpace of userSpaces) {
-          const userId = (req as any).userId
-          await getObject('operation_logs').insert({
-            name: '修改密码',
-            type: 'change_password',
-            remote_user: userId,
-            remote_addr: ip,
-            http_user_agent: userAgent,
-            is_mobile: is_phone,
-            is_tablet,
-            object: 'users',
-            status: 'success',
-            create: new Date(),
-            create_by: userId,
-            modified_by: userId,
-            space: userSpace.space,
-            related_to: {
-              o: "users",
-              ids: [userId]
-            }
-          })
+        if (userSpaces && userSpaces.length > 0) {
+          for (let userSpace of userSpaces) {
+            const userId = (req as any).userId;
+            await getObject("operation_logs").insert({
+              name: "修改密码",
+              type: "change_password",
+              remote_user: userId,
+              remote_addr: ip,
+              http_user_agent: userAgent,
+              is_mobile: is_phone,
+              is_tablet,
+              object: "users",
+              status: "success",
+              create: new Date(),
+              create_by: userId,
+              modified_by: userId,
+              space: userSpace.space,
+              related_to: {
+                o: "users",
+                ids: [userId],
+              },
+            });
+          }
         }
+      } catch (error) {
+        console.log("error", error);
       }
-    } catch (error) {
-      console.log('error', error);
+      res.json({ userId: (req as any).userId, password_expired: false });
+    } catch (err) {
+      sendError(res, err);
     }
-    res.json({userId: (req as any).userId, password_expired: false});
-  } catch (err) {
-    sendError(res, err);
-  }
-};
+  };

package/src/rest-express/endpoints/refresh-access-token.ts

@@ -1,25 +1,24 @@
-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 * 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";
 
-export const refreshAccessToken = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response
-) => {
-  try {
-    const { accessToken, refreshToken } = req.body;
-    const userAgent = getUserAgent(req);
-    const ip = requestIp.getClientIp(req);
-    const refreshedSession = await accountsServer.refreshTokens(
-      accessToken,
-      refreshToken,
-      ip,
-      userAgent
-    );
-    res.json(refreshedSession);
-  } catch (err) {
-    sendError(res, err);
-  }
-};
+export const refreshAccessToken =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    try {
+      const { accessToken, refreshToken } = req.body;
+      const userAgent = getUserAgent(req);
+      const ip = getClientIp(req);
+      const refreshedSession = await accountsServer.refreshTokens(
+        accessToken,
+        refreshToken,
+        ip,
+        userAgent,
+      );
+      res.json(refreshedSession);
+    } catch (err) {
+      sendError(res, err);
+    }
+  };