The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Include email in forgot password links (#64724)
John Swanson37b9e0eb8ae0
diff --git a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsxindex eef82f63a92..7f9a1f8e026 100644--- a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx+++ b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx@@ -18,11 +18,12 @@ import { InfoBody, InfoMessage, InfoTitle } from "./ResetPassword.styled";interface ResetPasswordQueryParams {token: string;+ email?: string;}interface ResetPasswordProps {params: ResetPasswordQueryParams;- location?: Location<{ redirect?: string }>;+ location?: Location<{ redirect?: string; email?: string }>;}export const ResetPassword = ({@@ -31,6 +32,7 @@ export const ResetPassword = ({}: ResetPasswordProps): JSX.Element | null => {const { token } = params;const redirectUrl = location?.query?.redirect;+ const email = location?.query?.email;const dispatch = useDispatch();const { data: status, isLoading } =useGetPasswordResetTokenStatusQuery(token);@@ -56,20 +58,30 @@ export const ResetPassword = ({onSubmit={handlePasswordSubmit}/>) : (- <ResetPasswordExpired />+ <ResetPasswordExpired email={email} />)}</AuthLayout>);};-const ResetPasswordExpired = (): JSX.Element => {+interface ResetPasswordExpiredProps {+ email?: string;+}++const ResetPasswordExpired = ({+ email,+}: ResetPasswordExpiredProps): JSX.Element => {+ const forgotPasswordUrl = email+ ? `/auth/forgot_password?email=${encodeURIComponent(email)}`+ : "/auth/forgot_password";+return (<InfoBody><InfoTitle>{t`Whoops, that's an expired link`}</InfoTitle><InfoMessage>{t`For security reasons, password reset links expire after a little while. If you still need to reset your password, you can request a new reset email.`}</InfoMessage>- <Button as={Link} primary to={"/auth/forgot_password"}>+ <Button as={Link} primary to={forgotPasswordUrl}>{t`Request a new reset email`}</Button></InfoBody>diff --git a/src/metabase/notification/payload/impl/system_event.clj b/src/metabase/notification/payload/impl/system_event.cljindex dc189fbccb4..f8ee0ce5dbe 100644--- a/src/metabase/notification/payload/impl/system_event.clj+++ b/src/metabase/notification/payload/impl/system_event.clj@@ -1,5 +1,6 @@(ns metabase.notification.payload.impl.system-event(:require+ [clojure.string :as str][metabase.appearance.core :as appearance][metabase.auth-identity.core :as auth-identity][metabase.channel.email.messages :as messages]@@ -9,19 +10,23 @@[metabase.system.core :as system][metabase.users.models.user :as user][metabase.util.i18n :refer [trs]]- [metabase.util.malli :as mu]))+ [metabase.util.malli :as mu]+ [toucan2.core :as t2]))(defn- join-url[user-id redirect];; TODO: the reset token should come from the event-info, not generated here!(let [reset-token (auth-identity/create-password-reset! user-id)should-link-to-login-page (and (sso/sso-enabled?)- (not (session/enable-password-login)))]+ (not (session/enable-password-login)))+ email (t2/select-one-fn :email [:model/User :email] user-id)](if should-link-to-login-page(str (system/site-url) "/auth/login");; NOTE: the new user join url is a password reset route with an indicator that this is a first time user.(str (user/form-password-reset-url reset-token)- (when redirect (str "?redirect=" redirect))+ "?"+ (str/join "&" (remove nil? [(when redirect (str "redirect=" redirect))+ (when email (str "email=" email))]))"#new"))))(defn- custom-payloaddiff --git a/test/metabase/notification/payload/impl/system_event_test.clj b/test/metabase/notification/payload/impl/system_event_test.cljindex 79cfd2d7eba..e328a5350b9 100644--- a/test/metabase/notification/payload/impl/system_event_test.clj+++ b/test/metabase/notification/payload/impl/system_event_test.clj@@ -157,7 +157,7 @@"You're invited to join SuperStar's Metabase"[#"Kratos could use your help setting up Metabase"#"Your Metabase is up and running, but Kratos needs you to connect your data. You'll probably need:"- #"<a[^>]*href=\"https?://metabase\.com/auth/reset_password/.*\?redirect(=|=)/admin/databases/create#new\"[^>]*>"]+ #"<a[^>]*href=\"https?://metabase\.com/auth/reset_password/.*\?redirect(=|=)/admin/databases/create.*#new\"[^>]*>"]"Kratos")(testing "with invitor's first_name not defined"@@ -165,7 +165,7 @@"You're invited to join SuperStar's Metabase"[#"You are invited to help setting up Metabase"#"Your Metabase is up and running, but your help is needed to connect data. You'll probably need:"- #"<a[^>]*href=\"https?://metabase\.com/auth/reset_password/.*\?redirect(=|=)/admin/databases/create#new\"[^>]*>"]+ #"<a[^>]*href=\"https?://metabase\.com/auth/reset_password/.*\?redirect(=|=)/admin/databases/create.*#new\"[^>]*>"]nil)))))(deftest notification-create-email-testdiff --git a/test/metabase/users/models/user_test.clj b/test/metabase/users/models/user_test.cljindex 96df80cd412..cb10cc7f333 100644--- a/test/metabase/users/models/user_test.clj+++ b/test/metabase/users/models/user_test.clj@@ -35,7 +35,7 @@the only place to get it (the token stored in the DB is an encrypted hash)."[new-user-email-address](when-let [[{[{invite-email :content}] :body}] (get @mt/inbox new-user-email-address)]- (let [[_ reset-token] (re-find #"/auth/reset_password/(\d+_[\w_-]+)#new" invite-email)]+ (let [[_ reset-token] (re-find #"/auth/reset_password/(\d+_[\w_-]+)\?.+#new" invite-email)](client/client :post 200 "session/reset_password" {:token reset-token:password "p@ssword1"}))))