Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6757cee
added orcid authentication incl profile creation
bkampe Feb 18, 2026
c906861
disabled automatic account and profile creation
bkampe Apr 8, 2026
6c59eae
avoid flexible whitespace matching
bkampe Apr 20, 2026
1db5fc3
corrected lexicographical order for imports
bkampe Apr 20, 2026
f4435f7
corrected styles
bkampe Apr 20, 2026
e68a15c
removed gson dependency and use jackson instead
bkampe May 6, 2026
b2ec93e
cleanup - removed unused code
bkampe May 19, 2026
3c70030
ORCID spelling correction
bkampe May 19, 2026
e2731f3
removed hardcoded localhost path
bkampe May 20, 2026
11212aa
Update api/src/main/java/org/vivoweb/webapp/controller/freemarker/Orc…
bkampe Jun 1, 2026
6366242
cleanup - removed unused code
bkampe Jun 1, 2026
93b4077
Merge branch 'orcid-auth' of github.com:bkampe/VIVO into orcid-auth
bkampe Jun 1, 2026
db3dd25
removed unused templates
bkampe Jun 3, 2026
bebbcba
use unknown profile message for non existing account
bkampe Jun 3, 2026
c6b2ad5
removed orcid login button
bkampe Jun 3, 2026
3bcb376
use the existing orcid parameters from runtime.properties
bkampe Jun 4, 2026
cbac0c3
check for profile whose vivo:orcidId matches the orcidToken.orcid and…
bkampe Jun 5, 2026
5b634e1
added option to enable/disable orcid authentication via runtime.prope…
bkampe Jun 9, 2026
7c19a82
typo correction
bkampe Jun 9, 2026
d0c1bcf
typo correction
bkampe Jun 9, 2026
a1c51a0
only persons associated with user accounts are returned
bkampe Jun 16, 2026
dac458a
check for http and https ORCID URIs
bkampe Jun 16, 2026
1005f61
some code correction and simplification
bkampe Jun 19, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@
<artifactId>orcid-api-client</artifactId>
<version>0.6.4</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
Comment thread
bkampe marked this conversation as resolved.
Outdated
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,15 @@ uil-data:menu_login.VIVO.wilma
uil:hasPackage "VIVO-languages" ;
uil:hasTheme "wilma" .

uil-data:menu_login_orcid.VIVO.wilma
rdf:type owl:NamedIndividual ;
rdf:type uil:UILabel ;
rdfs:label "Log in via ORCiD"@en-US ;
Comment thread
bkampe marked this conversation as resolved.
Outdated
uil:hasApp "VIVO" ;
uil:hasKey "menu_login_orcid" ;
uil:hasPackage "VIVO-languages" ;
uil:hasTheme "wilma" .

uil-data:intro_title.VIVO.wilma
rdf:type owl:NamedIndividual ;
rdf:type uil:UILabel ;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<style>
Comment thread
bkampe marked this conversation as resolved.
Outdated
.claim-for {
float: right;
border: 2px solid #3e8baa; /* #E0E0E0; */
padding: 5px;
}
.claim-for h3 {
text-align: center;
}
</style>
<#if newAccount>
<h2>Welcome ${profileName}</h2>
<#else>
<h2>Welcome back, ${profileName}</h2>
</#if>
<br />
<#if externalIds??>
<p>We found works for you to claim. For each work, you will have an opportunity to indicate your role in the work.</p>
<p><b>There are ${externalCount} work<#if externalCount != 1>s</#if> to claim.</b></p>
<p>Click the "Claim these works" to claim the works. Click Cancel if you do not wish to claim works at this time.</p>
<form action="${urls.base}/createAndLink/doi" method="post">
<input type="hidden" name="externalIds" value="${externalIds}" />
<input type="hidden" name="action" value="findID" />
<input type="hidden" name="profileUri" value="${profileUri!}" />
<input type="submit" class="submit" value="Claim these works" /> <a href="${profileUrl(profileUri)}">Cancel</a>
</form>
<#else>
<#if newAccount>
<p>We can automatically populate your account with any public works in your ORCiD profile that have a DOI.</p>
<p>We did not find any works to import at this time.</p>
<p>If you have works that you would like to have imported, please ensure that they have DOIs, and are set to public. Then log in again.</p>
<p>You can also claim additional works by DOI or PubMed ID at any time by using the claim buttons on your profile.</p>
</#if>
<a href="${profileUrl(profileUri)}">Go To My Profile</a>
</#if>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h2>ORCiD Profile is not Public</h2>
Comment thread
bkampe marked this conversation as resolved.
Outdated
<p>Thank you for your interest in OpenVIVO.</p>
<p>Unfortunately, your ORCiD profile is not public, so we can not read the necessary details to create an account.</p>
<p>Please make your ORCiD profile public, and then log in to OpenVIVO again.</p>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h2>Not Authenticated</h2>
<#if message?has_content>
<p>${message}</p>
</#if>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<p>You have to accept this agreement to register an account</p>
Comment thread
bkampe marked this conversation as resolved.
Outdated
<form action="${urls.base}/orcidAuth/callback" method="post">
<input type="hidden" name="json_token" value='${json_token}' />
<input type="checkbox" name="agreements" id="agreements" style="float: left; margin-right: 10px" required>
<#assign data_protection_url="${urls.base}/dataprotection" >
<label for="agreements">${i18n().registration_agreement(data_protection_url)}
</label>
<input type="submit" class="submit" value="Register">
</form>

Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ menu_welcomestart = Welcome

menu_logout = Log out
menu_login = Log in
menu_login_orcid = Log in via ORCiD
Comment thread
bkampe marked this conversation as resolved.
Outdated
menu_loginfull = Log in to manage this site

identity_title = VIVO | connect share discover
Expand Down
1 change: 1 addition & 0 deletions webapp/src/main/webapp/themes/wilma/templates/identity.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

<#else>
<li role="listitem"><a class="log-out" title="${i18n().menu_loginfull}" href="${urls.login}">${i18n().menu_login}</a></li>
<li role="listitem"><a class="log-out" title="${i18n().menu_loginfull}" href="http://localhost:8080/orcid_auth_war/orcidAuth">${i18n().menu_login_orcid}</a></li>
Comment thread
bkampe marked this conversation as resolved.
Outdated
</#if>
</ul>

Expand Down
Loading