diff options
author | Emmanuel Raviart <eraviart@entrouvert.com> | 2004-07-23 17:02:11 +0000 |
---|---|---|
committer | Emmanuel Raviart <eraviart@entrouvert.com> | 2004-07-23 17:02:11 +0000 |
commit | c0d2b1566622c65718ba0317235e512eb7c94c7d (patch) | |
tree | 915a4a7891da62dd933f333f6982ed70b6f8e158 /java | |
parent | a11f5fe9c4dbfae919102824c86c343bd59240c5 (diff) | |
download | lasso-c0d2b1566622c65718ba0317235e512eb7c94c7d.tar.gz lasso-c0d2b1566622c65718ba0317235e512eb7c94c7d.tar.xz lasso-c0d2b1566622c65718ba0317235e512eb7c94c7d.zip |
Added Java LassoUser.getAuthenticationMethod
Python method User.get_authentication_method argument is now optional.
Use of this method in non-regression tests.
Diffstat (limited to 'java')
-rw-r--r-- | java/src/c/com_entrouvert_lasso_LassoUser.c | 18 | ||||
-rw-r--r-- | java/src/java/com/entrouvert/lasso/LassoUser.java | 2 | ||||
-rw-r--r-- | java/tests/LoginTest.java | 11 |
3 files changed, 25 insertions, 6 deletions
diff --git a/java/src/c/com_entrouvert_lasso_LassoUser.c b/java/src/c/com_entrouvert_lasso_LassoUser.c index feacf71c..8881b41e 100644 --- a/java/src/c/com_entrouvert_lasso_LassoUser.c +++ b/java/src/c/com_entrouvert_lasso_LassoUser.c @@ -59,3 +59,21 @@ JNIEXPORT jstring JNICALL Java_com_entrouvert_lasso_LassoUser_dump return (*env)->NewStringUTF(env, result); } +JNIEXPORT jstring JNICALL Java_com_entrouvert_lasso_LassoUser_getAuthenticationMethod +(JNIEnv * env, jobject this, jstring _remoteProviderId){ + char *remoteProviderId = NULL; + char *result; + LassoUser* user; + + if (_remoteProviderId) + remoteProviderId = (char*)(*env)->GetStringUTFChars(env, _remoteProviderId, NULL); + + user = getCObject(env, this); + result = lasso_user_get_authentication_method(user, remoteProviderId); + + if (_remoteProviderId) + (*env)->ReleaseStringUTFChars(env, _remoteProviderId, remoteProviderId); + + return (*env)->NewStringUTF(env, result); +} + diff --git a/java/src/java/com/entrouvert/lasso/LassoUser.java b/java/src/java/com/entrouvert/lasso/LassoUser.java index 2e2256dc..b31345ed 100644 --- a/java/src/java/com/entrouvert/lasso/LassoUser.java +++ b/java/src/java/com/entrouvert/lasso/LassoUser.java @@ -40,5 +40,7 @@ public class LassoUser extends LassoObject { // LassoUser native public String dump(); + native public String getAuthenticationMethod(String remoteProviderId); + } // LassoUser diff --git a/java/tests/LoginTest.java b/java/tests/LoginTest.java index c15c59c1..c97a04d3 100644 --- a/java/tests/LoginTest.java +++ b/java/tests/LoginTest.java @@ -149,13 +149,12 @@ public class LoginTest extends TestCase { assertEquals(nameIdentifier, spLoginContext.getNameIdentifier()); // The user doesn't have any federation yet. assertEquals(0, spLoginContext.createUser(null)); - spUserContextDump = spLoginContext.getUser().dump(); + spUserContext = spLoginContext.getUser(); + assertNotNull(spUserContext); + spUserContextDump = spUserContext.dump(); assertNotNull(spUserContextDump); - response = (LassoResponse) spLoginContext.getResponse(); -// FIXME: I believe the instruction below is not clean enough for a binding. -// authenticationMethod = response.get_child( -// "AuthenticationStatement").get_attr_value("AuthenticationMethod") -// assertEquals(lasso.samlAuthenticationMethodPassword, authenticationMethod) + authenticationMethod = spUserContext.getAuthenticationMethod(null); + assertEquals(Lasso.samlAuthenticationMethodPassword, authenticationMethod); // Service provider logout. spContextDump = generateServiceProviderContextDump(); |