fix(api): improve some confirmation action wording

api/desecapi/templates/emails/reset-password/content.txt

@@ -1,12 +1,16 @@
 Hi,
 
-We received a request to reset the password for your deSEC account. To
-ensure that this request is legitimate, we need you to confirm it using
-the following link:
+We received a request to reset the password for your deSEC account.
+This may happen when someone uses the "Reset Password" function on our
+web site, or when you created a new account just now that does not yet
+have a password.
+
+To ensure that the request is legitimate, we need you to confirm it
+using the following link:
 
 {{ confirmation_link }}
 
-After your confirmation, we will ask you to set a new password.
+After your confirmation, you can provide your new password.
 
 Stay secure,
 The deSEC Team

api/desecapi/views.py

@@ -590,13 +590,12 @@ class AuthenticatedActivateUserActionView(AuthenticatedActionView):
         return PDNSChangeTracker.track(lambda: serializer.save(owner=action.user))
 
     def _finalize_without_domain(self):
-        login_url = self.request.build_absolute_uri(reverse('v1:login'))
         if not is_password_usable(self.request.auth.user.password):
             AccountResetPasswordView.send_reset_token(self.request.auth.user, self.request)
             return Response({
-                'detail': f'Success! We sent you instructions on how to reset your password. Afterwards, Please log in '
-                          f'at {login_url}.'
+                'detail': 'Success! We sent you instructions on how to set your password.'
             })
+        login_url = self.request.build_absolute_uri(reverse('v1:login'))
         return Response({
                 'detail': f'Success! Please log in at {login_url}.'
             })
@@ -635,7 +634,8 @@ class AuthenticatedResetPasswordUserActionView(AuthenticatedActionView):
     serializer_class = serializers.AuthenticatedResetPasswordUserActionSerializer
 
     def finalize(self):
-        return Response({'detail': 'Success! Your password has been changed.'})
+        login_url = self.request.build_absolute_uri(reverse('v1:login'))
+        return Response({'detail': f'Success! Your password has been changed. Log in at {login_url}.'})
 
 
 class AuthenticatedDeleteUserActionView(AuthenticatedActionView):