Merge branch 'restructure/0.3.0' of github.com:junkurihara/doh-auth-p…

…roxy into restructure/0.3.0

dap-lib/src/auth/auth.rs → dap-lib/src/auth/authenticator.rs

@@ -1,4 +1,7 @@
-use super::token::{Algorithm, TokenInner, TokenMeta, VerificationKeyType};
+use super::{
+  message::{AuthenticationReqInner, AuthenticationRequest, AuthenticationResponse, JwksResponse},
+  token::{Algorithm, TokenInner, VerificationKeyType},
+};
 use crate::{
   constants::{ENDPOINT_JWKS_PATH, ENDPOINT_LOGIN_PATH},
   error::*,
@@ -9,37 +12,9 @@ use crate::{
 use jwt_compact::alg::Es256;
 use jwt_simple::prelude::{ES256PublicKey, JWTClaims, NoCustomClaims};
 use p256::elliptic_curve::sec1::ToEncodedPoint;
-use serde::{Deserialize, Serialize};
 use std::{str::FromStr, sync::Arc};
 use tokio::sync::RwLock;
 
-/// Authentication request
-#[derive(Serialize)]
-pub struct AuthenticationRequest {
-  auth: AuthenticationReqInner,
-  client_id: String,
-}
-#[derive(Serialize)]
-/// Auth req inner
-pub struct AuthenticationReqInner {
-  username: String,
-  password: String,
-}
-
-#[derive(Deserialize, Debug)]
-/// Auth response
-pub struct AuthenticationResponse {
-  pub token: TokenInner,
-  pub metadata: TokenMeta,
-  pub message: String,
-}
-
-#[derive(Deserialize, Debug)]
-/// Jwks response
-pub struct JwksResponse {
-  pub keys: Vec<serde_json::Value>,
-}
-
 /// Authenticator client
 pub struct Authenticator {
   config: AuthenticationConfig,

dap-lib/src/auth/message.rs

@@ -0,0 +1,29 @@
+use super::token::{TokenInner, TokenMeta};
+use serde::{Deserialize, Serialize};
+
+/// Authentication request
+#[derive(Serialize)]
+pub(super) struct AuthenticationRequest {
+  pub auth: AuthenticationReqInner,
+  pub client_id: String,
+}
+#[derive(Serialize)]
+/// Auth req inner
+pub(super) struct AuthenticationReqInner {
+  pub username: String,
+  pub password: String,
+}
+
+#[derive(Deserialize, Debug)]
+/// Auth response
+pub(super) struct AuthenticationResponse {
+  pub token: TokenInner,
+  pub metadata: TokenMeta,
+  pub message: String,
+}
+
+#[derive(Deserialize, Debug)]
+/// Jwks response
+pub(super) struct JwksResponse {
+  pub keys: Vec<serde_json::Value>,
+}

dap-lib/src/auth/mod.rs

@@ -1,4 +1,5 @@
-mod auth;
+mod authenticator;
+mod message;
 mod token;
 
-pub use auth::Authenticator;
+pub use authenticator::Authenticator;

dap-lib/src/lib.rs

@@ -62,7 +62,7 @@ pub async fn entrypoint(
     authenticator.login().await?;
   }
 
-  // build global
+  // // build global
   // let globals = Arc::new(Globals {
   //   proxy_config: proxy_config.clone(),
   //   runtime_handle: runtime_handle.clone(),