Merge branch 'develop'

soajs · Feb 15, 2022 · 6b81982 · 6b81982
2 parents 21c1a37 + 62f2edf
commit 6b81982
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/bl/index.js b/bl/index.js
@@ -247,6 +247,15 @@ let bl = {
 				error = new Error(error.msg);
 				return cb(bl.handleError(req.soajs, 413, error));
 			}
+			let loginMode = bl.oauth_urac.localConfig.loginMode;
+			if (req.soajs && req.soajs.tenantOauth && req.soajs.tenantOauth.loginMode) {
+				loginMode = req.soajs.tenantOauth.loginMode;
+			}
+
+			if (record) {
+				record.loginMode = loginMode;
+				record.id = record._id.toString();
+			}
 			options.provision.generateSaveAccessRefreshToken(record, req, (err, accessData) => {
 				if (err) {
 					return cb(bl.handleError(req.soajs, 600, err));

diff --git a/bl/oauth_phone.js b/bl/oauth_phone.js
@@ -128,6 +128,15 @@ let bl = {
 							error = new Error(error.msg);
 							return cb(bl.handleError(req.soajs, 413, error));
 						}
+						let loginMode = bl.localConfig.loginMode;
+						if (req.soajs && req.soajs.tenantOauth && req.soajs.tenantOauth.loginMode) {
+							loginMode = req.soajs.tenantOauth.loginMode;
+						}
+
+						if (record) {
+							record.loginMode = loginMode;
+							record.id = record._id.toString();
+						}
 						options.provision.generateSaveAccessRefreshToken(record, req, (err, accessData) => {
 							if (err) {
 								return cb(bl.handleError(req.soajs, 600, err));
@@ -156,6 +165,15 @@ let bl = {
 				modelObj.updateStatus(data, () => {
 					// no need to do anything here.
 				});
+				let loginMode = bl.localConfig.loginMode;
+				if (req.soajs && req.soajs.tenantOauth && req.soajs.tenantOauth.loginMode) {
+					loginMode = req.soajs.tenantOauth.loginMode;
+				}
+
+				if (codeRecord.user) {
+					codeRecord.user.loginMode = loginMode;
+					codeRecord.user.id = codeRecord.user._id.toString();
+				}
 				options.provision.generateSaveAccessRefreshToken(codeRecord.user, req, (err, accessData) => {
 					if (err) {
 						return cb(bl.handleError(req.soajs, 600, err));

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "soajs.oauth",
   "description": "soajs oauth service",
-  "version": "3.0.36",
+  "version": "3.0.37",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"