@steedos/accounts 2.2.52-beta.5 → 2.2.52-beta.52

package/src/database-mongo/mongo.ts

@@ -7,7 +7,7 @@ import {
   User,
 } from '../types';
 import { get, merge, trim, map } from 'lodash';
-import { Collection, Db, ObjectID } from 'mongodb';
+import { Collection, Db, ObjectId } from 'mongodb';
 
 import { AccountsMongoOptions, MongoUser } from './types';
 import { getSessionByUserId, hashStampedToken } from '@steedos/auth';
@@ -17,9 +17,9 @@ import { getDataSource } from '@steedos/objectql';
 
 const moment = require("moment");
 
-const toMongoID = (objectId: string | ObjectID) => {
+const toMongoID = (objectId: string | ObjectId) => {
   if (typeof objectId === "string") {
-    return new ObjectID(objectId);
+    return new ObjectId(objectId);
   }
   return objectId;
 };
@@ -164,15 +164,15 @@ export class Mongo implements DatabaseInterface {
     }
 
     user.steedos_id = user._id;
-    const ret = await this.collection.insertOne(user);
-    return ret.ops[0]._id.toString();
+    const ret = await this.collection.insertOne(user as any);
+    return user._id as string;
   }
 
   public async findUserById(userId: string): Promise<User | null> {
     const id = this.options.convertUserIdToMongoObjectId
       ? toMongoID(userId)
       : userId;
-    const user = await this.collection.findOne({ _id: id });
+    const user:any = await this.collection.findOne({ _id: id });
     if (user) {
       user.id = user._id.toString();
     }
@@ -180,7 +180,7 @@ export class Mongo implements DatabaseInterface {
   }
 
   public async findUserByEmail(email: string): Promise<User | null> {
-    const user = await this.collection.findOne({
+    const user:any = await this.collection.findOne({
       email: email.toLowerCase(),
     });
     if (user) {
@@ -197,7 +197,7 @@ export class Mongo implements DatabaseInterface {
     if (encryptedMobile) {
       selector.mobile = encryptedMobile;
     }
-    const user = await this.collection.findOne(selector);
+    const user:any = await this.collection.findOne(selector);
     if (user) {
       user.id = user._id.toString();
     }
@@ -210,7 +210,7 @@ export class Mongo implements DatabaseInterface {
       : {
           $where: `obj.username && (obj.username.toLowerCase() === "${username.toLowerCase()}")`,
         };
-    const user = await this.collection.findOne(filter);
+    const user:any = await this.collection.findOne(filter);
     if (user) {
       user.id = user._id.toString();
     }
@@ -228,7 +228,7 @@ export class Mongo implements DatabaseInterface {
   public async findUserByEmailVerificationToken(
     token: string
   ): Promise<User | null> {
-    const user = await this.collection.findOne({
+    const user:any = await this.collection.findOne({
       "services.email.verificationTokens.token": token,
     });
     if (user) {
@@ -240,7 +240,7 @@ export class Mongo implements DatabaseInterface {
   public async findUserByResetPasswordToken(
     token: string
   ): Promise<User | null> {
-    const user = await this.collection.findOne({
+    const user:any = await this.collection.findOne({
       "services.password.reset.token": token,
     });
     if (user) {
@@ -253,7 +253,7 @@ export class Mongo implements DatabaseInterface {
     serviceName: string,
     serviceId: string
   ): Promise<User | null> {
-    const user = await this.collection.findOne({
+    const user:any = await this.collection.findOne({
       [`services.${serviceName}.id`]: serviceId,
     });
     if (user) {
@@ -299,7 +299,7 @@ export class Mongo implements DatabaseInterface {
         },
       }
     );
-    if (ret.result.nModified === 0) {
+    if (ret.matchedCount === 0) {
       throw new Error("User not found");
     }
   }
@@ -317,7 +317,7 @@ export class Mongo implements DatabaseInterface {
         },
       }
     );
-    if (ret.result.nModified === 0) {
+    if (ret.matchedCount === 0) {
       throw new Error("User not found");
     }
   }
@@ -348,7 +348,7 @@ export class Mongo implements DatabaseInterface {
         },
       }
     );
-    if (ret.result.nModified === 0) {
+    if (ret.matchedCount === 0) {
       throw new Error("User not found");
     }
   }
@@ -393,7 +393,7 @@ export class Mongo implements DatabaseInterface {
         },
       }
     );
-    if (ret.result.nModified === 0) {
+    if (ret.matchedCount === 0) {
       throw new Error("User not found");
     }
   }
@@ -409,9 +409,9 @@ export class Mongo implements DatabaseInterface {
     if (existed > 0) {
       throw new Error("该手机号已被其他用户注册");
     }
-    let user = await this.collection.findOne(
+    let user:any = await this.collection.findOne(
       { _id: id },
-      { fields: { mobile: 1 } }
+      { projection: { mobile: 1 } }
     );
     if (user && user.mobile != newMobile) {
       const ret = await this.collection.updateOne(
@@ -454,7 +454,7 @@ export class Mongo implements DatabaseInterface {
     }
     let user = await this.collection.findOne(
       { _id: id },
-      { fields: { email: 1 } }
+      { projection: { email: 1 } }
     );
     if (user && user.email != newEmail) {
       const ret = await this.collection.updateOne(
@@ -498,7 +498,7 @@ export class Mongo implements DatabaseInterface {
         },
       }
     );
-    if (ret.result.nModified === 0) {
+    if (ret.matchedCount === 0) {
       throw new Error("User not found");
     }
   }
@@ -522,7 +522,7 @@ export class Mongo implements DatabaseInterface {
         },
       }
     );
-    if (ret.result.nModified === 0) {
+    if (ret.matchedCount === 0) {
       throw new Error("User not found");
     }
   }
@@ -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
     };
   }
 
@@ -648,7 +651,7 @@ export class Mongo implements DatabaseInterface {
 
     const ret = await this.sessionCollection.insertOne(session);
     await this.updateMeteorSession(userId, token, infos);
-    return ret.ops[0]._id.toString();
+    return ret.insertedId.toString();
   }
 
   public async updateSession(
@@ -708,7 +711,7 @@ export class Mongo implements DatabaseInterface {
   }
 
   public async findSessionByToken(token: string): Promise<Session | null> {
-    const session = await this.sessionCollection.findOne({ token });
+    const session:any = await this.sessionCollection.findOne({ token });
     if (session) {
       session.id = session._id.toString();
     }
@@ -719,7 +722,7 @@ export class Mongo implements DatabaseInterface {
     const _id = this.options.convertSessionIdToMongoObjectId
       ? toMongoID(sessionId)
       : sessionId;
-    const session = await this.sessionCollection.findOne({ _id });
+    const session:any = await this.sessionCollection.findOne({ _id });
     if (session) {
       session.id = session._id.toString();
     }
@@ -796,7 +799,7 @@ export class Mongo implements DatabaseInterface {
     if (owner) {
       query.owner = owner;
     }
-    let record = await this.codeCollection.findOne(query);
+    let record:any = await this.codeCollection.findOne(query);
     if (record) {
       // if(record.failureCount >= MAX_FAILURE_COUNT){
       //   throw new Error('accounts.tooManyFailures');
@@ -815,7 +818,7 @@ export class Mongo implements DatabaseInterface {
       }
 
       let result = await this.codeCollection.insertOne(doc);
-      record = result.ops[0];
+      record = result.ops[0];;
     }
     return record;
   }

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';
@@ -15,20 +15,18 @@ import { URL } from 'url';
 import * as bodyParser from 'body-parser';
 import { sendMail, sendSMS } from './core';
 
-import oauth2Consent from './oauth2/consent';
-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 || "华炎魔方";
@@ -45,7 +43,7 @@ function getAccountsServer() {
         kmsProviders: kmsProvider,
         bypassAutoEncryption: true,
       }
-    });
+    } as any);
   } else {
     mongoose.connect(mongoUrl, { useNewUrlParser: true, useUnifiedTopology: true });
   }
@@ -176,13 +174,5 @@ export function init(context) {
 
     context.app.use("/initServer", initServer);
 
-    context.app.use("/oauth2/consent", userLoader(accountsServer), oauth2Consent);
-    context.app.use("/oauth2/login", userLoader(accountsServer), oauth2Login);
-    context.app.use("/oauth2/logout", oauth2Logout);
-    // if (typeof WebApp !== 'undefined'){
-    //   const app = express();
-    //   app.use("/accounts", bodyParser.urlencoded({ extended: false }), bodyParser.json(), accountsRouter)
-    //   WebApp.rawConnectHandlers.use(app)
-    // }
   })
 }

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/rest-express/endpoints/steedos/get-tenant.ts

@@ -5,8 +5,6 @@ import { getSteedosConfig } from '@steedos/objectql'
 import { db } from '../../../db';
 import {getSteedosService } from '../../../core'
 
-const config = getSteedosConfig();
-
 export const getTenant = (accountsServer: AccountsServer) => async (
   req: express.Request,
   res: express.Response

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

@@ -1,3 +1,10 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:35:34
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-07-06 18:19:28
+ * @Description: 
+ */
 import * as express from 'express';
 import * as _ from 'lodash';
 import { AccountsServer } from '../../../server';
@@ -5,6 +12,8 @@ import { getSteedosConfig, getSteedosSchema } from '@steedos/objectql'
 import { db } from '../../../db';
 import { canSendEmail, canSendSMS, getSteedosService } from '../../../core';
 
+const clone = require('clone');
+
 const config = getSteedosConfig();
 
 export const getSettings = (accountsServer: AccountsServer) => async (
@@ -59,9 +68,14 @@ export const getSettings = (accountsServer: AccountsServer) => async (
   const broker = getSteedosSchema().broker;
   const serverInitInfo = await broker.call(`@steedos/service-cloud-init.serverInitInfo`, {});
 
+  const _tenant = clone(tenant);
+
+  delete _tenant['tokenSecret'];
+  delete _tenant['accessTokenExpiresIn']
+  delete _tenant['refreshTokenExpiresIn']
 
   res.json({
-    tenant: tenant,
+    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,

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

package/lib/oauth2/client.js

@@ -1 +0,0 @@
-//# sourceMappingURL=client.js.map

package/lib/oauth2/client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/oauth2/client.ts"],"names":[],"mappings":""}

package/lib/oauth2/config.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hydraAdmin = void 0;
-var hydra_client_1 = require("@oryd/hydra-client");
-var baseOptions = {};
-if (process.env.STEEDOS_MOCK_TLS_TERMINATION) {
-    baseOptions.headers = { 'X-Forwarded-Proto': 'https' };
-}
-var hydraAdmin = new hydra_client_1.AdminApi(new hydra_client_1.Configuration({
-    basePath: process.env.STEEDOS_HYDRA_ADMIN_URL,
-    baseOptions: baseOptions
-}));
-exports.hydraAdmin = hydraAdmin;
-//# sourceMappingURL=config.js.map

package/lib/oauth2/config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/oauth2/config.ts"],"names":[],"mappings":";;;AAAA,mDAA4D;AAC5D,IAAM,WAAW,GAAQ,EAAE,CAAA;AAE3B,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;IAC5C,WAAW,CAAC,OAAO,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,CAAA;CACvD;AAED,IAAM,UAAU,GAAG,IAAI,uBAAQ,CAC7B,IAAI,4BAAa,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;IAC7C,WAAW,aAAA;CACZ,CAAC,CACH,CAAA;AAEQ,gCAAU"}