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

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

@@ -2,15 +2,20 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-19 11:38:30
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-06-06 12:01:19
+ * @LastEditTime: 2023-09-18 17:58:22
  * @Description: 
  */
 import * as express from 'express';
 import { AccountsServer } from '../../../server';
 import { sendError } from '../../utils/send-error';
-import { getSteedosConfig } from '@steedos/objectql'
+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 isMobile from "ismobilejs";
+import { db } from '../../../db';
+
 const config = getSteedosConfig();
 declare var Creator;
 
@@ -44,6 +49,50 @@ export const changePassword = (accountsServer: AccountsServer) => async (
       Creator.getCollection('space_users').update({user: (req as any).userId}, {$set: {password_expired: false}}, {
         multi: true
       })
+
+      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 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]
+            }
+          })
+        }
+      }
     } catch (error) {
       console.log('error', error);
     }

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

@@ -18,3 +18,9 @@ export const getMySpaces = (accountsServer: AccountsServer) => async (
 
   res.json(spaces);
 };
+
+// 获取第一个spaces
+export const getFirstSpace = async (accountsServer: AccountsServer)=>{
+  const space = await accountsServer.db.getFirstSpace();
+  return space;
+}

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

@@ -0,0 +1,37 @@
+import * as express from 'express';
+import { AccountsServer } from '../../../server';
+import { sendError } from '../../utils/send-error';
+import { db } from '../../../db';
+
+export const AcceptInvitation = (accountsServer: AccountsServer) => async (
+  req: express.Request,
+  res: express.Response
+) => {
+  try {
+    if ((req as any).user == null) {
+        throw new Error("accounts.access_denied")
+    }
+
+    const {tenantId, email} = req.body;
+    if (!tenantId)
+        throw new Error("accounts.tenant_required")
+    if (!email)
+        throw new Error("accounts.email_required")
+
+    const spaceUsers = await db.find('space_users', {
+        filters: [["space", "=", tenantId], ["email", "=", email], ["user_accepted", "=", false], ["invite_state", "=", "pending"]]
+    });
+
+    if(spaceUsers && spaceUsers.length == 1){
+        const spaceUser = spaceUsers[0];
+        await db.update('space_users', spaceUser._id, {
+            user_accepted: true,
+            invite_state: 'accepted'
+        });
+    }
+    res.json({ok: 1});
+  } catch (err) {
+    console.log(err)
+    sendError(res, err);
+  }
+};

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

@@ -0,0 +1,37 @@
+import * as express from 'express';
+import { AccountsServer } from '../../../server';
+import { sendError } from '../../utils/send-error';
+import { db } from '../../../db';
+
+export const DeclineInvitation = (accountsServer: AccountsServer) => async (
+  req: express.Request,
+  res: express.Response
+) => {
+  try {
+    if ((req as any).user == null) {
+        throw new Error("accounts.access_denied")
+    }
+
+    const {tenantId, email} = req.body;
+    if (!tenantId)
+        throw new Error("accounts.tenant_required")
+    if (!email)
+        throw new Error("accounts.email_required")
+
+    const spaceUsers = await db.find('space_users', {
+        filters: [["space", "=", tenantId], ["email", "=", email], ["user_accepted", "=", false], ["invite_state", "=", "pending"]]
+    });
+
+    if(spaceUsers && spaceUsers.length == 1){
+        const spaceUser = spaceUsers[0];
+        await db.update('space_users', spaceUser._id, {
+            user_accepted: false,
+            invite_state: 'refused'
+        });
+    }
+    res.json({ok: 1});
+  } catch (err) {
+    console.log(err)
+    sendError(res, err);
+  }
+};

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

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-23 10:29:35
+ * @LastEditTime: 2023-11-21 09:56:06
  * @Description: 
  */
 import * as express from 'express';
@@ -34,8 +34,9 @@ export const getSettings = (accountsServer: AccountsServer) => async (
     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) {
@@ -43,12 +44,14 @@ export const getSettings = (accountsServer: AccountsServer) => async (
   }
 
   if(!tenant._id){
-    tenant._id = process.env.STEEDOS_CLOUD_SPACE_ID
+    tenant._id = process.env.STEEDOS_TENANT_ID
   }
+
+  const platform = (global as any).Meteor.settings.public?.platform || {}
   
 
   if (tenant._id) {
-    let spaceDoc = await db.findOne("spaces", tenant._id, {fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo"]})
+    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);
@@ -62,6 +65,9 @@ export const getSettings = (accountsServer: AccountsServer) => async (
       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
+      }
     }
   }
 
@@ -91,6 +97,8 @@ export const getSettings = (accountsServer: AccountsServer) => async (
     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 as any).Meteor.settings.public || {}
   })
 }

package/src/rest-express/express-middleware.ts

@@ -25,7 +25,8 @@ import { login } from './endpoints/login';
 import { getMySpaces } from './endpoints/spaces';
 import { verify_email, verify_mobile} from './endpoints/password/verify';
 import { geetest_init,geetest_validate } from './endpoints/geetestV3/geetest-init'
-
+import { AcceptInvitation } from './endpoints/steedos/accept_invitation';
+import { DeclineInvitation} from './endpoints/steedos/decline_invitation';
 
 const defaultOptions: AccountsExpressOptions = {
   path: '/accounts',
@@ -57,7 +58,8 @@ const accountsExpress = (
   router.get(`${path}/settings`, userLoader(accountsServer), getSettings(accountsServer));
   router.get(`${path}/tenant/:id`, userLoader(accountsServer), getTenant(accountsServer));
   // router.post(`${path}/tenant`, userLoader(accountsServer), createTenant(accountsServer));
-
+  router.post(`${path}/acceptInvitation`, userLoader(accountsServer), AcceptInvitation(accountsServer));
+  router.post(`${path}/declineInvitation`, userLoader(accountsServer), DeclineInvitation(accountsServer));
   router.post(`${path}/refreshTokens`, refreshAccessToken(accountsServer));
 
   router.post(`${path}/logout`, userLoader(accountsServer), logout(accountsServer));

package/src/server/accounts-server.ts

@@ -511,7 +511,7 @@ export class AccountsServer {
    * @param {string} accessToken - User access token.
    * @returns {Promise<void>} - Return a promise.
    */
-  public async logout(token: string): Promise<void> {
+  public async logout(token: string): Promise<Session> {
     try {
       const session: Session = await this.db.findSessionByToken(token);
 
@@ -524,6 +524,7 @@ export class AccountsServer {
       } else {
         throw new Error("Session is no longer valid");
       }
+      return session;
     } catch (error) {
       this.hooks.emit(ServerHooks.LogoutError, error);
 

package/src/types/types/authentication-service.ts

@@ -1,3 +1,4 @@
+
 import { User } from './user';
 import { DatabaseInterface } from './database-interface';
 
@@ -10,4 +11,5 @@ export interface AuthenticationService {
   setStore(store: DatabaseInterface): void;
   authenticate(params: any): Promise<User | null>;
   getUserProfile(userId: string): Promise<any | null>;
+  foundUser(user: any): Promise<any | null>;
 }

package/src/types/types/database-interface.ts

@@ -69,6 +69,8 @@ export interface DatabaseInterface extends DatabaseInterfaceSessions {
 
   getMySpaces(userId: string): Promise<any | null>;
 
+  getFirstSpace(): Promise<any | null>;
+
   getInviteInfo(id: string): Promise<any | null>;
   
   setEmail(userId: string, newEmail: string): Promise<void>;

package/src/types/types/session.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:35:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-09-19 09:13:33
+ * @Description: 
+ */
 export interface Session {
   id: string;
   userId: string;
@@ -7,4 +14,5 @@ export interface Session {
   ip?: string;
   createdAt: string;
   updatedAt: string;
+  space?: string
 }