@steedos/accounts 2.2.52-beta.3 → 2.2.52-beta.30

package/src/database-mongo/mongo.ts

@@ -593,6 +593,7 @@ export class Mongo implements DatabaseInterface {
     let is_phone = connection.is_phone;
     let is_tablet = connection.is_tablet;
     let space = connection.space;
+    let provider = connection.provider;
     if (userAgent) {
       const foo = userAgent.split(" Space/");
       if (foo.length > 1) {
@@ -613,6 +614,7 @@ export class Mongo implements DatabaseInterface {
         is_phone,
         is_tablet,
         login_expiration_in_days,
+        user_provider: provider
       };
     }
 
@@ -622,6 +624,7 @@ export class Mongo implements DatabaseInterface {
       is_phone,
       is_tablet,
       login_expiration_in_days,
+      user_provider: provider
     };
   }
 

package/src/index.ts

@@ -2,7 +2,7 @@ import * as express from 'express';
 import * as path from 'path';
 import * as mongoose from 'mongoose';
 import * as mongodb from 'mongodb';
-import { AccountsServer } from './server';
+import { AccountsServer, generateRandomToken } from './server';
 import { AccountsPassword } from './password';
 import { errors } from './password/errors';
 import accountsExpress from './rest-express';
@@ -20,15 +20,17 @@ import oauth2Login from './oauth2/login';
 import oauth2Logout from './oauth2/logout';
 import initServer from './rest-express/endpoints/initServer';
 export { hydraAdmin } from './oauth2/config';
+export { setAuthCookies, clearAuthCookies } from './rest-express/utils/steedos-auth';
+export { getMergedTenant } from './core';
 
 declare var WebApp;
 
 const config = getSteedosConfig();
 
 function getAccountsServer() {
-  let accountsConfig = config.accounts || {};
+  let accountsConfig = config.tenant || {};
   let emailConfig = config.email || {};
-  let tokenSecret = accountsConfig.tokenSecret || "secret";
+  let tokenSecret = accountsConfig.tokenSecret || generateRandomToken();
   let accessTokenExpiresIn = accountsConfig.accessTokenExpiresIn || "90d";
   let refreshTokenExpiresIn = accountsConfig.refreshTokenExpiresIn || "7d";
   let mailSignname = emailConfig.signname || "华炎魔方";

package/src/mail.ts

@@ -8,15 +8,15 @@ export const sendMail = async ({from, subject, to, text, html}) => {
 
     const config = getSteedosConfig().email
     if (!config) {
-        console.log("Please set email configs in steedos-config.yml")
+        console.log("Please set email configs in steedos.config.js")
         return
     }
     if (!config.from) {
-        console.log("Please set email configs in steedos-config.yml")
+        console.log("Please set email configs in steedos.config.js")
         return
     }
     if (!config.url && (!config.host || !config.port || !config.username || !config.password)) {
-        console.log("Please set email configs in steedos-config.yml")
+        console.log("Please set email configs in steedos.config.js")
         return
     }
 

package/src/password/accounts-password.ts

@@ -160,7 +160,14 @@ export default class AccountsPassword implements AuthenticationService {
   }
 
   public async authenticate(params: any): Promise<User> {
-    const { user, password, token, locale } = params;
+    let { user, password, token, locale } = params;
+
+    const passwordUnencrypted = params['password-unencrypted'];
+    let isHashPassword = true;
+    if(passwordUnencrypted && !password ){
+      password = passwordUnencrypted;
+      isHashPassword = false;
+    }
 
     if(user && token){
       return await this.codeAuthenticator(user, token, locale);
@@ -174,7 +181,7 @@ export default class AccountsPassword implements AuthenticationService {
       throw new Error(this.options.errors.matchFailed);
     }
 
-    const foundUser = await this.passwordAuthenticator(user, password);
+    const foundUser = await this.passwordAuthenticator(user, password, isHashPassword);
 
     // // If user activated two factor authentication try with the code
     // if (getUserTwoFactorService(foundUser)) {
@@ -686,7 +693,8 @@ export default class AccountsPassword implements AuthenticationService {
 
   public async passwordAuthenticator(
     user: string | LoginUserIdentity,
-    password: PasswordType
+    password: PasswordType,
+    isHashPassword = true
   ): Promise<User> {
     const { username, email, id, mobile } = isString(user)
       ? this.toMobileAndEmail({ user })
@@ -735,8 +743,12 @@ export default class AccountsPassword implements AuthenticationService {
       }
     }
     const hashAlgorithm = this.options.passwordHashAlgorithm;
-    // const pass: any = hashAlgorithm ? hashPassword(password, hashAlgorithm) : password;
-    const pass: any = password;
+    let pass = null;
+    if(isHashPassword){
+      pass = password;
+    }else{
+      pass = hashAlgorithm ? hashPassword(password, hashAlgorithm) : password;
+    }
     const isPasswordValid = await verifyPassword(pass, hash);
 
     if (!isPasswordValid) {

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;
 }