@steedos/service-identity-jwt 2.3.2-beta.12 → 2.3.2-beta.14

package/main/default/routes/apps.router.js

@@ -3,9 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const account_1 = require("./account");
 const passport = require('passport');
-const router = require('@steedos/router').staticRouter();
+const express = require('express');
+const router = express.Router();
 router.use('/accounts/jwt/login', passport.authenticate('jwt', { session: false }), (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     account_1.Account.ssoLogin(req, res, { err: null, user: req.user, redirect: false, accessToken: null }).then((loginResult) => {
+        if (req.query.redirect) {
+            return res.redirect(req.query.redirect);
+        }
         delete loginResult.user.services;
         delete loginResult.user.thirdPartyUser;
         return res.status(200).send(loginResult);

package/main/default/routes/external_app.router.d.ts

@@ -1,3 +1,4 @@
+declare const express: any;
 declare const router: any;
 declare const core: any;
 declare const objectql: any;

package/main/default/routes/external_app.router.js

@@ -7,7 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const router = require('@steedos/router').staticRouter();
+const express = require('express');
+const router = express.Router();
 const core = require('@steedos/core');
 const objectql = require('@steedos/objectql');
 const jwt = require('jsonwebtoken');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-identity-jwt",
-    "version": "2.3.2-beta.12",
+    "version": "2.3.2-beta.14",
     "main": "package.service.js",
     "keywords": [
         "steedos"
@@ -11,7 +11,7 @@
     "description": "steedos package",
     "repository": {},
     "dependencies": {
-        "@steedos/accounts": "2.3.2-beta.12",
+        "@steedos/accounts": "2.3.2-beta.14",
         "express": "4.18.1",
         "jsonwebtoken": "8.5.1",
         "passport": "^0.6.0",
@@ -22,5 +22,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f738241842b61c66eae2b1fe7bf5c0bfb66348d6"
+    "gitHead": "bd6b097a9d70dc7e9dace4c1af400ba5e5f0748e"
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-11 18:09:20
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-11-24 13:06:15
+ * @LastEditTime: 2022-11-29 16:09:26
  * @Description: 
  */
 "use strict";
@@ -86,32 +86,38 @@ module.exports = {
 			const jwtOptions = {
 				// secretOrKey: this.settings.jwt.secret,
 				secretOrKeyProvider: function (request, rawJwtToken, done) {
-					let decoded = jwt.decode(rawJwtToken, { complete: true });
-					let payload = decoded.payload
-					const app_code = payload.app_code
-					if (app_code) { // 走应用认证
-						objectql.getObject('apps').find({filters: [['code', '=', app_code]], fields: ['secret']}).then((records)=>{
-							if(records.length > 0){
-								const app = records[0];
-								if (app.secret) {
-									return done(null, app.secret)
-								}
-								else {
-									done(`app ${app_code}'s secret is null`, null)
+					try {
+						let decoded = jwt.decode(rawJwtToken, { complete: true });
+						let payload = decoded.payload
+						const app_code = payload.app_code
+						if (app_code) { // 走应用认证
+							objectql.getObject('apps').find({filters: [['code', '=', app_code]], fields: ['secret']}).then((records)=>{
+								if(records.length > 0){
+									const app = records[0];
+									if (app.secret) {
+										return done(null, app.secret)
+									}
+									else {
+										done(`app ${app_code}'s secret is null`, null)
+									}
+								}else{
+									return done('app not find', null)
 								}
-							}else{
-								return done('app not find', null)
-							}
-						})
-					}
-					else if (secret) { // 走全局配置
-						return done(null, secret)
-					}
-					else { // 都没有则认证不通过
-						return done('need secret', null)
+							})
+						}
+						else if (secret) { // 走全局配置
+							return done(null, secret)
+						}
+						else { // 都没有则认证不通过
+							return done('need secret', null)
+						}
+					} catch (error) {
+						// console.error(error)
+						return done(error.message, null)
 					}
+					
 				},
-				jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken()
+				jwtFromRequest: ExtractJwt.fromExtractors([ExtractJwt.fromAuthHeaderAsBearerToken(), ExtractJwt.fromUrlQueryParameter('t')]) 
 			}
 			
 			const jwtAuthenticate = function (jwt_payload, done) {

package/src/routes/apps.router.ts

@@ -1,17 +1,20 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-08 23:28:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-16 14:19:32
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2022-11-29 15:53:46
  * @Description: 
  */
 import { Account } from './account'
 const passport = require('passport');
-
-const router =require('@steedos/router').staticRouter()
+const express = require('express');
+const router =express.Router();
 
 router.use('/accounts/jwt/login', passport.authenticate('jwt', { session: false }), async (req: any, res) => {
     Account.ssoLogin(req, res, { err: null, user: req.user, redirect: false, accessToken: null }).then((loginResult) => {
+        if (req.query.redirect) { // 如果url传递了重定向的参数则优先重定向
+            return res.redirect(req.query.redirect)
+        }
         delete loginResult.user.services;
         delete loginResult.user.thirdPartyUser;
         return res.status(200).send(loginResult)

package/src/routes/external_app.router.ts

@@ -1,11 +1,12 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-11-23 15:54:33
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-11-23 16:45:17
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-11-28 17:59:06
  * @Description: 新增jwt 接口(GET), 所有第三方应用都通过此接口转发出去, 自动带上 jwt 加密(app.secret)后的数据,比如username、email等.
  */
-const router = require('@steedos/router').staticRouter()
+const express = require('express');
+const router =express.Router();
 const core = require('@steedos/core');
 const objectql = require('@steedos/objectql')
 const jwt = require('jsonwebtoken')