diff --git a/api/base/schemas/social-schema.json b/api/base/schemas/social-schema.json index 97b9360698d..84dfcae000b 100644 --- a/api/base/schemas/social-schema.json +++ b/api/base/schemas/social-schema.json @@ -67,10 +67,6 @@ "academiaInstitution": { "description": "The academiaInstitution for the given user", "type": "string" - }, - "orcid": { - "description": "The orcid for the given user", - "type": "string" } }, "additionalProperties": false diff --git a/api_tests/users/views/test_user_detail.py b/api_tests/users/views/test_user_detail.py index 188a3593ee1..70bd2cfe810 100644 --- a/api_tests/users/views/test_user_detail.py +++ b/api_tests/users/views/test_user_detail.py @@ -453,7 +453,6 @@ def user_one(self): twitter='userOneTwitter', linkedIn='userOneLinkedIn', impactStory='userOneImpactStory', - orcid='userOneOrcid', researcherId='userOneResearcherId' ) ) @@ -508,7 +507,6 @@ def data_new_user_one(self, user_one): 'twitter': ['http://twitter.com/newtwitter'], 'linkedIn': ['https://www.linkedin.com/newLinkedIn'], 'impactStory': 'https://impactstory.org/newImpactStory', - 'orcid': 'http://orcid.org/newOrcid', 'researcherId': 'http://researcherid.com/rid/newResearcherId', }}, }} @@ -916,7 +914,6 @@ def test_partial_patch_user_logged_in(self, app, user_one, url_user_one): assert user_one.social['twitter'] in social['twitter'] assert user_one.social['linkedIn'] in social['linkedIn'] assert user_one.social['impactStory'] in social['impactStory'] - assert user_one.social['orcid'] in social['orcid'] assert user_one.social['researcherId'] in social['researcherId'] assert user_one.fullname == 'new_fullname' assert user_one.suffix == 'The Millionth' @@ -933,7 +930,6 @@ def test_patch_all_social_fields(self, app, user_one, url_user_one, mock_spam_he 'academiaProfileID': 'okokokok', 'ssrn': 'aaaa', 'impactStory': 'why not', - 'orcid': 'ork-id', 'researchGate': 'Why are there so many of these', 'researcherId': 'ok-lastone', 'academiaInstitution': 'Center for Open Science' @@ -1005,7 +1001,6 @@ def test_partial_patch_user_logged_in_no_social_fields( assert user_one.social['twitter'] in social['twitter'] assert user_one.social['linkedIn'] in social['linkedIn'] assert user_one.social['impactStory'] in social['impactStory'] - assert user_one.social['orcid'] in social['orcid'] assert user_one.social['researcherId'] in social['researcherId'] assert user_one.fullname == 'new_fullname' assert user_one.suffix == 'The Millionth' @@ -1056,7 +1051,6 @@ def test_put_user_logged_in(self, app, user_one, data_new_user_one, url_user_one assert 'newtwitter' in social['twitter'][0] assert 'newLinkedIn' in social['linkedIn'][0] assert 'newImpactStory' in social['impactStory'] - assert 'newOrcid' in social['orcid'] assert 'newResearcherId' in social['researcherId'] user_one.reload() assert user_one.fullname == data_new_user_one['data']['attributes']['full_name'] @@ -1069,7 +1063,6 @@ def test_put_user_logged_in(self, app, user_one, data_new_user_one, url_user_one assert 'newtwitter' in social['twitter'][0] assert 'newLinkedIn' in social['linkedIn'][0] assert 'newImpactStory' in social['impactStory'] - assert 'newOrcid' in social['orcid'] assert 'newResearcherId' in social['researcherId'] def test_update_user_sanitizes_html_properly( diff --git a/api_tests/users/views/test_user_exceptions.py b/api_tests/users/views/test_user_exceptions.py index 58b3e7c8a61..57bf35608ab 100644 --- a/api_tests/users/views/test_user_exceptions.py +++ b/api_tests/users/views/test_user_exceptions.py @@ -22,7 +22,6 @@ def user(self): twitter='userOneTwitter', linkedIn='userOneLinkedIn', impactStory='userOneImpactStory', - orcid='userOneOrcid', researcherId='userOneResearcherId' ) ) diff --git a/osf/external/chronos/chronos.py b/osf/external/chronos/chronos.py index 03835770615..fe53db1fbf9 100644 --- a/osf/external/chronos/chronos.py +++ b/osf/external/chronos/chronos.py @@ -103,7 +103,6 @@ def serialize_user(cls, user): 'GIVEN_NAME': user.given_name, 'FULLNAME': user.fullname, 'MIDDLE_NAME': user.middle_names, - 'ORCID_ID': user.social.get('orcid', None), 'PARTNER_USER_ID': user._id, 'SURNAME': user.family_name, } diff --git a/osf/models/user.py b/osf/models/user.py index 7612f9834c7..b6b891e41f1 100644 --- a/osf/models/user.py +++ b/osf/models/user.py @@ -344,7 +344,6 @@ class OSFUser(DirtyFieldsMixin, GuidMixin, BaseModel, AbstractBaseUser, Permissi # 'twitter': , # 'github': , # 'linkedIn': , - # 'orcid': , # 'researcherID': , # 'impactStory': , # 'scholar': , diff --git a/website/static/js/profile.js b/website/static/js/profile.js index 635d7e2ff44..3e706431bca 100644 --- a/website/static/js/profile.js +++ b/website/static/js/profile.js @@ -43,7 +43,6 @@ function urlRegex() { } var socialRules = { - orcid: /orcid\.org\/([-\d]+)/i, researcherId: /researcherid\.com\/rid\/([-\w]+)/i, scholar: /scholar\.google\.com\/citations\?user=(\w+)/i, twitter: /twitter\.com\/(\w+)/i, @@ -601,10 +600,6 @@ var SocialViewModel = function(urls, modes, preventUnsaved) { return true; }); - self.orcid = extendLink( - ko.observable().extend({trimmed: true, cleanup: cleanByRule(socialRules.orcid)}), - self, 'orcid', 'http://orcid.org/' - ); self.researcherId = extendLink( ko.observable().extend({trimmed: true, cleanup: cleanByRule(socialRules.researcherId)}), self, 'researcherId', 'http://researcherId.com/rid/' @@ -653,7 +648,6 @@ var SocialViewModel = function(urls, modes, preventUnsaved) { self.trackedProperties = [ self.profileWebsites, - self.orcid, self.researcherId, self.twitter, self.scholar, @@ -675,7 +669,6 @@ var SocialViewModel = function(urls, modes, preventUnsaved) { self.values = ko.computed(function() { return [ - {label: 'ORCID', text: self.orcid(), value: self.orcid.url()}, {label: 'ResearcherID', text: self.researcherId(), value: self.researcherId.url()}, {label: 'Twitter', text: self.twitter(), value: self.twitter.url()}, {label: 'GitHub', text: self.github(), value: self.github.url()}, diff --git a/website/templates/include/profile/social.mako b/website/templates/include/profile/social.mako index 752c77aba61..caca01de2fb 100644 --- a/website/templates/include/profile/social.mako +++ b/website/templates/include/profile/social.mako @@ -35,14 +35,6 @@ -
- -
- http://orcid.org/ - -
-
-
@@ -190,7 +182,6 @@