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

show which login name to use for the new app password

This commit is contained in:
Christoph Wurst 2016-06-24 15:31:48 +02:00
parent 04e3da0cf5
commit 26aacb4e62
3 changed files with 8 additions and 0 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
]; ];
} }

6
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,7 @@
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._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 +184,9 @@
$.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.text(t('core', 'You may now configure your client with username "{loginName}" and the following password:', {
loginName: resp.loginName
}));
_this._newAppPassword.val(resp.token); _this._newAppPassword.val(resp.token);
_this._toggleFormResult(false); _this._toggleFormResult(false);
_this._newAppPassword.select(); _this._newAppPassword.select();

1
settings/templates/personal.php
View File

@ -203,6 +203,7 @@ 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">
<span id="new-app-login-name"></span>
<input id="new-app-password" type="text" readonly="readonly"/> <input id="new-app-password" type="text" readonly="readonly"/>
<button id="app-password-hide" class="button"><?php p($l->t('Done')); ?></button> <button id="app-password-hide" class="button"><?php p($l->t('Done')); ?></button>
</div> </div>