mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25261 from owncloud/app-password-login-name 

show which login name to use for the new app password
This commit is contained in:
Vincent Petry 2016-06-27 13:40:20 +02:00 committed by GitHub
parent 5e2a9dac14 213d7119f9
commit 72a3301ba4
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
settings/Controller/AuthSettingsController.php
View File

@ -118,6 +118,7 @@ class AuthSettingsController extends Controller {
return [ return [
'token' => $token, 'token' => $token,
'loginName' => $loginName,
'deviceToken' => $deviceToken 'deviceToken' => $deviceToken
]; ];
} }

8
settings/css/settings.css
View File

@ -131,11 +131,19 @@ table.nostyle td { padding: 0.2em 0; }
opacity: 0.6; opacity: 0.6;
} }
#new-app-login-name,
#new-app-password { #new-app-password {
width: 186px; width: 186px;
font-family: monospace; font-family: monospace;
background-color: lightyellow; background-color: lightyellow;
} }
.app-password-row {
display: table-row;
}
.app-password-label {
display: table-cell;
padding-right: 1em;
}
/* USERS */ /* USERS */
#newgroup-init a span { margin-left: 20px; } #newgroup-init a span { margin-left: 20px; }

9
settings/js/authtoken_view.js
View File

@ -107,6 +107,8 @@
_result: undefined, _result: undefined,
_newAppLoginName: undefined,
_newAppPassword: undefined, _newAppPassword: undefined,
_hideAppPasswordBtn: undefined, _hideAppPasswordBtn: undefined,
@ -136,6 +138,8 @@
this._addAppPasswordBtn.click(_.bind(this._addAppPassword, this)); this._addAppPasswordBtn.click(_.bind(this._addAppPassword, this));
this._result = $('#app-password-result'); this._result = $('#app-password-result');
this._newAppLoginName = $('#new-app-login-name');
this._newAppLoginName.on('focus', _.bind(this._onNewTokenLoginNameFocus, this));
this._newAppPassword = $('#new-app-password'); this._newAppPassword = $('#new-app-password');
this._newAppPassword.on('focus', _.bind(this._onNewTokenFocus, this)); this._newAppPassword.on('focus', _.bind(this._onNewTokenFocus, this));
this._hideAppPasswordBtn = $('#app-password-hide'); this._hideAppPasswordBtn = $('#app-password-hide');
@ -181,6 +185,7 @@
$.when(creatingToken).done(function(resp) { $.when(creatingToken).done(function(resp) {
_this.collection.add(resp.deviceToken); _this.collection.add(resp.deviceToken);
_this.render(); _this.render();
_this._newAppLoginName.val(resp.loginName);
_this._newAppPassword.val(resp.token); _this._newAppPassword.val(resp.token);
_this._toggleFormResult(false); _this._toggleFormResult(false);
_this._newAppPassword.select(); _this._newAppPassword.select();
@ -194,6 +199,10 @@
}); });
}, },
_onNewTokenLoginNameFocus: function() {
this._newAppLoginName.select();
},
_onNewTokenFocus: function() { _onNewTokenFocus: function() {
this._newAppPassword.select(); this._newAppPassword.select();
}, },

12
settings/templates/personal.php
View File

@ -203,8 +203,16 @@ if($_['passwordChangeSupported']) {
<button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button> <button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button>
</div> </div>
<div id="app-password-result" class="hidden"> <div id="app-password-result" class="hidden">
<input id="new-app-password" type="text" readonly="readonly"/> <span><?php p($l->t('Use the credentials below to configure your app or device.')); ?></span>
<button id="app-password-hide" class="button"><?php p($l->t('Done')); ?></button> <div class="app-password-row">
<span class="app-password-label"><?php p($l->t('Username')); ?></span>
<input id="new-app-login-name" type="text" readonly="readonly"/>
</div>
<div class="app-password-row">
<span class="app-password-label"><?php p($l->t('Password')); ?></span>
<input id="new-app-password" type="text" readonly="readonly"/>
<button id="app-password-hide" class="button"><?php p($l->t('Done')); ?></button>
</div>
</div> </div>
</div> </div>