Compare commits
8 Commits
v0.1.0-dev
...
v0.1.0-dev
Author | SHA1 | Date | |
---|---|---|---|
c9873d95d7 | |||
f105de7c80 | |||
9b77a8dd78 | |||
dda88ce0a0 | |||
5893710431 | |||
0a678228dd | |||
bfc14c96a7 | |||
f2005de668 |
@@ -19,7 +19,15 @@ jobs:
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.85.0
|
||||
- run: cargo check
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||
chmod 600 ~/.ssh/gitlab_deploy_key
|
||||
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
|
||||
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/gitlab_deploy_key
|
||||
cargo check
|
||||
|
||||
test:
|
||||
name: Test Suite
|
||||
@@ -29,7 +37,15 @@ jobs:
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.85.0
|
||||
- run: cargo test
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||
chmod 600 ~/.ssh/gitlab_deploy_key
|
||||
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
|
||||
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/gitlab_deploy_key
|
||||
cargo test
|
||||
|
||||
fmt:
|
||||
name: Rustfmt
|
||||
@@ -40,7 +56,15 @@ jobs:
|
||||
with:
|
||||
toolchain: 1.85.0
|
||||
- run: rustup component add rustfmt
|
||||
- run: cargo fmt --all -- --check
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||
chmod 600 ~/.ssh/gitlab_deploy_key
|
||||
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
|
||||
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/gitlab_deploy_key
|
||||
cargo fmt --all -- --check
|
||||
|
||||
clippy:
|
||||
name: Clippy
|
||||
@@ -51,7 +75,15 @@ jobs:
|
||||
with:
|
||||
toolchain: 1.85.0
|
||||
- run: rustup component add clippy
|
||||
- run: cargo clippy -- -D warnings
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||
chmod 600 ~/.ssh/gitlab_deploy_key
|
||||
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
|
||||
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/gitlab_deploy_key
|
||||
cargo clippy -- -D warnings
|
||||
|
||||
build:
|
||||
name: build
|
||||
@@ -61,5 +93,13 @@ jobs:
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.85.0
|
||||
- run: cargo build
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||
chmod 600 ~/.ssh/gitlab_deploy_key
|
||||
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
|
||||
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/gitlab_deploy_key
|
||||
cargo build --release
|
||||
|
||||
|
@@ -8,4 +8,7 @@ axum = { version = "0.8.3" }
|
||||
serde = { version = "1.0.218", features = ["derive"] }
|
||||
serde_json = { version = "1.0.139" }
|
||||
tokio = { version = "1.44.1", features = ["rt-multi-thread"] }
|
||||
tracing-subscriber = "0.3.19"
|
||||
tracing-subscriber = { version = "0.3.19" }
|
||||
tower = { version = "0.5.2" }
|
||||
hyper = { version = "1.6.0" }
|
||||
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.2.0" }
|
||||
|
4
src/callers/common.rs
Normal file
4
src/callers/common.rs
Normal file
@@ -0,0 +1,4 @@
|
||||
// basic handler that responds with a static string
|
||||
pub async fn root() -> &'static str {
|
||||
"Hello, World!"
|
||||
}
|
7
src/callers/mod.rs
Normal file
7
src/callers/mod.rs
Normal file
@@ -0,0 +1,7 @@
|
||||
pub mod common;
|
||||
pub mod register;
|
||||
|
||||
pub mod endpoints {
|
||||
pub const ROOT: &str = "/";
|
||||
pub const REGISTER: &str = "api/v2/register";
|
||||
}
|
12
src/callers/register.rs
Normal file
12
src/callers/register.rs
Normal file
@@ -0,0 +1,12 @@
|
||||
use axum::{Json, http::StatusCode};
|
||||
|
||||
use crate::models;
|
||||
|
||||
pub async fn register_user(
|
||||
Json(payload): Json<models::common::CreateUser>,
|
||||
) -> (StatusCode, Json<models::common::User>) {
|
||||
let user = models::common::User {
|
||||
username: payload.username.clone(),
|
||||
};
|
||||
(StatusCode::CREATED, Json(user))
|
||||
}
|
10
src/config/mod.rs
Normal file
10
src/config/mod.rs
Normal file
@@ -0,0 +1,10 @@
|
||||
pub fn get_full() -> String {
|
||||
get_address() + ":" + &get_port()
|
||||
}
|
||||
fn get_address() -> String {
|
||||
String::from("0.0.0.0")
|
||||
}
|
||||
|
||||
fn get_port() -> String {
|
||||
String::from("3000")
|
||||
}
|
3
src/lib.rs
Normal file
3
src/lib.rs
Normal file
@@ -0,0 +1,3 @@
|
||||
pub mod callers;
|
||||
pub mod config;
|
||||
pub mod models;
|
35
src/main.rs
35
src/main.rs
@@ -1,9 +1,10 @@
|
||||
use axum::{
|
||||
Json, Router,
|
||||
http::StatusCode,
|
||||
Router,
|
||||
routing::{get, post},
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use icarus_auth::callers;
|
||||
use icarus_auth::config;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
@@ -12,28 +13,14 @@ async fn main() {
|
||||
|
||||
// build our application with a route
|
||||
let app = Router::new()
|
||||
// `GET /` goes to `root`
|
||||
.route("/", get(root));
|
||||
// `POST /users` goes to `create_user`
|
||||
// .route("/users", post(create_user));
|
||||
.route(callers::endpoints::ROOT, get(callers::common::root))
|
||||
.route(
|
||||
callers::endpoints::REGISTER,
|
||||
post(callers::register::register_user),
|
||||
);
|
||||
|
||||
// run our app with hyper, listening globally on port 3000
|
||||
let listener = tokio::net::TcpListener::bind(get_full()).await.unwrap();
|
||||
let url = config::get_full();
|
||||
let listener = tokio::net::TcpListener::bind(url).await.unwrap();
|
||||
axum::serve(listener, app).await.unwrap();
|
||||
}
|
||||
|
||||
fn get_full() -> String {
|
||||
get_address() + ":" + &get_port()
|
||||
}
|
||||
fn get_address() -> String {
|
||||
String::from("0.0.0.0")
|
||||
}
|
||||
|
||||
fn get_port() -> String {
|
||||
String::from("3000")
|
||||
}
|
||||
|
||||
// basic handler that responds with a static string
|
||||
async fn root() -> &'static str {
|
||||
"Hello, World!"
|
||||
}
|
||||
|
11
src/models/common.rs
Normal file
11
src/models/common.rs
Normal file
@@ -0,0 +1,11 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct CreateUser {
|
||||
pub username: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct User {
|
||||
pub username: String,
|
||||
}
|
1
src/models/mod.rs
Normal file
1
src/models/mod.rs
Normal file
@@ -0,0 +1 @@
|
||||
pub mod common;
|
42
tests/auth_tests.rs
Normal file
42
tests/auth_tests.rs
Normal file
@@ -0,0 +1,42 @@
|
||||
extern crate icarus_auth;
|
||||
|
||||
use axum::body::Body;
|
||||
// use axum::response::Response;
|
||||
use axum::{
|
||||
Router,
|
||||
http::{Request, StatusCode},
|
||||
routing::get,
|
||||
};
|
||||
// use http::{Request, StatusCode};
|
||||
// use serde_json::json;
|
||||
// use tower::ServiceExt; // for `.oneshot()`
|
||||
use tower::util::ServiceExt;
|
||||
|
||||
use crate::icarus_auth::callers;
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_hello_world() {
|
||||
let app = Router::new().route(callers::endpoints::ROOT, get(callers::common::root)); // Replace with your handler
|
||||
|
||||
let response = app
|
||||
.oneshot(
|
||||
Request::builder()
|
||||
.uri(callers::endpoints::ROOT)
|
||||
.body(Body::empty())
|
||||
.unwrap(),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
|
||||
let body = String::from_utf8(
|
||||
axum::body::to_bytes(response.into_body(), usize::MAX)
|
||||
.await
|
||||
.unwrap()
|
||||
.to_vec(),
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(body, "Hello, World!");
|
||||
}
|
Reference in New Issue
Block a user