Skip to content

Commit a5d5384

Browse files
committed
Merge branch 'feature/api-v1.2' into develop
Conflicts: testwebapp/web/settings.properties
2 parents 8323edc + 2c4d056 commit a5d5384

File tree

7 files changed

+2746
-25
lines changed

7 files changed

+2746
-25
lines changed

build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
<property name="src.dir" location="src" />
1111
<property name="lib.dir" location="lib" />
12-
<property name="schema.file" location="schema/orcid-message-1.1.xsd" />
12+
<property name="schema.file" location="schema/orcid-message-1.2.xsd" />
1313

1414
<property name="build.dir" location=".build" />
1515
<property name="src.generated.dir" location="${build.dir}/generated" />
1616
<property name="compiled.dir" location="${build.dir}/classes" />
1717

1818
<property name="distribute.dir" location="distribute" />
1919
<property name="product.name" value="orcid-api-client" />
20-
<property name="release.level" value="0.1" />
20+
<property name="release.level" value="0.2" />
2121
<property name="distribute.jar.file"
2222
location="${distribute.dir}/${product.name}-${release.level}.jar" />
2323
<property name="distribute.zip.file"

mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/AuthorizationData.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public void createAccessToken() throws AccessTokenFormatException {
4848
.format("{ \n" //
4949
+ " \"access_token\":\"%s\", \n" //
5050
+ " \"token_type\":\"bearer\", \n" //
51-
+ " \"refresh_token\":\"bogus\", \n" //
5251
+ " \"expires_in\":628207503, \n" //
5352
+ " \"scope\":\"%s\", \n" //
5453
+ " \"orcid\":\"%s\" \n" //

mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/OauthTokenAction.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
* {
3737
* "access_token":"785e8e34-0f66-4c98-a138-c89bc8cb3886",
3838
* "token_type":"bearer",
39-
* "refresh_token":"5ecda111-b6f9-4bd4-a21d-153962eabca9",
4039
* "expires_in":628207503,
4140
* "scope":"/orcid-profile/read-limited",
4241
* "orcid":"0000-0003-3479-6011"
@@ -45,8 +44,8 @@
4544
* Scope is what was requested when the auth_code was created
4645
* </pre>
4746
*
48-
* token_type is hard-coded. Use hard-coded bogus values for refresh_token,
49-
* expires_in. Get scope and orcid from the authorization with this code.
47+
* token_type is hard-coded. Use hard-coded bogus value for expires_in. Get
48+
* scope and orcid from the authorization with this code.
5049
*
5150
* TODO: How do we respond if the authCode is not found?
5251
*/
@@ -90,12 +89,11 @@ private String accessTokenToJson() {
9089
"{ \n" //
9190
+ " \"access_token\":\"%s\", \n" //
9291
+ " \"token_type\":\"%s\", \n" //
93-
+ " \"refresh_token\":\"%s\", \n" //
9492
+ " \"expires_in\":%d, \n" //
9593
+ " \"scope\":\"%s\", \n" //
9694
+ " \"orcid\":\"%s\" \n" //
9795
+ "}", //
98-
at.getAccessToken(), at.getTokenType(), at.getRefreshToken(),
99-
at.getExpiresIn(), at.getScope(), at.getOrcid());
96+
at.getAccessToken(), at.getTokenType(), at.getExpiresIn(),
97+
at.getScope(), at.getOrcid());
10098
}
10199
}

mockorcidapp/web/WEB-INF/resources/0000-0003-3479-6011.profile.xml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<orcid-message xmlns="http://www.orcid.org/ns/orcid">
3-
<message-version>1.1</message-version>
3+
<message-version>1.2</message-version>
44
<orcid-profile type="user">
55
<orcid-identifier>
6-
<uri>http://sandbox-1.orcid.org/0000-0003-3479-6011</uri>
6+
<uri>http://sandbox.orcid.org/0000-0003-3479-6011</uri>
77
<path>0000-0003-3479-6011</path>
8-
<host>sandbox-1.orcid.org</host>
8+
<host>sandbox.orcid.org</host>
99
</orcid-identifier>
1010
<orcid-preferences>
1111
<locale>en</locale>
1212
</orcid-preferences>
1313
<orcid-history>
14-
<creation-method>website</creation-method>
14+
<creation-method>Direct</creation-method>
1515
<submission-date>2014-01-06T18:14:32.859Z</submission-date>
16-
<last-modified-date>2014-02-17T21:42:34.958Z</last-modified-date>
16+
<last-modified-date>2015-03-31T14:49:23.284Z</last-modified-date>
1717
<claimed>true</claimed>
18+
<verified-email>true</verified-email>
19+
<verified-primary-email>true</verified-primary-email>
1820
</orcid-history>
1921
<orcid-bio>
2022
<personal-details>
2123
<given-names>Sandbox-client</given-names>
2224
<family-name>Blake</family-name>
25+
<other-names visibility="public"/>
2326
</personal-details>
24-
<biography>A singer, a dancer, a middle-tier Java jockey</biography>
27+
<biography visibility="public">A singer, a dancer, a middle-tier Java jockey</biography>
28+
<researcher-urls visibility="public"/>
29+
<contact-details>
30+
<address>
31+
<country visibility="limited">US</country>
32+
</address>
33+
</contact-details>
34+
<external-identifiers/>
2535
</orcid-bio>
2636
<orcid-activities/>
2737
</orcid-profile>

0 commit comments

Comments
 (0)