@steedos/service-identity-jwt 2.2.54 → 2.2.55-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/main/default/routes/account.js +2 -2
  2. package/package.json +3 -3
  3. package/package.service.js +3 -3
  4. package/src/routes/account.ts +2 -3
package/main/default/routes/account.js CHANGED
@@ -6,7 +6,7 @@ const tslib_1 = require("tslib");
6
6
  * @Author: baozhoutao@steedos.com
7
7
  * @Date: 2022-06-27 15:17:27
8
8
  * @LastEditors: baozhoutao@steedos.com
9
- * @LastEditTime: 2022-07-16 12:01:45
9
+ * @LastEditTime: 2022-07-18 13:30:25
10
10
  * @Description:
11
11
  */
12
12
  const accounts_1 = require("@steedos/accounts");
@@ -65,7 +65,7 @@ class Account {
65
65
  res.redirect(`/accounts/a/?uid=${loginResult.user._id}`);
66
66
  }
67
67
  else {
68
- return loginResult;
68
+ return Object.assign({}, loginResult, { space: space });
69
69
  }
70
70
  });
71
71
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-identity-jwt",
3
- "version": "2.2.54",
3
+ "version": "2.2.55-beta.3",
4
4
  "main": "package.service.js",
5
5
  "keywords": [
6
6
  "steedos"
@@ -11,7 +11,7 @@
11
11
  "description": "steedos package",
12
12
  "repository": {},
13
13
  "dependencies": {
14
- "@steedos/accounts": "2.2.54",
14
+ "@steedos/accounts": "2.2.55-beta.3",
15
15
  "express": "4.18.1",
16
16
  "passport-jwt": "^4.0.0"
17
17
  },
@@ -20,5 +20,5 @@
20
20
  "publishConfig": {
21
21
  "access": "public"
22
22
  },
23
- "gitHead": "c3c4c95a7010fd3a1af0cd41d999bff14718da1b"
23
+ "gitHead": "cf9ffd7d4f7de88c5b0bbb6c1c269afbeb2268a1"
24
24
  }
package/package.service.js CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2022-06-11 18:09:20
4
4
  * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2022-07-16 18:24:42
5
+ * @LastEditTime: 2022-07-18 11:41:42
6
6
  * @Description:
7
7
  */
8
8
  "use strict";
@@ -90,8 +90,8 @@ module.exports = {
90
90
  const jwtAuthenticate = function (jwt_payload, done) {
91
91
  try {
92
92
  const { profile } = jwt_payload;
93
- if(profile && profile._json && profile._json.email){
94
- objectql.getObject('users').find({filters: [['email', '=', profile._json.email]], fields: ['_id', 'name', 'email', 'username']}).then((records)=>{
93
+ if(profile && profile.email){
94
+ objectql.getObject('users').find({filters: [['email', '=', profile.email]], fields: ['_id', 'name', 'email', 'username']}).then((records)=>{
95
95
  if(records.length > 0){
96
96
  const user = records[0];
97
97
  return done(null, Object.assign({}, user, {id: user._id}))
package/src/routes/account.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2022-06-27 15:17:27
4
4
  * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2022-07-16 12:01:45
5
+ * @LastEditTime: 2022-07-18 13:30:25
6
6
  * @Description:
7
7
  */
8
8
  import { accountsServer, setAuthCookies } from '@steedos/accounts';
@@ -66,11 +66,10 @@ export class Account {
66
66
  })
67
67
  );
68
68
  setAuthCookies(req, res, loginResult.user._id, loginResult.token, loginResult.tokens.accessToken);
69
-
70
69
  if(options.redirect){
71
70
  res.redirect(`/accounts/a/?uid=${loginResult.user._id}`);
72
71
  }else{
73
- return loginResult;
72
+ return Object.assign({}, loginResult, { space: space});
74
73
  }
75
74
  }
76
75
  }