@steedos/accounts 2.2.52-beta.20 → 2.2.52-beta.24

package/src/server/accounts-server.ts

@@ -28,7 +28,7 @@ import isMobile from "ismobilejs";
 
 const defaultOptions = {
   ambiguousErrorMessages: true,
-  tokenSecret: "secret",
+  tokenSecret: generateRandomToken(),
   tokenConfigs: {
     accessToken: {
       expiresIn: "90m",
@@ -96,6 +96,14 @@ export class AccountsServer {
     return () => this.hooks.off(eventName, callback);
   }
 
+  public async getUserProfile(userId, serviceName = 'password'){
+    const service = this.services[serviceName];
+    if(!service){
+      throw new Error(`Service ${serviceName} not found`);
+    }
+    return await service.getUserProfile(userId);
+  }
+
   public async loginWithService(
     serviceName: string,
     params: any,
@@ -203,6 +211,8 @@ export class AccountsServer {
       phone_logout_other_clients,
       phone_login_expiration_in_days,
       space,
+      provider,
+      jwtToken,
     } = infos;
 
     let is_phone = false;
@@ -243,7 +253,7 @@ export class AccountsServer {
       //3 清理用户所有session 缓存
       removeUserSessionsCacheByUserId(user.id, is_phone);
     }
-    const token = generateRandomToken();
+    const token = jwtToken || generateRandomToken();
     const sessionId = await this.db.createSession(user.id, token, {
       ip,
       userAgent,
@@ -252,11 +262,14 @@ export class AccountsServer {
       is_phone,
       is_tablet,
       space,
+      provider
     });
 
     const { accessToken, refreshToken } = this.createTokens({
       token,
       userId: user.id,
+      name: user.name,
+      email: user.email
     });
 
     return {
@@ -357,6 +370,8 @@ export class AccountsServer {
         token: newSessionId,
         isImpersonated: true,
         userId: user.id,
+        name: user.name,
+        email: user.email,
       });
       const impersonationResult = {
         authorized: true,
@@ -426,6 +441,8 @@ export class AccountsServer {
         const tokens = this.createTokens({
           token: sessionToken,
           userId: user.id,
+          name: user.name,
+          email: user.email
         });
         await this.db.updateSession(session.id, { ip, userAgent });
 
@@ -459,16 +476,22 @@ export class AccountsServer {
     token,
     isImpersonated = false,
     userId,
+    name,
+    email
   }: {
     token: string;
     isImpersonated?: boolean;
     userId: string;
+    name: string,
+    email: string
   }): Tokens {
     const { tokenSecret, tokenConfigs } = this.options;
     const jwtData: JwtData = {
-      token,
+      // token,
       isImpersonated,
       userId,
+      name,
+      email
     };
     const accessToken = generateAccessToken({
       data: jwtData,

package/src/server/types/jwt-data.ts

@@ -1,5 +1,14 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:35:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-07-01 15:01:17
+ * @Description: 
+ */
 export interface JwtData {
-  token: string;
+  token?: string;
   isImpersonated: boolean;
   userId: string;
+  name: string,
+  email: string,
 }

package/src/types/types/connection-informations.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:35:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-06-29 16:05:04
+ * @Description: 
+ */
 export interface ConnectionInformations {
   ip?: string;
   userAgent?: string;
@@ -8,4 +15,6 @@ export interface ConnectionInformations {
   login_expiration_in_days?: number;
   phone_logout_other_clients?: boolean;
   phone_login_expiration_in_days?: number;
+  provider?: string;
+  jwtToken?: string;
 }