fix oauth

o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthBind.java

@@ -35,7 +35,7 @@ class ActionOauthBind extends BaseAction {
 		oauthToken(oauthClient, param);
 		oauthCheckAccessToken(param);
 		oauthInfo(oauthClient, param);
-		String credential = Objects.toString(param.get(oauthClient.getInfoCredentialField()));
+		String credential = Objects.toString(param.get(oauthClient.getInfoCredentialField()), "");
 		oauthCheckCredential(credential);
 		logger.debug("credential:{}", credential);
 		Wo wo = new Wo();

o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthLogin.java

@@ -36,7 +36,7 @@ class ActionOauthLogin extends BaseAction {
 		oauthToken(oauthClient, param);
 		oauthCheckAccessToken(param);
 		oauthInfo(oauthClient, param);
-		String credential = Objects.toString(param.get(oauthClient.getInfoCredentialField()));
+		String credential = Objects.toString(param.get(oauthClient.getInfoCredentialField()), "");
 		oauthCheckCredential(credential);
 		logger.debug("credential:{}", credential);
 		Wo wo = null;

o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java

@@ -55,6 +55,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 
 	protected static final String OAUTH_ACCESSTOKEN = "access_token";
 	protected static final String OAUTH_CLIENTID = "clientId";
+	protected static final String OAUTH_CLIENTSECRET = "clientSecret";
 	protected static final String OAUTH_CODE = "code";
 	protected static final String OAUTH_REDIRECTURI = "redirectUri";
 
@@ -224,6 +225,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 		param.put(OAUTH_CLIENTID, oauthClient.getClientId());
 		param.put(OAUTH_CODE, code);
 		param.put(OAUTH_REDIRECTURI, redirectUri);
+		param.put(OAUTH_CLIENTSECRET, oauthClient.getClientSecret());
 		return param;
 	}