From 076fa176554fc680ffde3d12096f8ef8b9db2779 Mon Sep 17 00:00:00 2001
From: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
Date: Tue, 5 Jan 2021 11:01:54 +0100
Subject: [PATCH] Rename get_actor_def() to authenticate() which better
 reflects its purpose.

---
 src/daemon/auth/authorizer.rs                        | 6 +++---
 src/daemon/auth/providers/config_file/provider.rs    | 4 ++--
 src/daemon/auth/providers/master_token.rs            | 6 +++---
 src/daemon/auth/providers/openid_connect/provider.rs | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/daemon/auth/authorizer.rs b/src/daemon/auth/authorizer.rs
index 34b4b838..8d3ead1f 100644
--- a/src/daemon/auth/authorizer.rs
+++ b/src/daemon/auth/authorizer.rs
@@ -47,7 +47,7 @@ pub trait AuthProvider: Send + Sync {
         None
     }
 
-    fn get_actor_def(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>>;
+    fn authenticate(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>>;
     fn get_login_url(&self) -> KrillResult<HttpResponse>;
     fn login(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<LoggedInUser>;
     fn logout(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<HttpResponse>;
@@ -114,14 +114,14 @@ impl Authorizer {
 
         // Try the legacy provider first, if any
         let mut authenticate_res = match &self.legacy_provider {
-            Some(provider) => provider.get_actor_def(request),
+            Some(provider) => provider.authenticate(request),
             None => Ok(None),
         };
 
         // Try the real provider if we did not already successfully authenticate
         authenticate_res = match authenticate_res {
             Ok(Some(res)) => Ok(Some(res)),
-            _ => self.primary_provider.get_actor_def(request),
+            _ => self.primary_provider.authenticate(request),
         };
 
         // Create an actor based on the authentication result
diff --git a/src/daemon/auth/providers/config_file/provider.rs b/src/daemon/auth/providers/config_file/provider.rs
index 2c7814a7..94464cc7 100644
--- a/src/daemon/auth/providers/config_file/provider.rs
+++ b/src/daemon/auth/providers/config_file/provider.rs
@@ -87,7 +87,7 @@ impl ConfigFileAuthProvider {
 }
 
 impl AuthProvider for ConfigFileAuthProvider {
-    fn get_actor_def(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>> {
+    fn authenticate(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>> {
         if log_enabled!(log::Level::Trace) {
             trace!("Attempting to authenticate the request..");
         }
@@ -144,7 +144,7 @@ impl AuthProvider for ConfigFileAuthProvider {
             Some(token) => {
                 self.session_cache.remove(&token);
 
-                if let Ok(Some(actor)) = self.get_actor_def(request) {
+                if let Ok(Some(actor)) = self.authenticate(request) {
                     info!("User logged out: {}", actor.name.as_str());
                 }
             }
diff --git a/src/daemon/auth/providers/master_token.rs b/src/daemon/auth/providers/master_token.rs
index efea94e7..5ec31039 100644
--- a/src/daemon/auth/providers/master_token.rs
+++ b/src/daemon/auth/providers/master_token.rs
@@ -28,7 +28,7 @@ impl MasterTokenAuthProvider {
 }
 
 impl AuthProvider for MasterTokenAuthProvider {
-    fn get_actor_def(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>> {
+    fn authenticate(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>> {
         if log_enabled!(log::Level::Trace) {
             trace!("Attempting to authenticate the request..");
         }
@@ -52,7 +52,7 @@ impl AuthProvider for MasterTokenAuthProvider {
     }
 
     fn login(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<LoggedInUser> {
-        match self.get_actor_def(request)? {
+        match self.authenticate(request)? {
             Some(actor_def) => Ok(LoggedInUser {
                 token: self.required_token.clone(),
                 id: actor_def.name.as_str().to_string(),
@@ -63,7 +63,7 @@ impl AuthProvider for MasterTokenAuthProvider {
     }
 
     fn logout(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<HttpResponse> {
-        if let Ok(Some(actor)) = self.get_actor_def(request) {
+        if let Ok(Some(actor)) = self.authenticate(request) {
             info!("User logged out: {}", actor.name.as_str());
         }
 
diff --git a/src/daemon/auth/providers/openid_connect/provider.rs b/src/daemon/auth/providers/openid_connect/provider.rs
index cdb9bbc4..016cd7a1 100644
--- a/src/daemon/auth/providers/openid_connect/provider.rs
+++ b/src/daemon/auth/providers/openid_connect/provider.rs
@@ -478,7 +478,7 @@ impl AuthProvider for OpenIDConnectAuthProvider {
     // TODO: handle error responses from the provider as per RFC 6749 and OpenID
     // Connect Core 1.0 section 3.1.26 Authentication Error Response
 
-    fn get_actor_def(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>> {
+    fn authenticate(&self, request: &hyper::Request<hyper::Body>) -> KrillResult<Option<ActorDef>> {
         if log_enabled!(log::Level::Trace) {
             trace!("Attempting to authenticate the request..");
         }
@@ -925,7 +925,7 @@ impl AuthProvider for OpenIDConnectAuthProvider {
             Some(token) => {
                 self.session_cache.remove(&token);
 
-                if let Ok(Some(actor)) = self.get_actor_def(request) {
+                if let Ok(Some(actor)) = self.authenticate(request) {
                     info!("User logged out: {}", actor.name.as_str());
                 }
             }