From 8663b260f6b6cdac938404d3ab86b0ab025112c2 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 27 Jul 2016 10:14:18 -0700
Subject: [PATCH] code review -- applyPermissionsForUser to
 setPermissionsForUser, don't take input permissions as an argument

---
 domain-server/src/DomainGatekeeper.cpp | 14 +++++++-------
 domain-server/src/DomainGatekeeper.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index cab3206031..476b99889b 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -120,8 +120,8 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
     }
 }
 
-NodePermissions DomainGatekeeper::applyPermissionsForUser(bool isLocalUser,
-                                                          NodePermissions userPerms, QString verifiedUsername) {
+NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QString verifiedUsername) {
+    NodePermissions userPerms;
     userPerms.setAll(false);
 
     if (isLocalUser) {
@@ -208,9 +208,9 @@ void DomainGatekeeper::updateNodePermissions() {
     auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
     limitedNodeList->eachNode([this, limitedNodeList, &nodesToKill](const SharedNodePointer& node){
         // the id and the username in NodePermissions will often be the same, but id is set before
-        // authentication and username is only set once they user's key has been confirmed.
-        QString username = node->getPermissions().getVerifiedUserName();
-        NodePermissions userPerms(NodePermissionsKey(username, 0));
+        // authentication and verifiedUsername is only set once they user's key has been confirmed.
+        QString verifiedUsername = node->getPermissions().getVerifiedUserName();
+        NodePermissions userPerms(NodePermissionsKey(verifiedUsername, 0));
 
         if (node->getPermissions().isAssignment) {
             // this node is an assignment-client
@@ -224,7 +224,7 @@ void DomainGatekeeper::updateNodePermissions() {
             const QHostAddress& addr = node->getLocalSocket().getAddress();
             bool isLocalUser = (addr == limitedNodeList->getLocalSockAddr().getAddress() ||
                                 addr == QHostAddress::LocalHost);
-            userPerms = applyPermissionsForUser(isLocalUser, userPerms, username);
+            userPerms = setPermissionsForUser(isLocalUser, verifiedUsername);
         }
 
         node->setPermissions(userPerms);
@@ -330,7 +330,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
         return SharedNodePointer();
     }
 
-    userPerms = applyPermissionsForUser(isLocalUser, userPerms, verifiedUsername);
+    userPerms = setPermissionsForUser(isLocalUser, verifiedUsername);
 
     if (!userPerms.can(NodePermissions::Permission::canConnectToDomain)) {
         sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.",
diff --git a/domain-server/src/DomainGatekeeper.h b/domain-server/src/DomainGatekeeper.h
index 1611d14558..12697b8f3b 100644
--- a/domain-server/src/DomainGatekeeper.h
+++ b/domain-server/src/DomainGatekeeper.h
@@ -106,7 +106,7 @@ private:
     QSet<QString> _domainOwnerFriends; // keep track of friends of the domain owner
     QSet<QString> _inFlightGroupMembershipsRequests; // keep track of which we've already asked for
 
-    NodePermissions applyPermissionsForUser(bool isLocalUser, NodePermissions userPerms, QString verifiedUsername);
+    NodePermissions setPermissionsForUser(bool isLocalUser, QString verifiedUsername);
     void getGroupMemberships(const QString& username);
     // void getIsGroupMember(const QString& username, const QUuid groupID);
     void getDomainOwnerFriendsList();