Skip to content
Snippets Groups Projects
Commit 026e7cf3 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

update reset password form to new form handling approach.

parent 5a584237
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
resources/frontend_client/app/auth/auth.controllers.js
+ 12
− 15
View file @ 026e7cf3
......@@ -95,9 +95,9 @@ AuthControllers.controller('ForgotPassword', ['$scope', '$cookies', '$location',
$scope.sendResetNotification = function(email) {
Session.forgot_password({
'email': email
}, function(result) {
}, function (result) {
$scope.sentNotification = true;
}, function(error) {
}, function (error) {
$scope.$broadcast("form:api-error", error);
});
};
......@@ -108,25 +108,22 @@ AuthControllers.controller('ForgotPassword', ['$scope', '$cookies', '$location',
AuthControllers.controller('PasswordReset', ['$scope', '$routeParams', '$location', 'Session', function($scope, $routeParams, $location, Session) {
$scope.resetSuccess = false;
$scope.error = false;
// TODO - check for password matching
// TODO - check for password strength
$scope.resetPassword = function(password) {
$scope.$broadcast("form:reset");
if (password != $scope.password2) {
$scope.$broadcast("form:api-error", {'data': {'errors': {'password2': "Passwords do not match"}}});
return;
}
Session.reset_password({
'token': $routeParams.token,
'password': password
}, function(result) {
}, function (result) {
$scope.resetSuccess = true;
}, function(error) {
if (error.status === 400) {
$scope.error = "You must specify a valid password.";
} else if (error.status === 404) {
$scope.error = "Invalid reset token specified.";
} else {
$scope.error = "Error resetting password. Please ask the system administrator for assistance.";
}
}, function (error) {
$scope.$broadcast("form:api-error", error);
});
};
......
resources/frontend_client/app/auth/partials/forgot_password.html
+ 0
− 10
View file @ 026e7cf3
......@@ -51,13 +51,3 @@
<div class="brand-illustration"></div>
<div class="bg-brand block py3 absolute bottom left right"></div>
</section>
<div class="layout-centered col col-md-6" ng-if="sentNotification" ng-cloak>
<h1 class="text-brand my2">
Password reset sent.
</h1>
<p class="text-grey-3">We have sent you an e-mail. Please <a class="text-brand" href="mailto:datahelp@expa.com">contact us</a> if you do not receive it within a few minutes.</p>
</div>
\ No newline at end of file
resources/frontend_client/app/auth/partials/password_reset.html
+ 54
− 30
View file @ 026e7cf3
<div class="layout-centered col col-md-6" ng-if="!resetSuccess">
<h1 class="text-brand my2">
Change password
</h1>
<div class="bg-white flex flex-column layout-centered full-height">
<div class="wrapper">
<div class="Grid Grid--1of2">
<div class="Grid-cell flex layout-centered">
<svg width="66px" height="85px" viewBox="0 0 66 85" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="logo"fill="#4990E2">
<path d="M46.8253288,70.4935014 C49.5764899,70.4935014 51.8067467,68.1774705 51.8067467,65.3205017 C51.8067467,62.4635329 49.5764899,60.147502 46.8253288,60.147502 C44.0741676,60.147502 41.8439108,62.4635329 41.8439108,65.3205017 C41.8439108,68.1774705 44.0741676,70.4935014 46.8253288,70.4935014 Z M32.8773585,84.9779005 C35.6285197,84.9779005 37.8587764,82.6618697 37.8587764,79.8049008 C37.8587764,76.947932 35.6285197,74.6319011 32.8773585,74.6319011 C30.1261973,74.6319011 27.8959405,76.947932 27.8959405,79.8049008 C27.8959405,82.6618697 30.1261973,84.9779005 32.8773585,84.9779005 Z M32.8773585,70.4935014 C35.6285197,70.4935014 37.8587764,68.1774705 37.8587764,65.3205017 C37.8587764,62.4635329 35.6285197,60.147502 32.8773585,60.147502 C30.1261973,60.147502 27.8959405,62.4635329 27.8959405,65.3205017 C27.8959405,68.1774705 30.1261973,70.4935014 32.8773585,70.4935014 Z M18.9293882,70.4935014 C21.6805494,70.4935014 23.9108062,68.1774705 23.9108062,65.3205017 C23.9108062,62.4635329 21.6805494,60.147502 18.9293882,60.147502 C16.1782271,60.147502 13.9479703,62.4635329 13.9479703,65.3205017 C13.9479703,68.1774705 16.1782271,70.4935014 18.9293882,70.4935014 Z M46.8253288,56.0091023 C49.5764899,56.0091023 51.8067467,53.6930714 51.8067467,50.8361026 C51.8067467,47.9791337 49.5764899,45.6631029 46.8253288,45.6631029 C44.0741676,45.6631029 41.8439108,47.9791337 41.8439108,50.8361026 C41.8439108,53.6930714 44.0741676,56.0091023 46.8253288,56.0091023 Z M18.9293882,56.0091023 C21.6805494,56.0091023 23.9108062,53.6930714 23.9108062,50.8361026 C23.9108062,47.9791337 21.6805494,45.6631029 18.9293882,45.6631029 C16.1782271,45.6631029 13.9479703,47.9791337 13.9479703,50.8361026 C13.9479703,53.6930714 16.1782271,56.0091023 18.9293882,56.0091023 Z M46.8253288,26.8995984 C49.5764899,26.8995984 51.8067467,24.5835675 51.8067467,21.7265987 C51.8067467,18.8696299 49.5764899,16.553599 46.8253288,16.553599 C44.0741676,16.553599 41.8439108,18.8696299 41.8439108,21.7265987 C41.8439108,24.5835675 44.0741676,26.8995984 46.8253288,26.8995984 Z M32.8773585,41.5247031 C35.6285197,41.5247031 37.8587764,39.2086723 37.8587764,36.3517034 C37.8587764,33.4947346 35.6285197,31.1787037 32.8773585,31.1787037 C30.1261973,31.1787037 27.8959405,33.4947346 27.8959405,36.3517034 C27.8959405,39.2086723 30.1261973,41.5247031 32.8773585,41.5247031 Z M32.8773585,10.3459994 C35.6285197,10.3459994 37.8587764,8.02996853 37.8587764,5.17299969 C37.8587764,2.31603085 35.6285197,0 32.8773585,0 C30.1261973,0 27.8959405,2.31603085 27.8959405,5.17299969 C27.8959405,8.02996853 30.1261973,10.3459994 32.8773585,10.3459994 Z M32.8773585,26.8995984 C35.6285197,26.8995984 37.8587764,24.5835675 37.8587764,21.7265987 C37.8587764,18.8696299 35.6285197,16.553599 32.8773585,16.553599 C30.1261973,16.553599 27.8959405,18.8696299 27.8959405,21.7265987 C27.8959405,24.5835675 30.1261973,26.8995984 32.8773585,26.8995984 Z M18.9293882,26.8995984 C21.6805494,26.8995984 23.9108062,24.5835675 23.9108062,21.7265987 C23.9108062,18.8696299 21.6805494,16.553599 18.9293882,16.553599 C16.1782271,16.553599 13.9479703,18.8696299 13.9479703,21.7265987 C13.9479703,24.5835675 16.1782271,26.8995984 18.9293882,26.8995984 Z" id="Oval-14" opacity="0.2"></path>
<path d="M60.773299,70.4935014 C63.5244602,70.4935014 65.754717,68.1774705 65.754717,65.3205017 C65.754717,62.4635329 63.5244602,60.147502 60.773299,60.147502 C58.0221379,60.147502 55.7918811,62.4635329 55.7918811,65.3205017 C55.7918811,68.1774705 58.0221379,70.4935014 60.773299,70.4935014 Z M4.98141795,70.3527958 C7.73257912,70.3527958 9.96283591,68.0367649 9.96283591,65.1797961 C9.96283591,62.3228273 7.73257912,60.0067964 4.98141795,60.0067964 C2.23025679,60.0067964 0,62.3228273 0,65.1797961 C0,68.0367649 2.23025679,70.3527958 4.98141795,70.3527958 Z M60.773299,56.0091023 C63.5244602,56.0091023 65.754717,53.6930714 65.754717,50.8361026 C65.754717,47.9791337 63.5244602,45.6631029 60.773299,45.6631029 C58.0221379,45.6631029 55.7918811,47.9791337 55.7918811,50.8361026 C55.7918811,53.6930714 58.0221379,56.0091023 60.773299,56.0091023 Z M32.8773585,56.0091023 C35.6285197,56.0091023 37.8587764,53.6930714 37.8587764,50.8361026 C37.8587764,47.9791337 35.6285197,45.6631029 32.8773585,45.6631029 C30.1261973,45.6631029 27.8959405,47.9791337 27.8959405,50.8361026 C27.8959405,53.6930714 30.1261973,56.0091023 32.8773585,56.0091023 Z M4.98141795,55.8683967 C7.73257912,55.8683967 9.96283591,53.5523658 9.96283591,50.695397 C9.96283591,47.8384281 7.73257912,45.5223973 4.98141795,45.5223973 C2.23025679,45.5223973 0,47.8384281 0,50.695397 C0,53.5523658 2.23025679,55.8683967 4.98141795,55.8683967 Z M60.773299,41.5247031 C63.5244602,41.5247031 65.754717,39.2086723 65.754717,36.3517034 C65.754717,33.4947346 63.5244602,31.1787037 60.773299,31.1787037 C58.0221379,31.1787037 55.7918811,33.4947346 55.7918811,36.3517034 C55.7918811,39.2086723 58.0221379,41.5247031 60.773299,41.5247031 Z M46.8253288,41.5247031 C49.5764899,41.5247031 51.8067467,39.2086723 51.8067467,36.3517034 C51.8067467,33.4947346 49.5764899,31.1787037 46.8253288,31.1787037 C44.0741676,31.1787037 41.8439108,33.4947346 41.8439108,36.3517034 C41.8439108,39.2086723 44.0741676,41.5247031 46.8253288,41.5247031 Z M60.773299,26.8995984 C63.5244602,26.8995984 65.754717,24.5835675 65.754717,21.7265987 C65.754717,18.8696299 63.5244602,16.553599 60.773299,16.553599 C58.0221379,16.553599 55.7918811,18.8696299 55.7918811,21.7265987 C55.7918811,24.5835675 58.0221379,26.8995984 60.773299,26.8995984 Z M18.9293882,41.5247031 C21.6805494,41.5247031 23.9108062,39.2086723 23.9108062,36.3517034 C23.9108062,33.4947346 21.6805494,31.1787037 18.9293882,31.1787037 C16.1782271,31.1787037 13.9479703,33.4947346 13.9479703,36.3517034 C13.9479703,39.2086723 16.1782271,41.5247031 18.9293882,41.5247031 Z M4.98141795,41.3839975 C7.73257912,41.3839975 9.96283591,39.0679667 9.96283591,36.2109978 C9.96283591,33.354029 7.73257912,31.0379981 4.98141795,31.0379981 C2.23025679,31.0379981 0,33.354029 0,36.2109978 C0,39.0679667 2.23025679,41.3839975 4.98141795,41.3839975 Z M4.98141795,26.8995984 C7.73257912,26.8995984 9.96283591,24.5835675 9.96283591,21.7265987 C9.96283591,18.8696299 7.73257912,16.553599 4.98141795,16.553599 C2.23025679,16.553599 0,18.8696299 0,21.7265987 C0,24.5835675 2.23025679,26.8995984 4.98141795,26.8995984 Z" id="Oval-14" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
</div>
<div class="Grid-cell" ng-show="!resetSuccess">
<form class="Login-wrapper bg-white Form-new bordered rounded shadowed" name="form" novalidate>
<h3 class="Login-header mb3">New password</h3>
<div class="row">
<form novalidate>
<p class="text-grey-4 px2">Your new password must be <b>8 characters</b> or longer, and <b>include an uppercase letter</b>, <b>a punctuation mark</b>, and <b>a digit</b>. We know it's a bit much, but security is what the cool kids care about.</p>
<p>To keep your data secure, passwords need to be at least <b>8 characters</b> and include <b>at least one uppercase letter</b>, <b>one digit</b>, and <b>one special character.</b></p>
<alert class="Form-group alert mx2" type="error" ng-if="error">{{error}}</alert>
<mb-form-message></mb-form-message>
<div class="col col-md-8">
<div class="py2">
<input class="input block full" id="id_password1" name="password1" type="password" placeholder="New Password" autofocus ng-model="password">
</div>
<div class="py2">
<input class="input block full" id="id_password2" name="password2" placeholder="New password again" type="password" ng-model="password2">
</div>
<div class="py2">
<button class="Button Button--primary" ng-click="resetPassword(password)">
Change Password
</button>
<div class="Form-field" mb-form-field="password">
<mb-form-label display-name="Create a new password" field-name="password"></mb-form-label>
<input class="Form-input Form-offset full" name="password" placeholder="Make sure its secure like the instructions above" type="password" ng-model="password" required autofocus>
<span class="Form-charm"></span>
</div>
<div class="Form-field" mb-form-field="password2">
<mb-form-label display-name="Confirm new password" field-name="password2"></mb-form-label>
<input class="Form-input Form-offset full" name="password2" placeholder="Make sure it matches the one you just entered" type="password" ng-model="password2" required>
<span class="Form-charm"></span>
</div>
<div class="Form-actions">
<button class="Button" ng-class="{'Button--primary': form.$valid}" ng-click="resetPassword(password)" ng-disabled="!form.$valid">
Save new password
</button>
</div>
</form>
</div>
<div class="Grid-cell" ng-show="resetSuccess">
<div class="bg-white Form-new bordered rounded shadowed">
<!-- TODO: need large success graphic -->
<p>Your password has been reset.</p>
<p><a class="Button Button--primary">Sign in with your new password</a></p>
</div>
</div>
</form>
</div>
</div>
</div>
<div class="layout-centered col col-md-6" ng-if="resetSuccess" ng-cloak>
<h1 class="text-brand my2">
Password change successful!
</h1>
<p class="text-grey-4">
Your password has been changed.
<a class="link" href="/auth/login">Sign in with your new password.</a>
</p>
</div>
<section class="brand-scene absolute bottom left right">
<svg class="brand-boat" width="27px" height="28px" viewBox="0 0 27 28">
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-52.000000, -49.000000)" fill="#fff">
<path d="M56.9966734,62.0821591 C56.9548869,62.5960122 56.5246217,63 56,63 C55.4477153,63 55,62.5522847 55,62 C55,61.4477153 55.4477153,61 56,61 C56.1542427,61 56.3003292,61.0349209 56.4307846,61.0972878 C56.4365546,60.9708421 56.4672874,60.8469847 56.5249064,60.738086 L60.591292,53.0527085 C60.6128147,53.0120312 60.6340855,52.9741034 60.6550548,52.9389125 C60.2727349,52.7984089 60,52.4310548 60,52 C60,51.4477153 60.4477153,51 61,51 C61.5522847,51 62,51.4477153 62,52 C62,52.4778316 61.6648606,52.8773872 61.2168176,52.9764309 C61.2239494,53.0443316 61.2276783,53.1212219 61.2276783,53.2070193 L61.2276783,64.6460667 C61.2276783,64.7905295 61.2109404,64.9142428 61.1799392,65.0161455 C61.6463447,65.1008929 62,65.5091461 62,66 C62,66.5522847 61.5522847,67 61,67 C60.4477153,67 60,66.5522847 60,66 C60,65.6775356 60.1526298,65.3907197 60.3895873,65.2078547 C60.3353792,65.1698515 60.2797019,65.1246206 60.2229246,65.0720038 L56.9966734,62.0821591 Z M66.1768361,51.0536808 L76.3863147,62.9621534 C76.6248381,62.7575589 76.9348843,62.6339439 77.2738087,62.6339439 C78.0269541,62.6339439 78.6374991,63.2443563 78.6374991,63.9973383 C78.6374991,64.7503202 78.0269541,65.3607327 77.2738087,65.3607327 C76.7179077,65.3607327 76.2396954,65.0281798 76.0273418,64.5512033 L76.0273418,64.5512033 L66.2470617,68.8970508 L66.2470617,68.8970508 C66.3224088,69.0662913 66.3642852,69.2537142 66.3642852,69.4509158 C66.3642852,70.2038977 65.7537402,70.8143102 65.0005948,70.8143102 C64.2474494,70.8143102 63.6369043,70.2038977 63.6369043,69.4509158 C63.6369043,68.6979339 64.2474494,68.0875214 65.0005948,68.0875214 L65.0005948,51.7267888 C64.2474494,51.7267888 63.6369043,51.1163763 63.6369043,50.3633944 C63.6369043,49.6104125 64.2474494,49 65.0005948,49 C65.7537402,49 66.3642852,49.6104125 66.3642852,50.3633944 C66.3642852,50.6152816 66.2959632,50.8512148 66.1768361,51.0536808 L66.1768361,51.0536808 Z M74.9589487,72 C76.0592735,72 76.2934239,72.6072543 75.4783436,73.3596586 L73.4702868,75.2133052 C72.656816,75.9642239 71.1011127,76.5729638 69.999426,76.5729638 L57.9641665,76.5729638 C56.8607339,76.5729638 55.3083859,75.9657095 54.4933056,75.2133052 L52.4852488,73.3596586 C51.6717779,72.6087399 51.9052063,72 53.0046438,72 L74.9589487,72 Z" id="boat" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
<div class="brand-illustration"></div>
<div class="bg-brand block py3 absolute bottom left right"></div>
</section>
src/metabase/api/session.clj
+ 2
− 2
View file @ 026e7cf3
......@@ -62,9 +62,9 @@
[:as {{:keys [token password] :as body} :body}]
{token Required
password [Required ComplexPassword]}
(let-404 [user (sel :one :fields [User :id :reset_triggered] :reset_token token)]
(let-400 [user (sel :one :fields [User :id :reset_triggered] :reset_token token)]
;; check that the reset was triggered within the last 1 HOUR, after that the token is considered expired
(check-404 (> (* 60 60 1000) (- (System/currentTimeMillis) (get user :reset_triggered 0))))
(check-400 [(> (* 60 60 1000) (- (System/currentTimeMillis) (get user :reset_triggered 0))) "Reset token has expired"])
(set-user-password (:id user) password)
{:success true}))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment