From 2ac28e572f56b89cff1af9f646bb8b0ebc3c5571 Mon Sep 17 00:00:00 2001
From: shimingxy <shimingxy@163.com>
Date: Sat, 16 May 2020 21:52:10 +0800
Subject: [PATCH] v 1.5.0 RC2

v 1.5.0 RC2
---
 .../resources/spring/maxkey-support-jwt.xml   | 54 -------------------
 .../src/main/resources/spring/maxkey.xml      |  1 -
 2 files changed, 55 deletions(-)
 delete mode 100644 maxkey-web-maxkey/src/main/resources/spring/maxkey-support-jwt.xml

diff --git a/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-jwt.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-jwt.xml
deleted file mode 100644
index 783f85f9..00000000
--- a/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-jwt.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<beans 	xmlns="http://www.springframework.org/schema/beans"
-		xmlns:context="http://www.springframework.org/schema/context"
-		xmlns:mvc="http://www.springframework.org/schema/mvc"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:p="http://www.springframework.org/schema/p"
-		xmlns:util="http://www.springframework.org/schema/util"
-		xsi:schemaLocation="
-	        http://www.springframework.org/schema/beans 
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/context 
-			http://www.springframework.org/schema/context/spring-context.xsd
-	        http://www.springframework.org/schema/util     
-	        http://www.springframework.org/schema/util/spring-util.xsd
-	        http://www.springframework.org/schema/mvc 
-			http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-	<!-- OpenID Connect 1.0  -->
-	<!-- 
-	 * Self-issued Provider Metadata
-	 *
-	 * http://openid.net/specs/openid-connect-core-1_0.html#SelfIssued 
-	 * -->
-	<bean id="oidcProviderMetadata" class="org.maxkey.config.oidc.OIDCProviderMetadataDetails">
-		<property name="issuer" value="${config.oidc.metadata.issuer}" />
-		<property name="authorizationEndpoint" value="${config.oidc.metadata.authorizationEndpoint}" />
-		<property name="tokenEndpoint" value="${config.oidc.metadata.tokenEndpoint}" />
-		<property name="userinfoEndpoint" value="${config.oidc.metadata.userinfoEndpoint}" />
-	</bean>
-	
-	<bean id="jwkSetKeyStore" class="org.maxkey.crypto.jose.keystore.JWKSetKeyStore">
-		<property name="location" value="classpath:config/keystore.jwks" />
-	</bean>
-	
-	<bean id="jwtSignerValidationService" class="org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService">
-		<constructor-arg name="keyStore" ref="jwkSetKeyStore" />
-		<property name="defaultSignerKeyId" value="connsec_rsa" />
- 		<property name="defaultSigningAlgorithmName" value="RS256" />
-	</bean>
-
-	<bean id="jwtEncryptionService" class="org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService">
-		<constructor-arg name="keyStore" ref="jwkSetKeyStore" />
-		<property name="defaultAlgorithm" value="RSA1_5" />
-		<property name="defaultDecryptionKeyId" value="connsec_rsa" />
-		<property name="defaultEncryptionKeyId" value="connsec_rsa" />
-	</bean>
-
-	<bean id="jwtLoginService" class="org.maxkey.authn.support.jwt.JwtLoginService">
-		<property name="jwtSignerValidationService" ref="jwtSignerValidationService" />
- 		<property name="jwtProviderMetadata"  ref="oidcProviderMetadata" />
-	</bean>
-		
-	
-</beans>
\ No newline at end of file
diff --git a/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml
index 8c10bd08..1016124c 100644
--- a/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml
+++ b/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml
@@ -26,7 +26,6 @@
     <import resource="maxkey-support-social.xml"/>
     <!--  
     <import resource="maxkey-support-wsfederation.xml"/>
-    <import resource="maxkey-support-jwt.xml"/>
     -->
     
     <!-- single sign on protocol -->
-- 
GitLab