-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3921 from vector-im/luke/new-guest-access-set-pwd…
…-dialog Implement dialog to set password
- Loading branch information
Showing
4 changed files
with
133 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
/* | ||
Copyright 2017 Vector Creations Ltd | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import q from 'q'; | ||
import React from 'react'; | ||
import sdk from 'matrix-react-sdk'; | ||
import {MatrixClientPeg} from 'matrix-react-sdk'; | ||
import classnames from 'classnames'; | ||
|
||
/** | ||
* Prompt the user to set a password | ||
* | ||
* On success, `onFinished()` when finished | ||
*/ | ||
export default React.createClass({ | ||
displayName: 'SetPasswordDialog', | ||
propTypes: { | ||
onFinished: React.PropTypes.func.isRequired, | ||
}, | ||
|
||
getInitialState: function() { | ||
return { | ||
error: null, | ||
}; | ||
}, | ||
|
||
_onPasswordChanged: function() { | ||
this.props.onFinished(); | ||
}, | ||
|
||
_onPasswordChangeError: function(err) { | ||
let errMsg = err.error || ""; | ||
if (err.httpStatus === 403) { | ||
errMsg = "Failed to change password. Is your password correct?"; | ||
} else if (err.httpStatus) { | ||
errMsg += ` (HTTP status ${err.httpStatus})`; | ||
} | ||
this.setState({ | ||
error: errMsg, | ||
}); | ||
}, | ||
|
||
render: function() { | ||
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); | ||
const ChangePassword = sdk.getComponent('views.settings.ChangePassword'); | ||
const Spinner = sdk.getComponent('elements.Spinner'); | ||
|
||
return ( | ||
<BaseDialog className="mx_SetPasswordDialog" | ||
onFinished={this.props.onFinished} | ||
title="Please set a new password!" | ||
> | ||
<div className="mx_Dialog_content"> | ||
<p> | ||
This will allow you to return to your account after signing out, | ||
and sign in on other devices. | ||
</p> | ||
<ChangePassword | ||
className="mx_SetPasswordDialog_change_password" | ||
rowClassName="" | ||
rowLabelClassName="" | ||
rowInputClassName="" | ||
buttonClassName="mx_Dialog_primary mx_SetPasswordDialog_change_password_button" | ||
confirm={false} | ||
onError={this._onPasswordChangeError} | ||
onFinished={this._onPasswordChanged} /> | ||
<div className="error"> | ||
{ this.state.error } | ||
</div> | ||
</div> | ||
</BaseDialog> | ||
); | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/skins/vector/css/vector-web/views/dialogs/_SetPasswordDialog.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
Copyright 2017 Vector Creations Ltd | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
.mx_SetPasswordDialog_change_password input { | ||
border-radius: 3px; | ||
border: 1px solid $input-border-color; | ||
padding: 9px; | ||
color: $primary-fg-color; | ||
background-color: $primary-bg-color; | ||
font-size: 15px; | ||
width: 100%; | ||
max-width: 280px; | ||
margin-bottom: 10px; | ||
} | ||
|
||
.mx_SetPasswordDialog_change_password_button { | ||
margin-top: 68px; | ||
} | ||
|
||
.mx_SetPasswordDialog .mx_Dialog_content { | ||
margin-bottom: 0px; | ||
} |