Make app password description editable
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
parent
0972a55912
commit
86f0f867ec
|
@ -31,10 +31,12 @@ use BadMethodCallException;
|
|||
use OC\AppFramework\Http;
|
||||
use OC\Authentication\Exceptions\InvalidTokenException;
|
||||
use OC\Authentication\Exceptions\PasswordlessTokenException;
|
||||
use OC\Authentication\Token\DefaultToken;
|
||||
use OC\Authentication\Token\IProvider;
|
||||
use OC\Authentication\Token\IToken;
|
||||
use OC\Settings\Activity\Provider;
|
||||
use OCP\Activity\IManager;
|
||||
use OC\Authentication\Token\PublicKeyToken;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\JSONResponse;
|
||||
use OCP\ILogger;
|
||||
|
@ -112,11 +114,11 @@ class AuthSettingsController extends Controller {
|
|||
|
||||
return array_map(function (IToken $token) use ($sessionToken) {
|
||||
$data = $token->jsonSerialize();
|
||||
$data['canDelete'] = true;
|
||||
$data['canRename'] = $token instanceof DefaultToken || $token instanceof PublicKeyToken;
|
||||
if ($sessionToken->getId() === $token->getId()) {
|
||||
$data['canDelete'] = false;
|
||||
$data['current'] = true;
|
||||
} else {
|
||||
$data['canDelete'] = true;
|
||||
}
|
||||
return $data;
|
||||
}, $tokens);
|
||||
|
@ -212,9 +214,10 @@ class AuthSettingsController extends Controller {
|
|||
*
|
||||
* @param int $id
|
||||
* @param array $scope
|
||||
* @param string $name
|
||||
* @return array|JSONResponse
|
||||
*/
|
||||
public function update($id, array $scope) {
|
||||
public function update($id, array $scope, string $name) {
|
||||
try {
|
||||
$token = $this->findTokenByIdAndUser($id);
|
||||
} catch (InvalidTokenException $e) {
|
||||
|
@ -225,6 +228,11 @@ class AuthSettingsController extends Controller {
|
|||
'filesystem' => $scope['filesystem']
|
||||
]);
|
||||
|
||||
|
||||
if ($token instanceof DefaultToken || $token instanceof PublicKeyToken) {
|
||||
$token->setName($name);
|
||||
}
|
||||
|
||||
$this->tokenProvider->updateToken($token);
|
||||
$this->publishActivity(Provider::APP_TOKEN_UPDATED, $token->getId(), $token->getName());
|
||||
return [];
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
data.revokeText = t('settings', 'Revoke');
|
||||
data.settingsTitle = t('settings', 'Device settings');
|
||||
data.allowFSAccess = t('settings', 'Allow filesystem access');
|
||||
data.renameText = t('settings', 'Rename');
|
||||
return OC.Settings.Templates['authtoken'](data);
|
||||
},
|
||||
|
||||
|
@ -218,6 +219,8 @@
|
|||
$el.on('click', 'a.icon-delete', _.bind(this._onDeleteToken, this));
|
||||
$el.on('click', '.icon-more', _.bind(this._onConfigureToken, this));
|
||||
$el.on('change', 'input.filesystem', _.bind(this._onSetTokenScope, this));
|
||||
$el.on('click', '.icon-rename', _.bind(this._onRenameToken, this));
|
||||
$el.on('keyup', 'input.rename-token', _.bind(this._onEnterTokenName, this));
|
||||
|
||||
this._form = $('#app-password-form');
|
||||
this._tokenName = $('#app-password-name');
|
||||
|
@ -414,6 +417,49 @@
|
|||
token.save();
|
||||
},
|
||||
|
||||
_onRenameToken: function (event) {
|
||||
var $target = $(event.target);
|
||||
var $row = $target.closest('tr');
|
||||
var id = $row.data('id');
|
||||
|
||||
var token = this.collection.get(id);
|
||||
if (_.isUndefined(token)) {
|
||||
// Ignore event
|
||||
return;
|
||||
}
|
||||
|
||||
$row.find('.token-name > span').addClass('hidden');
|
||||
$row.find('.token-name > input').removeClass('hidden').focus();
|
||||
|
||||
this._hideConfigureToken();
|
||||
},
|
||||
|
||||
_onEnterTokenName: function(event) {
|
||||
var $target = $(event.target);
|
||||
var $row = $target.closest('tr');
|
||||
var id = $row.data('id');
|
||||
|
||||
var token = this.collection.get(id);
|
||||
if (_.isUndefined(token)) {
|
||||
// Ignore event
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.key === 'Enter') {
|
||||
token.set('name', $target.context.value);
|
||||
|
||||
var _this = this;
|
||||
$.when(token.save()).always(function () {
|
||||
_this.render();
|
||||
});
|
||||
}
|
||||
|
||||
if (event.key === 'Escape') {
|
||||
$row.find('.token-name > span').removeClass('hidden');
|
||||
$row.find('.token-name > input').addClass('hidden');
|
||||
}
|
||||
},
|
||||
|
||||
_toggleFormResult: function (showForm) {
|
||||
if (showForm) {
|
||||
this._result.slideUp();
|
||||
|
|
|
@ -3,24 +3,36 @@
|
|||
templates['authtoken'] = template({"1":function(container,depth0,helpers,partials,data) {
|
||||
var helper;
|
||||
|
||||
return " <input class=\"hidden rename-token\" type=\"text\" value=\""
|
||||
+ container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"name","hash":{},"data":data}) : helper)))
|
||||
+ "\" />\n";
|
||||
},"3":function(container,depth0,helpers,partials,data) {
|
||||
var helper;
|
||||
|
||||
return "<a class=\"icon icon-more has-tooltip\" tabindex=\"0\" title=\""
|
||||
+ container.escapeExpression(((helper = (helper = helpers.settingsTitle || (depth0 != null ? depth0.settingsTitle : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"settingsTitle","hash":{},"data":data}) : helper)))
|
||||
+ "\"/>";
|
||||
},"3":function(container,depth0,helpers,partials,data) {
|
||||
},"5":function(container,depth0,helpers,partials,data) {
|
||||
var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
|
||||
|
||||
return " <li><span class=\"menuitem\">\n <input class=\"filesystem checkbox\" type=\"checkbox\" id=\""
|
||||
+ alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper)))
|
||||
+ "_filesystem\" "
|
||||
+ ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.scope : depth0)) != null ? stack1.filesystem : stack1),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.scope : depth0)) != null ? stack1.filesystem : stack1),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ " tabindex=\"0\" />\n <label for=\""
|
||||
+ alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper)))
|
||||
+ "_filesystem\">"
|
||||
+ alias4(((helper = (helper = helpers.allowFSAccess || (depth0 != null ? depth0.allowFSAccess : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"allowFSAccess","hash":{},"data":data}) : helper)))
|
||||
+ "</label><br/>\n </span></li>\n";
|
||||
},"4":function(container,depth0,helpers,partials,data) {
|
||||
return "checked";
|
||||
},"6":function(container,depth0,helpers,partials,data) {
|
||||
return "checked";
|
||||
},"8":function(container,depth0,helpers,partials,data) {
|
||||
var helper;
|
||||
|
||||
return " <li>\n <a class=\"icon icon-rename\" tabindex=\"0\">"
|
||||
+ container.escapeExpression(((helper = (helper = helpers.renameText || (depth0 != null ? depth0.renameText : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"renameText","hash":{},"data":data}) : helper)))
|
||||
+ "</a>\n </li>\n";
|
||||
},"10":function(container,depth0,helpers,partials,data) {
|
||||
var helper;
|
||||
|
||||
return " <li>\n <a class=\"icon icon-delete\" tabindex=\"0\">"
|
||||
|
@ -33,17 +45,20 @@ templates['authtoken'] = template({"1":function(container,depth0,helpers,partial
|
|||
+ alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper)))
|
||||
+ "\">\n <td class=\"client\">\n <div class=\""
|
||||
+ alias4(((helper = (helper = helpers.icon || (depth0 != null ? depth0.icon : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"icon","hash":{},"data":data}) : helper)))
|
||||
+ "\" />\n </td>\n <td class=\"token-name\">\n "
|
||||
+ "\" />\n </td>\n <td class=\"token-name\">\n <span>"
|
||||
+ alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
|
||||
+ "\n </td>\n <td>\n <span class=\"last-activity has-tooltip\" title=\""
|
||||
+ "</span>\n"
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canRename : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ " </td>\n <td>\n <span class=\"last-activity has-tooltip\" title=\""
|
||||
+ alias4(((helper = (helper = helpers.lastActivityTime || (depth0 != null ? depth0.lastActivityTime : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"lastActivityTime","hash":{},"data":data}) : helper)))
|
||||
+ "\">"
|
||||
+ alias4(((helper = (helper = helpers.lastActivity || (depth0 != null ? depth0.lastActivity : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"lastActivity","hash":{},"data":data}) : helper)))
|
||||
+ "</span></td>\n <td class=\"more\">\n "
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.showMore : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.showMore : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ "\n <div class=\"popovermenu menu\">\n"
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canScope : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canDelete : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canScope : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canRename : depth0),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canDelete : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
|
||||
+ " </div>\n </td>\n</tr>\n";
|
||||
},"useData":true});
|
||||
templates['federationscopemenu'] = template({"1":function(container,depth0,helpers,partials,data) {
|
||||
|
|
|
@ -3,7 +3,10 @@
|
|||
<div class="{{icon}}" />
|
||||
</td>
|
||||
<td class="token-name">
|
||||
{{name}}
|
||||
<span>{{name}}</span>
|
||||
{{#if canRename}}
|
||||
<input class="hidden rename-token" type="text" value="{{name}}" />
|
||||
{{/if}}
|
||||
</td>
|
||||
<td>
|
||||
<span class="last-activity has-tooltip" title="{{lastActivityTime}}">{{lastActivity}}</span></td>
|
||||
|
@ -16,6 +19,11 @@
|
|||
<label for="{{id}}_filesystem">{{allowFSAccess}}</label><br/>
|
||||
</span></li>
|
||||
{{/if}}
|
||||
{{#if canRename}}
|
||||
<li>
|
||||
<a class="icon icon-rename" tabindex="0">{{renameText}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{#if canDelete}}
|
||||
<li>
|
||||
<a class="icon icon-delete" tabindex="0">{{revokeText}}</a>
|
||||
|
|
Loading…
Reference in New Issue