Merge remote-tracking branch 'origin/develop' into 4351-clean-html-co…

…mments
IQSS · Dec 6, 2017 · cf80af3 · cf80af3
2 parents 6f1ef61 + ef7dce7
commit cf80af3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid-sandbox.json b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid-sandbox.json
@@ -3,6 +3,6 @@
     "factoryAlias":"oauth2",
     "title":"ORCID",
     "subtitle":"",
-    "factoryData":"type: orcid | userEndpoint: https://api.sandbox.orcid.org/v2.0/{ORCID}/record | clientId: FIXME | clientSecret: FIXME",
+    "factoryData":"type: orcid | userEndpoint: https://api.sandbox.orcid.org/v2.0/{ORCID}/person | clientId: FIXME | clientSecret: FIXME",
     "enabled":true
 }
diff --git a/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid.json b/doc/sphinx-guides/source/_static/installation/files/root/auth-providers/orcid.json
@@ -3,6 +3,6 @@
     "factoryAlias":"oauth2",
     "title":"ORCID",
     "subtitle":"",
-    "factoryData":"type: orcid | userEndpoint: https://api.orcid.org/v2.0/{ORCID}/record | clientId: FIXME | clientSecret: FIXME",
+    "factoryData":"type: orcid | userEndpoint: https://api.orcid.org/v2.0/{ORCID}/person | clientId: FIXME | clientSecret: FIXME",
     "enabled":true
 }
diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py
@@ -64,9 +64,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.8.3'
+version = '4.8.4'
 # The full version, including alpha/beta/rc tags.
-release = '4.8.3'
+release = '4.8.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/sphinx-guides/source/index.rst b/doc/sphinx-guides/source/index.rst
@@ -3,10 +3,10 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Dataverse 4.8.3 Guides
+Dataverse 4.8.4 Guides
 ======================
 
-These guides are for the most recent version of Dataverse. For the guides for **version 4.8.2** please go `here <http://guides.dataverse.org/en/4.8.2/>`_.
+These guides are for the most recent version of Dataverse. For the guides for **version 4.8.3** please go `here <http://guides.dataverse.org/en/4.8.3/>`_.
 
 .. toctree::
   :glob:

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>edu.harvard.iq</groupId>
     <artifactId>dataverse</artifactId>
-    <version>4.8.3</version>
+    <version>4.8.4</version>
     <packaging>war</packaging>
 
     <name>dataverse</name>

diff --git a/scripts/database/upgrades/upgrade_v4.8.3_to_v4.8.4.sql b/scripts/database/upgrades/upgrade_v4.8.3_to_v4.8.4.sql
@@ -0,0 +1,2 @@
+-- Google login has used 131 characters. 64 is not enough.
+ALTER TABLE oauth2tokendata ALTER COLUMN accesstoken TYPE text;
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenData.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2TokenData.java
@@ -18,6 +18,13 @@
  * user's access token for the remote system, as well as additional data,
  * such as refresh token and expiry date.
  * 
+ * Persisting token data is a requirement for ORCID according to
+ * https://members.orcid.org/api/news/xsd-20-update which says "Store full
+ * responses from token exchange: access tokens, refresh tokens, scope, scope
+ * expiry to indicate an iD has been authenticated and with what scope" but we
+ * don't know how long responses need to be stored. There is no such requirement
+ * to store responses for any other OAuth provider.
+ *
  * @author michael
  */
 @NamedQueries({
@@ -41,7 +48,11 @@ public class OAuth2TokenData implements Serializable {
 
     private Timestamp expiryDate;
 
-    @Column(length = 64)
+    /**
+     * "Please don't put a maximum size on the storage for an access token" at
+     * https://stackoverflow.com/questions/4408945/what-is-the-length-of-the-access-token-in-facebook-oauth2/16365828#16365828
+     */
+    @Column(columnDefinition = "TEXT")
     private String accessToken;
 
     @Column(length = 64)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- Google login has used 131 characters. 64 is not enough.
		ALTER TABLE oauth2tokendata ALTER COLUMN accesstoken TYPE text;