Merge pull request #9246 from CitizenLabDotCo/master

Release 2024-10-29
CitizenLabDotCo · Oct 29, 2024 · 8b532ab · 8b532ab
2 parents 0903a33 + 2033261
commit 8b532ab
Show file tree

Hide file tree

Showing 46 changed files with 318 additions and 140 deletions.
diff --git a/back/Gemfile.lock b/back/Gemfile.lock
@@ -1021,7 +1021,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rexml (3.3.7)
+    rexml (3.3.9)
     rgeo (3.0.1)
     rgeo-activerecord (7.0.1)
       activerecord (>= 5.0)

diff --git a/back/engines/commercial/id_clave_unica/app/lib/id_clave_unica/clave_unica_verification.rb b/back/engines/commercial/id_clave_unica/app/lib/id_clave_unica/clave_unica_verification.rb
@@ -51,9 +51,5 @@ def locked_attributes
     def locked_custom_fields
       []
     end
-
-    def enabled_for_verified_actions?
-      config[:enabled_for_verified_actions] || false
-    end
   end
 end
diff --git a/back/engines/commercial/id_criipto/app/lib/id_criipto/criipto_verification.rb b/back/engines/commercial/id_criipto/app/lib/id_criipto/criipto_verification.rb
@@ -19,6 +19,10 @@ def name
       'criipto'
     end
 
+    def ui_method_name
+      config[:ui_method_name].presence || name
+    end
+
     def name_for_hashing
       config[:method_name_for_hashing].presence || config[:identity_source].presence || super
     end
@@ -36,6 +40,7 @@ def config_parameters
         uid_field_pattern
         method_name_for_hashing
         minimum_age
+        enabled_for_verified_actions
       ]
     end
 
@@ -82,6 +87,11 @@ def config_parameters_schema
           private: true,
           type: 'integer',
           description: 'Minimum age required to verify (in years). No value means no age minimum.'
+        },
+        enabled_for_verified_actions: {
+          private: true,
+          type: 'boolean',
+          description: 'Whether this verification method should be enabled for verified actions.'
         }
       }
     end

diff --git a/back/engines/commercial/id_keycloak/app/lib/id_keycloak/keycloak_verification.rb b/back/engines/commercial/id_keycloak/app/lib/id_keycloak/keycloak_verification.rb
@@ -69,10 +69,6 @@ def updateable_user_attrs
       super + %i[first_name last_name]
     end
 
-    def enabled_for_verified_actions?
-      config[:enabled_for_verified_actions] || false
-    end
-
     def ui_method_name
       config[:ui_method_name] || name
     end

diff --git a/back/engines/commercial/id_nemlog_in/app/lib/id_nemlog_in/nemlog_in_verification.rb b/back/engines/commercial/id_nemlog_in/app/lib/id_nemlog_in/nemlog_in_verification.rb
@@ -83,10 +83,6 @@ def check_entitled_on_sso?
       true
     end
 
-    def enabled_for_verified_actions?
-      config[:enabled_for_verified_actions] || false
-    end
-
     def ui_method_name
       'NemLog-in'
     end

diff --git a/back/engines/commercial/verification/app/models/verification/verification_method.rb b/back/engines/commercial/verification/app/models/verification/verification_method.rb
@@ -17,5 +17,9 @@ def config
         .symbolize_keys
         .presence
     end
+
+    def enabled_for_verified_actions?
+      config[:enabled_for_verified_actions] || false
+    end
   end
 end
diff --git a/back/engines/free/email_campaigns/config/locales/de-DE.yml b/back/engines/free/email_campaigns/config/locales/de-DE.yml
@@ -544,7 +544,7 @@ de:
       title_basket_submitted: 'Sie haben erfolgreich abgestimmt'
       event_description: 'Vielen Dank für Ihre Teilnahme. Ihre Stimmen wurden aufgezeichnet. Besuchen Sie die Plattform von %{organizationName}, um Ihre Stimmen zu sehen und zu verwalten.'
       cta_see_votes_submitted: 'Siehe abgegebene Stimmen'
-      cta_message: 'Klicken Sie auf die Schaltfläche unten, um teilzunehmen'
+      cta_message: 'Klicken Sie auf den Button unten, um teilzunehmen'
     native_survey_not_submitted:
       subject: '%{organizationName}: Fast geschafft! Reichen Sie Ihre Antworten ein'
       preheader: 'Sie haben Ihre Umfrageantwort nicht auf der Teilnahmeplattform von %{organizationName}ausgefüllt.'

diff --git a/front/app/component-library/components/IconButton/index.tsx b/front/app/component-library/components/IconButton/index.tsx
@@ -43,6 +43,7 @@ const StyledBox = styled(Box)<{
 
 export type IconButtonProps = {
   className?: string;
+  id?: string;
   iconName: IconNames;
   // Provide a description that describes the button's task
   // E.g. close idea page modal
@@ -68,6 +69,7 @@ export type IconButtonProps = {
 
 const IconButton = ({
   className,
+  id,
   iconName,
   onClick,
   a11y_buttonActionMessage,
@@ -88,6 +90,7 @@ const IconButton = ({
     <StyledBox
       as="button"
       className={className ?? ''}
+      id={id}
       onClick={onClick}
       iconColorOnHover={iconColorOnHover}
       aria-expanded={ariaExpanded}

diff --git a/front/app/components/ConsentManager/ConsentManager.test.tsx b/front/app/components/ConsentManager/ConsentManager.test.tsx
@@ -118,7 +118,7 @@ describe('<ConsentManager />', () => {
       });
     });
 
-    it('rejects all cookies except functional if preference modal is openend and confirmed without changes', () => {
+    it('rejects all cookies except functional if preference modal is opened and confirmed without changes', () => {
       const { container } = render(<ConsentManager />);
       fireEvent.click(container.querySelector('.integration-open-modal'));
       fireEvent.click(container.querySelector('#e2e-preferences-save'));

diff --git a/front/app/components/ConsentManager/index.tsx b/front/app/components/ConsentManager/index.tsx
@@ -34,16 +34,6 @@ const ConsentManager = () => {
   const { data: appConfiguration } = useAppConfiguration();
   const { data: authUser } = useAuthUser();
 
-  useEffect(() => {
-    const cookieConsent = getConsent();
-    setCookieConsent(cookieConsent);
-
-    eventEmitter.emit<ISavedDestinations>(
-      'destinationConsentChanged',
-      cookieConsent?.savedChoices || {}
-    );
-  }, []);
-
   const resetPreferences = useCallback(() => {
     setPreferences(
       getCurrentPreferences(
@@ -54,6 +44,28 @@ const ConsentManager = () => {
     );
   }, [appConfiguration, authUser, cookieConsent]);
 
+  useEffect(() => {
+    const cookieConsent = getConsent();
+    setCookieConsent(cookieConsent);
+
+    const defaultPreferences = getCurrentPreferences(
+      appConfiguration?.data,
+      authUser?.data,
+      cookieConsent
+    );
+
+    if (defaultPreferences.functional === undefined) {
+      defaultPreferences.functional = true;
+    }
+
+    setPreferences(defaultPreferences);
+
+    eventEmitter.emit<ISavedDestinations>(
+      'destinationConsentChanged',
+      cookieConsent?.savedChoices || {}
+    );
+  }, [appConfiguration?.data, authUser?.data]);
+
   const updatePreference = useCallback(
     (category: TCategory, value: boolean) => {
       setPreferences((preferences) => ({

diff --git a/front/app/components/admin/ContentBuilder/TopBar/GoBackButton.tsx b/front/app/components/admin/ContentBuilder/TopBar/GoBackButton.tsx
@@ -16,6 +16,7 @@ const GoBackButton = ({ onClick }: Props) => {
   return (
     <IconButton
       data-testid="goBackButton"
+      id="e2e-go-back-button"
       iconName="arrow-left"
       buttonType="button"
       iconColor={colors.textSecondary}

diff --git a/front/app/containers/App/index.tsx b/front/app/containers/App/index.tsx
@@ -65,7 +65,7 @@ const SkipLinkStyled = styled.a`
   background: ${colors.black};
   color: ${colors.white};
   padding: 8px;
-  z-index: 1000;
+  z-index: 10000;
   text-align: center;
   text-decoration: none;
   &:focus {

diff --git a/front/app/containers/Authentication/steps/SSOVerification/index.tsx b/front/app/containers/Authentication/steps/SSOVerification/index.tsx
@@ -12,7 +12,7 @@ import claveUnicaButtonMessages from 'components/UI/ClaveUnicaButton/messages';
 
 import { FormattedMessage } from 'utils/cl-intl';
 
-import NemlogInButton from '../_components/NemLogInButton';
+import MitIdButton from '../_components/MitIdButton';
 import TextButton from '../_components/TextButton';
 import AuthProviderButton from '../AuthProviders/AuthProviderButton';
 import authProviderMessages from '../AuthProviders/messages';
@@ -33,11 +33,12 @@ const SSOVerification = ({ onClickSSO, onClickLogin }: Props) => {
   const isNemLogIn = verificationMethod.data.attributes.name === 'nemlog_in';
   const isClaveUnica =
     verificationMethod.data.attributes.name === 'clave_unica';
+  const isCriipto = verificationMethod.data.attributes.name === 'criipto';
 
   return (
     <Box>
       {isNemLogIn && (
-        <NemlogInButton
+        <MitIdButton
           last={false}
           grayBorder
           standardSSOBehavior
@@ -46,6 +47,16 @@ const SSOVerification = ({ onClickSSO, onClickLogin }: Props) => {
           }}
         />
       )}
+      {isCriipto && (
+        <MitIdButton
+          last={false}
+          grayBorder
+          standardSSOBehavior
+          onClickStandardSSO={() => {
+            onClickSSO('criipto');
+          }}
+        />
+      )}
       {isClaveUnica && (
         <ClaveUnicaButton
           disabled={false}

diff --git a/...teps/_components/NemLogInButton/index.tsx → ...n/steps/_components/MitIdButton/index.tsx b/...teps/_components/NemLogInButton/index.tsx → ...n/steps/_components/MitIdButton/index.tsx
@@ -23,7 +23,7 @@ interface Props {
   onClickStandardSSO?: () => void;
 }
 
-const NemlogInButton = ({
+const MitIdButton = ({
   method,
   last,
   grayBorder,
@@ -40,9 +40,9 @@ const NemlogInButton = ({
       onClickStandardSSO?.();
     } else {
       const jwt = getJwt();
-      window.location.href = `${AUTH_PATH}/nemlog_in?token=${jwt}&pathname=${removeUrlLocale(
-        window.location.pathname
-      )}`;
+      window.location.href = `${AUTH_PATH}/${
+        method?.attributes.name
+      }?token=${jwt}&pathname=${removeUrlLocale(window.location.pathname)}`;
     }
   };
 
@@ -52,9 +52,9 @@ const NemlogInButton = ({
       onClick={handleOnClick}
       borderColor={grayBorder ? colors.grey500 : undefined}
     >
-      <FormattedMessage {...messages.verifyNemLogIn} />
+      <FormattedMessage {...messages.verifyMitId} />
     </VerificationMethodButton>
   );
 };
 
-export default NemlogInButton;
+export default MitIdButton;
diff --git a/...ps/_components/NemLogInButton/messages.ts → ...steps/_components/MitIdButton/messages.ts b/...ps/_components/NemLogInButton/messages.ts → ...steps/_components/MitIdButton/messages.ts
@@ -1,7 +1,7 @@
 import { defineMessages } from 'react-intl';
 
 export default defineMessages({
-  verifyNemLogIn: {
+  verifyMitId: {
     id: 'app.components.VerificationModal.verifyNemLogIn',
     defaultMessage: 'Verify with MitID',
   },

diff --git a/front/app/modules/commercial/id_criipto/components/CriiptoButton.tsx b/front/app/modules/commercial/id_criipto/components/CriiptoButton.tsx
diff --git a/front/app/modules/commercial/id_criipto/index.tsx b/front/app/modules/commercial/id_criipto/index.tsx
@@ -1,21 +1,20 @@
 import React from 'react';
 
-import {
-  IDCriiptoMethod,
-  TVerificationMethodName,
-} from 'api/verification_methods/types';
+import { TVerificationMethodName } from 'api/verification_methods/types';
 import { isLastVerificationMethod } from 'api/verification_methods/util';
 
 import { ModuleConfiguration } from 'utils/moduleUtils';
 
-import CriiptoButton from './components/CriiptoButton';
+const MitIdButton = React.lazy(
+  () => import('containers/Authentication/steps/_components/MitIdButton')
+);
 
 const verificationMethodName: TVerificationMethodName = 'criipto';
 const configuration: ModuleConfiguration = {
   outlets: {
     'app.components.VerificationModal.buttons': ({
       verificationMethods,
-      ...props
+      ...otherProps
     }) => {
       const method = verificationMethods.find(
         (vm) => vm.attributes.name === verificationMethodName
@@ -26,13 +25,7 @@ const configuration: ModuleConfiguration = {
           verificationMethodName,
           verificationMethods
         );
-        return (
-          <CriiptoButton
-            verificationMethod={method as IDCriiptoMethod}
-            last={last}
-            {...props}
-          />
-        );
+        return <MitIdButton last={last} method={method} {...otherProps} />;
       }
 
       return null;

diff --git a/front/app/modules/commercial/id_nemlog_in/index.tsx b/front/app/modules/commercial/id_nemlog_in/index.tsx
@@ -5,8 +5,8 @@ import { isLastVerificationMethod } from 'api/verification_methods/util';
 
 import { ModuleConfiguration } from 'utils/moduleUtils';
 
-const NemlogInButton = React.lazy(
-  () => import('containers/Authentication/steps/_components/NemLogInButton')
+const MitIdButton = React.lazy(
+  () => import('containers/Authentication/steps/_components/MitIdButton')
 );
 
 const verificationMethodName: TVerificationMethodName = 'nemlog_in';
@@ -25,7 +25,7 @@ const configuration: ModuleConfiguration = {
           verificationMethodName,
           verificationMethods
         );
-        return <NemlogInButton last={last} method={method} {...otherProps} />;
+        return <MitIdButton last={last} method={method} {...otherProps} />;
       }
 
       return null;

diff --git a/front/app/translations/ach-UG.json b/front/app/translations/ach-UG.json
@@ -970,7 +970,6 @@
   "app.containers.AdminPage.ProjectDescription.saveError": "crwdns3106613:0crwdne3106613:0",
   "app.containers.AdminPage.ProjectDescription.toggleLabel": "crwdns3106615:0crwdne3106615:0",
   "app.containers.AdminPage.ProjectDescription.toggleTooltip": "crwdns3106617:0crwdne3106617:0",
-  "app.containers.AdminPage.ProjectDescription.viewProject": "crwdns3106619:0crwdne3106619:0",
   "app.containers.AdminPage.ProjectDescription.viewPublicProject": "crwdns3106621:0crwdne3106621:0",
   "app.containers.AdminPage.ProjectEdit.formBuilder.surveyEnd": "crwdns214168:0crwdne214168:0",
   "app.containers.AdminPage.Users.GroupCreation.modalHeaderRules": "crwdns214170:0crwdne214170:0",
@@ -1807,7 +1806,6 @@
   "app.containers.admin.ContentBuilder.infoWithAccordions": "crwdns3106629:0crwdne3106629:0",
   "app.containers.admin.ContentBuilder.oneColumnLayout": "crwdns3106631:0crwdne3106631:0",
   "app.containers.admin.ContentBuilder.projectDescription": "crwdns3106633:0crwdne3106633:0",
-  "app.containers.admin.ContentBuilder.sections": "crwdns3106635:0crwdne3106635:0",
   "app.containers.app.navbar.admin": "crwdns215692:0crwdne215692:0",
   "app.containers.app.navbar.allProjects": "crwdns215694:0crwdne215694:0",
   "app.containers.app.navbar.ariaLabel": "crwdns215696:0crwdne215696:0",