Merge pull request #24761 from edx/bseverino/idv-email

[MST-354] Update URLs in ID verification-related emails

lms/djangoapps/verify_student/management/commands/send_verification_expiry_email.py

@@ -191,7 +191,7 @@ class Command(BaseCommand):
         message_context = get_base_template_context(site)
         message_context.update({
             'platform_name': settings.PLATFORM_NAME,
-            'lms_verification_link': IDVerificationService.email_reverify_url(),
+            'lms_verification_link': '{}/id-verification'.format(settings.ACCOUNT_MICROFRONTEND_URL),
             'help_center_link': settings.ID_VERIFICATION_SUPPORT_LINK
         })
 

lms/djangoapps/verify_student/services.py

@@ -264,15 +264,3 @@ class IDVerificationService(object):
             else:
                 location = reverse(url_name)
         return location
-
-    @classmethod
-    def email_reverify_url(cls):
-        """
-        Return a URL string for reverification emails:
-            If waffle flag is active, returns URL for IDV microfrontend.
-            Else, returns URL for reverify view.
-        """
-        if redirect_to_idv_microfrontend():
-            return '{}/id-verification'.format(settings.ACCOUNT_MICROFRONTEND_URL)
-        else:
-            return '{}{}'.format(settings.LMS_ROOT_URL, reverse('verify_student_reverify'))

lms/djangoapps/verify_student/views.py

@@ -1144,7 +1144,7 @@ def results_callback(request):
         log.debug(u"Denying verification for %s", receipt_id)
         attempt.deny(json.dumps(reason), error_code=error_code)
         status = "denied"
-        reverify_url = IDVerificationService.email_reverify_url()
+        reverify_url = '{}/id-verification'.format(settings.ACCOUNT_MICROFRONTEND_URL)
         verification_status_email_vars['reasons'] = reason
         verification_status_email_vars['reverify_url'] = reverify_url
         verification_status_email_vars['faq_url'] = settings.ID_VERIFICATION_SUPPORT_LINK