Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: slight refactor and mock token validation #31

Merged
merged 2 commits into from
Feb 2, 2023
Merged

test: slight refactor and mock token validation #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b2c679
test: slight refactor and mock token validation
nunogois Feb 1, 2023
76c3152
fix: typo
nunogois Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions server/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,8 @@ pub struct ClientFeaturesRequest {
pub etag: Option<EntityTag>,
}

#[derive(Clone, Debug)]
pub struct ValidateTokenRequest {
pub api_key: String,
pub validation_request: ValidationRequest,
}

#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct ValidationRequest {
pub struct ValidateTokenRequest {
pub tokens: Vec<String>,
}

Expand Down
58 changes: 33 additions & 25 deletions server/src/unleash_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,12 @@ impl UnleashClient {
pub async fn validate_secret(&self, request: ValidateTokenRequest) -> EdgeResult<TokenStatus> {
let mut result = self
.awc_validate_token_req()
.send_body(serde_json::to_string(&request.validation_request).unwrap())
.send_body(serde_json::to_string(&request).unwrap())
.await
.map_err(|_| EdgeError::EdgeTokenError)?;
match result.status() {
StatusCode::FORBIDDEN => Ok(TokenStatus::Invalid),
StatusCode::OK => {
println!("Had an ok response");
let token_response = result
.json::<EdgeTokens>()
.await
Expand All @@ -121,10 +120,7 @@ impl UnleashClient {
}
}
}
_ => {
println!("{}", result.status());
Err(EdgeError::EdgeTokenError)
}
_ => Err(EdgeError::EdgeTokenError),
}
}
}
Expand All @@ -133,8 +129,8 @@ impl UnleashClient {
mod tests {
use crate::{
types::{
ClientFeaturesRequest, ClientFeaturesResponse, TokenStatus, ValidateTokenRequest,
ValidationRequest,
ClientFeaturesRequest, ClientFeaturesResponse, EdgeToken, TokenStatus,
ValidateTokenRequest,
},
unleash_client::UnleashClient,
};
Expand All @@ -145,6 +141,11 @@ mod tests {
use actix_web::{dev::AppConfig, http::header::EntityTag, web, App, HttpResponse};
use std::str::FromStr;
use unleash_types::client_features::{ClientFeature, ClientFeatures};

use super::EdgeTokens;

const TEST_TOKEN: &str = "[]:development.08bce4267a3b1aa";

fn two_client_features() -> ClientFeatures {
ClientFeatures {
version: 2,
Expand All @@ -167,14 +168,28 @@ mod tests {
async fn return_client_features() -> HttpResponse {
HttpResponse::Ok().json(two_client_features())
}
async fn return_validate_tokens() -> HttpResponse {
HttpResponse::Ok().json(EdgeTokens {
tokens: vec![EdgeToken {
token: TEST_TOKEN.into(),
..Default::default()
}],
})
}

async fn test_features_server() -> TestServer {
test_server(move || {
HttpService::new(map_config(
App::new().wrap(Etag::default()).service(
web::resource("/api/client/features")
.route(web::get().to(return_client_features)),
),
App::new()
.wrap(Etag::default())
.service(
web::resource("/api/client/features")
.route(web::get().to(return_client_features)),
)
.service(
web::resource("/edge/validate")
.route(web::post().to(return_validate_tokens)),
),
|_| AppConfig::default(),
))
.tcp()
Expand Down Expand Up @@ -212,13 +227,12 @@ mod tests {

#[actix_web::test]
async fn client_handles_304() {
let api_key = "*:development.a113e11e04133c367f5fa7c731f9293c492322cf9d6060812cfe3fea";
let srv = test_features_server().await;
let tag = expected_etag(two_client_features());
let client = UnleashClient::new(srv.url("/").as_str(), None).unwrap();
let client_features_result = client
.get_client_features(ClientFeaturesRequest::new(
api_key.to_string(),
TEST_TOKEN.to_string(),
Some(tag.clone()),
))
.await;
Expand All @@ -234,30 +248,24 @@ mod tests {

#[actix_web::test]
async fn can_validate_secret() {
let api_key = "[]:development.08bce4267a3b1aa";
let client = UnleashClient::new("https://app.unleash-hosted.com/hosted", None)
.expect("Couldn't create client");
let srv = test_features_server().await;
let client = UnleashClient::new(srv.url("/").as_str(), None).unwrap();
let validate_result = client
.validate_secret(ValidateTokenRequest {
api_key: api_key.to_string(),
validation_request: ValidationRequest {
tokens: vec![api_key.to_string()],
},
tokens: vec![TEST_TOKEN.to_string()],
})
.await;
match validate_result {
Ok(token_status) => match token_status {
TokenStatus::Valid(data) => {
println!("Had a valid token {data:#?}");
assert_eq!(data.token, api_key.to_string());
assert_eq!(data.token, TEST_TOKEN.to_string());
}
TokenStatus::Invalid => {
panic!("Expected my token to be valid, but got an invalid status instead");
}
},
Err(e) => {
println!("{e:#?}");
panic!("Invalid");
panic!("Error validating token: {e}");
}
}
}
Expand Down