litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2819 Profile matching wasn't working when creating a new account.

Browse source
This commit is contained in:
j2blake 2011-07-07 15:53:58 +00:00
parent 9d3cfcba69
commit ce743ce79e
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java
View file

@ -26,8 +26,11 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
* Is somebody already using it (other than ourselves)? Does it match an * Is somebody already using it (other than ourselves)? Does it match an
* existing Profile? Neither? * existing Profile? Neither?
* *
* If the userAccountUri or the externalAuthId is empty, or if there is any * If we are creating a new account, the userAccountUri will be empty, so if
* error, say "neither". * someone is using the externalAuthID, their URI won't match ours, which is
* what we want.
*
* If the externalAuthId is empty, or if there is any error, say "neither".
*/ */
class ExternalAuthChecker extends AjaxResponder { class ExternalAuthChecker extends AjaxResponder {
private static final Log log = LogFactory.getLog(ExternalAuthChecker.class); private static final Log log = LogFactory.getLog(ExternalAuthChecker.class);
@ -97,11 +100,6 @@ class ExternalAuthChecker extends AjaxResponder {
} }
private void checkForMatchingProfile() { private void checkForMatchingProfile() {
if (userAccountUri.isEmpty()) {
log.debug("userAccountUri is empty");
return;
}
List<Individual> inds = SelfEditingConfiguration.getBean(vreq) List<Individual> inds = SelfEditingConfiguration.getBean(vreq)
.getAssociatedIndividuals(indDao, externalAuthId); .getAssociatedIndividuals(indDao, externalAuthId);
if (inds.isEmpty()) { if (inds.isEmpty()) {