safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 06:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-770: Switch to Boolean field for clearing data.

Browse Source
This commit is contained in:
Virtually Nick
2020-04-03 14:47:40 -04:00
parent 43e5024676
commit 4f4a060d4a
4 changed files with 25 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/guacamole-auth-totp/src/main/resources/config/totpConfig.js
View File

@@ -29,12 +29,5 @@ angular.module('guacTOTP').config(['formServiceProvider',
controller : 'authenticationCodeFieldController',
templateUrl : 'app/ext/totp/templates/authenticationCodeField.html'
});
// Add field type for resetting TOTP data
formServiceProvider.registerFieldType('GUAC_TOTP_RESET', {
module : 'guacTOTP',
controller : 'totpResetFieldController',
templateUrl : 'app/form/templates/checkboxField.html'
});
}]);

46
extensions/guacamole-auth-totp/src/main/resources/controllers/totpResetFieldController.js
View File

@@ -1,46 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*/
/**
* Controller for the "GUAC_TOTP_CODE" field which prompts the user to enter
* the code generated by their authentication device.
*/
angular.module('guacTOTP').controller('totpResetFieldController', ['$scope', '$window',
function totpResetFieldController($scope, $window) {
var origValue = $scope.model;
// Update typed value when model is changed
$scope.$watch('model', function modelChanged(model) {
if (!model || model === '')
$scope.typedValue = true;
else
$scope.typedValue = false;
});
// Update string value in model when typed value is changed
$scope.$watch('typedValue', function typedValueChanged(typedValue) {
if (typedValue && typedValue !== '')
$scope.model = '';
else
$scope.model = origValue;
});
}]);

2
extensions/guacamole-auth-totp/src/main/resources/translations/en.json
View File

@@ -33,7 +33,7 @@
"USER_ATTRIBUTES" : {
"FIELD_HEADER_GUAC_TOTP_KEY_SECRET" : "Clear TOTP key:",
"FIELD_HEADER_GUAC_TOTP_RESET" : "Clear TOTP secret:",
"FIELD_HEADER_GUAC_TOTP_KEY_CONFIRMED" : "TOTP key confirmed:",
"SECTION_HEADER_TOTP_CONFIG_FORM" : "Configure TOTP"