Added additional_parameters parameter to externalauthenticationfromsdusingtoken method at security provider. (#138)

claudiamurialdo · claudiamurialdo · commit 88e20dfc6051 · 2019-10-23T13:31:06.000-03:00
Issue 77445
diff --git a/common/src/main/java/com/genexus/security/NoSecurityProvider.java b/common/src/main/java/com/genexus/security/NoSecurityProvider.java
@@ -43,7 +43,12 @@ public GXResult externalauthenticationfromsdusingtoken(int remoteHandle, ModelCo
 		flag[0] = true;
 		return new GXResult();
 	}
-	
+
+	public GXResult externalauthenticationfromsdusingtoken(int remoteHandle, ModelContext context, String grantType, String nativeToken, String nativeVerifier, String clientId, String clientSecret, String[] scope, String additional_parameters, OutData outData, boolean[] flag)
+	{
+		flag[0] = true;
+		return new GXResult();
+	}
 	public GXResult oauthauthentication(int remoteHandle, ModelContext context, String grantType, String userName, String userPassword, String clientId, String clientSecret, String scope, OutData outData, String[] redirectURL, boolean[] flag)
 	{
 		flag[0] = true;
diff --git a/common/src/main/java/com/genexus/security/SecurityProvider.java b/common/src/main/java/com/genexus/security/SecurityProvider.java
@@ -10,6 +10,7 @@ public interface SecurityProvider
 	void checksessionprm(int remoteHandle, ModelContext context, String reqUrl, String permissionPrefix, boolean[] flag, boolean[] isPermissionOK);
 	GXResult refreshtoken(int remoteHandle, ModelContext context, String clientId, String clientSecret, String refreshToken, OutData outData, boolean[] flag);
 	GXResult logindevice(int remoteHandle, ModelContext context, String clientId, String clientSecret, OutData outData, boolean[] flag);
+	GXResult externalauthenticationfromsdusingtoken(int remoteHandle, ModelContext context, String grantType, String nativeToken, String nativeVerifier, String clientId, String clientSecret, String[] scope, String additional_parameters, OutData outData, boolean[] flag);
 	GXResult externalauthenticationfromsdusingtoken(int remoteHandle, ModelContext context, String grantType, String nativeToken, String nativeVerifier, String clientId, String clientSecret, String[] scope, OutData outData, boolean[] flag);
 	GXResult oauthauthentication(int remoteHandle, ModelContext context, String grantType, String userName, String userPassword, String clientId, String clientSecret, String scope, OutData outData, String[] redirectURL, boolean[] flag);
 	GXResult oauthauthentication(int remoteHandle, ModelContext context, String grantType, String userName, String userPassword, String clientId, String clientSecret, String scope, String additional_parameters, OutData outData, String[] redirectURL, boolean[] flag);
diff --git a/java/src/main/java/com/genexus/webpanels/GXOAuthAccessToken.java b/java/src/main/java/com/genexus/webpanels/GXOAuthAccessToken.java
@@ -86,7 +86,7 @@ protected void doExecute(HttpContext context) throws Exception
 					{
 						if (isExternalSDAuth)
 						{
-							result = GXSecurityProvider.getInstance().externalauthenticationfromsdusingtoken(-2, modelContext, grantType, nativeToken, nativeVerifier, clientId, clientSecret, scopeInOut, gamout, flag);
+							result = GXSecurityProvider.getInstance().externalauthenticationfromsdusingtoken(-2, modelContext, grantType, nativeToken, nativeVerifier, clientId, clientSecret, scopeInOut, additional_parameters, gamout, flag);
 						}				
 						else 
 						{

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,12 @@ public GXResult externalauthenticationfromsdusingtoken(int remoteHandle, ModelCo`
`43`	`43`	`flag[0] = true;`
`44`	`44`	`return new GXResult();`
`45`	`45`	`}`
`46`		`-`
	`46`	`+`
	`47`	`+ public GXResult externalauthenticationfromsdusingtoken(int remoteHandle, ModelContext context, String grantType, String nativeToken, String nativeVerifier, String clientId, String clientSecret, String[] scope, String additional_parameters, OutData outData, boolean[] flag)`
	`48`	`+ {`
	`49`	`+ flag[0] = true;`
	`50`	`+ return new GXResult();`
	`51`	`+ }`
`47`	`52`	`public GXResult oauthauthentication(int remoteHandle, ModelContext context, String grantType, String userName, String userPassword, String clientId, String clientSecret, String scope, OutData outData, String[] redirectURL, boolean[] flag)`
`48`	`53`	`{`
`49`	`54`	`flag[0] = true;`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ protected void doExecute(HttpContext context) throws Exception`
`86`	`86`	`{`
`87`	`87`	`if (isExternalSDAuth)`
`88`	`88`	`{`
`89`		`- result = GXSecurityProvider.getInstance().externalauthenticationfromsdusingtoken(-2, modelContext, grantType, nativeToken, nativeVerifier, clientId, clientSecret, scopeInOut, gamout, flag);`
	`89`	`+ result = GXSecurityProvider.getInstance().externalauthenticationfromsdusingtoken(-2, modelContext, grantType, nativeToken, nativeVerifier, clientId, clientSecret, scopeInOut, additional_parameters, gamout, flag);`
`90`	`90`	`}`
`91`	`91`	`else`
`92`	`92`	`{`