Fix failure on the upload of PGP keys (#3970)

globaleaks · Jan 24, 2024 · 917c0f9 · 917c0f9
1 parent a3d81a4
commit 917c0f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/backend/globaleaks/handlers/user/__init__.py b/backend/globaleaks/handlers/user/__init__.py
@@ -28,8 +28,6 @@ def parse_pgp_options(user, request):
     if not remove_key and pgp_key_public:
         pgpctx = PGPContext(pgp_key_public)
         user.pgp_key_public = pgp_key_public
-        user.can_redact_information = request['can_redact_information']
-        user.can_mask_information = request['can_mask_information']
         user.pgp_key_fingerprint = pgpctx.fingerprint
         user.pgp_key_expiration = pgpctx.expiration
     else:

diff --git a/client/app/js/controllers/admin/users.js b/client/app/js/controllers/admin/users.js
@@ -62,7 +62,8 @@ GL.controller("AdminUserTabCtrl", ["$scope",
     $scope.loadPublicKeyFile = function(file) {
       $scope.Utils.readFileAsText(file).then(function(txt) {
         $scope.user.pgp_key_public = txt;
-      }, $scope.Utils.displayErrorMsg);
+	return $scope.saveUser();
+      });
     };
 
     $scope.setPassword = function() {

diff --git a/client/app/js/controllers/preferences.js b/client/app/js/controllers/preferences.js
@@ -99,7 +99,8 @@ GL.controller("PreferencesCtrl", ["$scope", "$q", "$http", "$location", "$window
     $scope.loadPublicKeyFile = function(file) {
       $scope.Utils.readFileAsText(file).then(function(txt) {
         $scope.resources.preferences.pgp_key_public = txt;
-       }, $scope.Utils.displayErrorMsg);
+	return $scope.save();
+       });
     };
 }]).
 controller("TwoFactorModalCtrl",