Merge branch 'main' into 8811-qa-change-required-to-registry-emails-f…

…ooter

CHANGELOG.md

@@ -1,3 +1,63 @@
+## v2.37.10 - 2023-08-11
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.9...v2.37.10)
+
+- [#6866](https://github.com/ORCID/ORCID-Source/pull/6866): Refactoring of the autospamcli so it can be run as scheduled or manual cli
+
+## v2.37.9 - 2023-08-11
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.8...v2.37.9)
+
+- [#6865](https://github.com/ORCID/ORCID-Source/pull/6865): Added pre tag to fix the new lines in the email footer
+
+## v2.37.8 - 2023-08-10
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.7...v2.37.8)
+
+- [#6864](https://github.com/ORCID/ORCID-Source/pull/6864): Transifex
+
+## v2.37.7 - 2023-08-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.6...v2.37.7)
+
+- [#6861](https://github.com/ORCID/ORCID-Source/pull/6861): Fix jackson problem
+
+## v2.37.6 - 2023-08-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.5...v2.37.6)
+
+- [#6860](https://github.com/ORCID/ORCID-Source/pull/6860): fix: Remove indentation added in ftl email locked
+
+### Fix
+
+- Remove indentation added in ftl email locked
+
+## v2.37.5 - 2023-08-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.4...v2.37.5)
+
+- [#6857](https://github.com/ORCID/ORCID-Source/pull/6857): fix: Count only default affiliation group
+
+### Fix
+
+- Count only default affiliation group
+
+## v2.37.4 - 2023-08-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.3...v2.37.4)
+
+- [#6858](https://github.com/ORCID/ORCID-Source/pull/6858): Remove the extra space between the Orcid team and the link
+
+## v2.37.3 - 2023-08-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.2...v2.37.3)
+
+- [#6856](https://github.com/ORCID/ORCID-Source/pull/6856): fix: Remove field from response if its private
+
+### Fix
+
+- Remove field from response if its private
+
 ## v2.37.2 - 2023-08-08
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.1...v2.37.2)

orcid-core/src/main/java/org/orcid/core/utils/v3/SourceUtils.java

@@ -1,7 +1,5 @@
 package org.orcid.core.utils.v3;
 
-import java.util.List;
-
 import org.orcid.core.manager.SourceNameCacheManager;
 import org.orcid.jaxb.model.record.bulk.BulkElement;
 import org.orcid.jaxb.model.v3.release.common.Source;
@@ -46,6 +44,8 @@
 import org.orcid.jaxb.model.v3.release.record.summary.Works;
 import org.orcid.pojo.ajaxForm.PojoUtil;
 
+import java.util.List;
+
 public class SourceUtils {
     private SourceNameCacheManager sourceNameCacheManager;
 
@@ -317,4 +317,8 @@ public static boolean isSelfAsserted(Source source, String orcid) {
             return true;
         }
     }
+
+    public static boolean isSelfAsserted(String source, String orcid) {
+        return !orcid.equals(source);
+    }
 }

orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java

@@ -1,12 +1,10 @@
 package org.orcid.pojo.summary;
 
 import org.orcid.core.utils.v3.SourceUtils;
-import org.orcid.jaxb.model.v3.release.common.FuzzyDate;
+import org.orcid.pojo.ajaxForm.AffiliationForm;
+import org.orcid.pojo.ajaxForm.Date;
 import org.orcid.pojo.ajaxForm.PojoUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class AffiliationSummary {
     public String organizationName;
     public String url;
@@ -72,22 +70,12 @@ public void setValidated(boolean validated) {
         this.validated = validated;
     }
 
-    public static List<AffiliationSummary> valueOf(List<org.orcid.jaxb.model.v3.release.record.summary.AffiliationSummary> affiliationGroupForms, String orcid, String type) {
-        List<AffiliationSummary> affiliationSummaries = new ArrayList<>();
-
-        affiliationGroupForms.forEach(affiliationGroupForm -> {
-            affiliationSummaries.add(AffiliationSummary.valueOf(affiliationGroupForm, orcid, type));
-        });
-
-        return affiliationSummaries;
-    }
-
-    public static AffiliationSummary valueOf(org.orcid.jaxb.model.v3.release.record.summary.AffiliationSummary as, String orcid, String type) {
+    public static AffiliationSummary valueOf(AffiliationForm as, String orcid, String type) {
         AffiliationSummary form = new AffiliationSummary();
 
         if (as != null) {
-            if (as.getOrganization() != null && as.getOrganization().getName() != null && as.getOrganization().getName().trim().length() != 0) {
-                form.setOrganizationName(as.getOrganization().getName());
+            if (!PojoUtil.isEmpty(as.getAffiliationName())) {
+                form.setOrganizationName(as.getAffiliationName().getValue());
             }
 
             if (!PojoUtil.isEmpty(as.getUrl())) {
@@ -103,7 +91,7 @@ public static AffiliationSummary valueOf(org.orcid.jaxb.model.v3.release.record.
             }
 
             if (!PojoUtil.isEmpty(as.getRoleTitle())) {
-                form.setRole(as.getRoleTitle());
+                form.setRole(as.getRoleTitle().getValue());
             }
 
             form.setType(type);
@@ -115,7 +103,7 @@ public static AffiliationSummary valueOf(org.orcid.jaxb.model.v3.release.record.
         return form;
     }
 
-    private static String getDate(FuzzyDate date) {
-        return date != null ? date.toString() : null;
+    private static String getDate(Date date) {
+        return date != null ? date.toFuzzyDate().toString() : null;
     }
 }

orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java

@@ -3,7 +3,11 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
 public class RecordSummary {
+    @JsonInclude(Include.NON_NULL)
     private String name;
     private String orcid;
     private List<AffiliationSummary> employmentAffiliations;

orcid-core/src/main/resources/i18n/about_pl.properties

@@ -13,7 +13,7 @@ home.info=INFORMACJE
 home.enhance_your=Wzbogać swój rekord ORCID o informacje zawodowe i łącza do innych identyfikatorów (takich jak Scopus, ResearcherID lub LinkedIn).
 home.three=3
 home.user_your=UŻYJ
-home.orcid_id=Identyfikator ORCID
+home.orcid_id=ORCID ID
 home.include_your=Umieść identyfikator ORCID na swojej stronie internetowej, kiedy przesyłasz publikacje, ubiegasz się o granty i w każdym przepływie pracy badawczej, aby mieć pewność, że Twój wkład zostanie odnotowany.
 home.members_make=ORCID MOŻE DZIAŁAĆ DZIĘKI NASZYM CZŁONKOM!
 home.orcid_is=ORCID jest organizacją non-profit wspieraną przez globalną społeczność organizacji członkowskich, w tym organizacje badawcze, wydawców, sponsorów, stowarzyszenia zawodowe i innych interesariuszy ekosystemu badawczego.

orcid-core/src/main/resources/i18n/email2faDisabled_ar.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=إذا كانت لديك أي أسئلة أخ
 email.2fa_disabled.if_you_received=إذا تلقيت هذا البريد الإلكتروني ولكنك لم تقم بتعطيل المصادقة الثنائية، فقد يكون حسابك قد تعرض للاختراق. يرجى الاتصال على الفور بالدعم على https://support.orcid.org/hc/en-us/requests/new.
 email.2fa_disabled.more_info=إذا كانت لديك أي أسئلة أخرى أو كنت بحاجة إلى المساعدة، يرجى زيارة قاعدة المعارف الخاصة بنا على https://support.orcid.org/hc/en-us/articles/360006971673 أو الاتصال بالدعم على https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=تم تعطيل المصادقة الثنائية في سجلك على ORCID. هذا يعني أننا لن نطلب بعد الآن رمز المصادقة الخاص بك عند تسجيل الدخول إلى ORCID.

orcid-core/src/main/resources/i18n/email2faDisabled_cs.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Pokud máte jakékoli další otázky nebo pot
 email.2fa_disabled.if_you_received=Pokud jste obdrželi tento e-mail, ale nezakázali jste dvoufázové ověření, mohlo dojít k prolomení vašeho účtu. Kontaktujte prosím neodkladně podporu na https://support.orcid.org/hc/en-us/requests/new.
 email.2fa_disabled.more_info=Pokud máte jakékoli další otázky nebo potřebujete pomoc, navštivte naši Znalostní bázi na adrese https://support.orcid.org/hc/en-us/articles/360006971673 nebo nás kontaktujte na adrese https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=Dvojité ověření pro váš účet ORCID bylo deaktivováno. To znamená, že při přihlašování k ORCID již nebudeme požadovat ověřovací kód.

orcid-core/src/main/resources/i18n/email2faDisabled_de.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Wenn Sie weitere Fragen haben oder Hilfe benö
 email.2fa_disabled.if_you_received=Wenn Sie diese E-Mail erhalten haben, aber die Zwei-Faktor-Authentifizierung nicht deaktiviert haben, wurde Ihr Konto möglicherweise kompromittiert. Bitte wenden Sie sich umgehend an den Support unter https://support.orcid.org/hc/en-us/requests/new.
 email.2fa_disabled.more_info=Wenn Sie weitere Fragen haben oder Hilfe benötigen, besuchen Sie bitte unsere Wissensdatenbank unter  https://support.orcid.org/hc/en-us/articles/360006971673 oder kontaktieren Sie den Support unter https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=Die Zwei-Faktor-Authentifizierung wurde für Ihren ORCID-Eintrag deaktiviert. Das bedeutet, dass wir Sie nicht mehr nach Ihrem Authentifizierungs-Code fragen werden, wenn Sie sich bei ORCID anmelden.

orcid-core/src/main/resources/i18n/email2faDisabled_es.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=SI tienes cualquier duda o necesitas ayuda, ec
 email.2fa_disabled.if_you_received=Si has recibido este correo pero no has desactivado la autenticación de dos factores puede ser que alguien haya accedido indebidamente a tu cuenta. Ponte en contacto con el servicio de soporte en https://support.orcid.org/hc/en-us/requests/new de inmediato.
 email.2fa_disabled.more_info=Si tienes cualquier otra pregunta o necesitas ayuda respecto a cualquier otro asunto, visita nuestra base de conocimiento en https://support.orcid.org/hc/en-us/articles/360006971673 o contacta a support at https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=Se ha desactivado la autenticación de dos factores en su registro ORCID. Esto significa que ya no le pediremos su código de autenticación cuando acceda a ORCID.

orcid-core/src/main/resources/i18n/email2faDisabled_fr.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Si vous avez d'autres questions ou si vous ave
 email.2fa_disabled.if_you_received=Si vous avez reçu cet e-mail alors que vous n'avez pas désactivé l'authentification à deux facteurs, il se peut que votre compte ait été compromis. Veuillez contacter immédiatement l'assistance clientèle sur https://support.orcid.org/hc/en-us/requests/new.
 email.2fa_disabled.more_info=Si vous avez d'autres questions ou si vous avez besoin d'aide, veuillez consulter notre base de connaissances à l'adresse https://support.orcid.org/hc/en-us/articles/360006971673 ou contacter le support via la page https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=L'authentification à deux facteurs a été désactivée dans votre dossier ORCID. Cela signifie que nous ne vous demanderons plus votre code d'authentification quand vous vous connecterez à ORCID.

orcid-core/src/main/resources/i18n/email2faDisabled_it.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Se hai altre domande o hai bisogno di aiuto, p
 email.2fa_disabled.if_you_received=Se hai ricevuto questa email ma non hai disabilitato l'autenticazione a due fattori, il tuo account potrebbe essere stato compromesso. Ti preghiamo di contattare immediatamente l'assistenza su https://support.orcid.org/hc/en-us/requests/new.
 email.2fa_disabled.more_info=Se hai altre domande o hai bisogno di aiuto, per favore visita la nostra Base di Conoscenza a https://support.orcid.org/hc/en-us/articles/360006971673 o contatta il supporto a https://support.orcid.org/hc/en us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=L’autenticazione a due fattori è stata disattivata sul tuo profilo ORCID. Di conseguenza non ti chiederemo più il codice di autenticazione quando accederai a ORCID.

orcid-core/src/main/resources/i18n/email2faDisabled_ja.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=他に不明な点がある場合やサポー
 email.2fa_disabled.if_you_received=2要素認証を無効にした覚えがないにもかかわらずこのメールが届いた場合は、あなたのアカウントが乗っ取られている可能性があります。すぐに https://support.orcid.org/hc/en-us/requests/new からサポートにご連絡ください。
 email.2fa_disabled.more_info=他に質問がある場合やサポートが必要な場合は、ナレッジベース（https://support.orcid.org/hc/en-us/articles/360006971673）にアクセスするか、（https://support.orcid.org/hc/en-us/requests/new）からサポートにご連絡ください。
 
+email.2fa_disabled.two_factor_disabled=お使いのORCIDレコードで2要素認証が無効になりました。今後、ORCIDにサインインする際に認証コードを入力する必要はありません。

orcid-core/src/main/resources/i18n/email2faDisabled_ko.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=기타 질문이 있거나 도움이 필요한
 email.2fa_disabled.if_you_received=본 이메일을 받았지만 2-펙터 인증을 비활성화하신 적이 없을 경우, 귀하의 계정이 탈취당한 것일 수 있습니다. 다음 주소를 통해 지원 팀에 연락해 주십시오: https://support.orcid.org/hc/en-us/requests/new immediately.
 email.2fa_disabled.more_info=기타 질문이 있거나 도움이 필요한 경우, 당사의 지식 센터(https://support.orcid.org/hc/en-us/articles/360006971673)를 방문하거나 지원 부서(https://support.orcid.org/hc/en-us/requests/new)에 연락해 주시기 바랍니다. 
 
+email.2fa_disabled.two_factor_disabled=귀하의 ORCID 레코드에 2단계 인증이 비활성화되어 있습니다. 따라서, ORCID에 로그인할 때 인증 코드를 묻지 않습니다.

orcid-core/src/main/resources/i18n/email2faDisabled_pl.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Jeśli masz inne pytania lub potrzebujesz pomo
 email.2fa_disabled.if_you_received=Jeśli otrzymujesz tę wiadomość e-mail, ale nie wyłączano uwierzytelniania dwuskładnikowego, Twoje konto mogło zostać przejęte. Skontaktuj się niezwłocznie z pomocą techniczną pod adresem https://support.orcid.org/hc/en-us/requests/new.
 email.2fa_disabled.more_info=Jeśli masz inne pytania lub potrzebujesz pomocy, odwiedź naszą Bazę wiedzy pod adresem https://support.orcid.org/hc/en-us/articles/360006971673 lub skontaktuj się z pomocą techniczną pod adresem https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=Uwierzytelnianie dwuskładnikowe zostało wyłączone w Twoim rekordzie ORCID. Oznacza to, że nie będziemy już prosić o podanie kodu uwierzytelniającego podczas logowania do ORCID.

orcid-core/src/main/resources/i18n/email2faDisabled_pt.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Se tiver quaisquer perguntas ou se precisar de
 email.2fa_disabled.if_you_received=Se recebeu este e-mail, mas não desativou a autenticação de dois fatores, a segurança da sua conta poderá estar comprometida. Por favor, contacte o serviço de apoio em https://support.orcid.org/hc/en-us/requests/new immediately.
 email.2fa_disabled.more_info=Se tem mais alguma questão ou se necessita de ajuda, queira visitar a nossa Base de dados de conhecimento em https://support.orcid.org/hc/en-us/articles/360006971673 ou contacte o serviço de apoio em https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=A autenticação de dois fatores foi desativada no seu registo ORCID. Isto significa que já não lhe solicitaremos o seu código de autenticação quando iniciar a sessão no ORCID.

orcid-core/src/main/resources/i18n/email2faDisabled_ru.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Если у Вас есть какие-либ
 email.2fa_disabled.if_you_received=Если Вы получили это письмо, но не отключали двухфакторную аутентификацию, Ваша учетная запись может быть скомпрометирована. Пожалуйста, немедленно свяжитесь со службой поддержки по адресу https://support.orcid.org/hc/en-us/requests/new.
 email.2fa_disabled.more_info=Если у Вас есть какие-либо другие вопросы или Вы нуждаетесь в помощи, посетите, пожалуйста, нашу Базу Знаний по адресу https://support.orcid.org/hc/en-us/articles/360006971673 либо свяжитесь со службой поддержки по адресу https://support.orcid.org/hc/en-us/requests/new.
 
+email.2fa_disabled.two_factor_disabled=Двухфакторная аутентификация для вашего профиля ORCID отключена. Это означает, что мы больше не будем запрашивать у вас код аутентификации при входе в систему. 

orcid-core/src/main/resources/i18n/email2faDisabled_tr.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=Başka sorularınız varsa veya yardıma ihtiy
 email.2fa_disabled.if_you_received=Bu e-postayı aldıysanız ancak iki faktörlü kimlik doğrulamayı devre dışı bırakmadıysanız hesabınızın güvenliği ihlal edilmiş olabilir. Lütfen hemen https://support.orcid.org/hc/en-us/requests/new adresinden destek ekibiyle iletişime geçin.
 email.2fa_disabled.more_info=Başka sorularınız varsa veya yardıma ihtiyacınız varsa lütfen https://support.orcid.org/hc/en-us/articles/360006971673 adresindeki Bilgi Tabanımızı ziyaret edin veya https://support.orcid.org/hc/en-us/requests/new adresinden destek ekibiyle iletişime geçin.
 
+email.2fa_disabled.two_factor_disabled=İki faktörlü kimlik doğrulama, ORCID kaydınızda devre dışı bırakıldı. Bu, ORCID'e giriş yaparken doğrulama kodunuzu artık istemeyeceğimiz anlamına geliyor.

orcid-core/src/main/resources/i18n/email2faDisabled_zh_CN.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=如有任何疑问或需要帮助，请访问
 email.2fa_disabled.if_you_received=如果您收到此电子邮件，但并未禁用双因素身份验证，则您的帐户可能已遭到入侵。请立即转到  https://support.orcid.org/hc/en-us/requests/new 与支持部门联系。
 email.2fa_disabled.more_info=如有任何疑问或需要帮助，请转到 https://support.orcid.org/hc/en-us/articles/360006971673 访问我们的我们的知识库或转到 https://support.orcid.org/hc/en-us/requests/new 与支持部门联系。
 
+email.2fa_disabled.two_factor_disabled=您的 ORCID 记录已禁用两因素验证。这意味着您登录 ORCID 时，我们将不再要求您提供验证码。

orcid-core/src/main/resources/i18n/email2faDisabled_zh_TW.properties

@@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=如果您有任何其他問題或是需要幫
 email.2fa_disabled.if_you_received=如果您收到這電子郵件但是沒有停用兩因素認證，您的帳號可能已遭入侵。請立即聯絡在 https://support.orcid.org/hc/en-us/requests/new 的支援單位。
 email.2fa_disabled.more_info=如果您有任何其他問題或是需要幫助，請造訪我們在 https://support.orcid.org/hc/en-us/articles/360006971673 的知識庫，或是聯絡在 https://support.orcid.org/hc/en-us/requests/new 的支援單位。
 
+email.2fa_disabled.two_factor_disabled=您的 ORCID 記錄已停用雙因素驗證。這表示當您登入 ORCID 時，我們將不再要求您提供驗證碼。

orcid-core/src/main/resources/i18n/email_common_ar.properties

@@ -59,3 +59,4 @@ email.common.email.preferences=تفضيلات البريد الإلكتروني
 email.common.privacy_policy=سياسة خاصة
 email.common.address1=شركة الهوية المفتوحة للباحثين والمساهمين
 email.common.address2=شارع موتور سيتي 10411، جناح 750، بيثيسدا، ماريلاند 20817، الولايات المتحدة الأمريكية
+email.common.received_email_as_service=لقد تلقيتَ رسالة البريد الإلكتروني هذا كإعلان خدمة متعلق بحسابك على ORCID

orcid-core/src/main/resources/i18n/email_common_cs.properties

@@ -59,3 +59,4 @@ email.common.email.preferences=předvolby e-mailu
 email.common.privacy_policy=zásady ochrany soukromí
 email.common.address1=ORCID, Inc.
 email.common.address2=10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA
+email.common.received_email_as_service=Tento e-mail jste obdrželi v souvislosti s vaším účtem ORCID.