chore: prepare for crate publishing

cerberauth · Mar 29, 2024 · e39e1d0 · e39e1d0
1 parent e833d95
commit e39e1d0
Show file tree

Hide file tree

Showing 28 changed files with 46 additions and 42 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -89,6 +89,6 @@ jobs:
       - name: Install stable toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
-      - run: cargo publish -p baffao-core
+      - run: cargo publish -p baffao
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,16 +7,16 @@
         {
             "type": "lldb",
             "request": "launch",
-            "name": "Debug unit tests in library 'baffao-core'",
+            "name": "Debug unit tests in library 'baffao'",
             "cargo": {
                 "args": [
                     "test",
                     "--no-run",
                     "--lib",
-                    "--package=baffao-core"
+                    "--package=baffao"
                 ],
                 "filter": {
-                    "name": "baffao-core",
+                    "name": "baffao",
                     "kind": "lib"
                 }
             },

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,6 @@
 resolver = "2"
 
 members = [
-    "baffao-core",
+    "baffao",
     "baffao-proxy",
 ]
diff --git a/baffao-core/Cargo.toml b/baffao-core/Cargo.toml
diff --git a/baffao-proxy/Cargo.toml b/baffao-proxy/Cargo.toml
@@ -1,14 +1,12 @@
 [package]
 name = "baffao-proxy"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+version = "0.0.1"
+publish = false
 
 [dependencies]
 axum = "0.7.4"
 axum-extra = { version = "0.9.2", features = ["typed-header", "cookie"] }
-baffao-core = { path = "../baffao-core" }
+baffao = { path = "../baffao" }
 config = "0.14.0"
 hyper = { version = "1.2.0", features = ["full"] }
 hyper-util = { version = "0.1.3", features = ["client-legacy"] }

diff --git a/baffao-proxy/src/main.rs b/baffao-proxy/src/main.rs
@@ -10,7 +10,7 @@ use axum::{
     routing::{any, get},
     Router,
 };
-use baffao_core::oauth::OAuthHttpHandler;
+use baffao::oauth::OAuthHttpHandler;
 use hyper_util::{client::legacy::connect::HttpConnector, rt::TokioExecutor};
 use std::time::Duration;
 use tokio::signal;

diff --git a/baffao-proxy/src/oauth.rs b/baffao-proxy/src/oauth.rs
@@ -5,7 +5,7 @@ use axum::{
     response::{IntoResponse, Redirect},
 };
 use axum_extra::extract::CookieJar;
-use baffao_core::{
+use baffao::{
     handlers::{oauth2_authorize, oauth2_callback, AuthorizationCallbackQuery, AuthorizationQuery},
     oauth::OAuthHttpHandler,
 };

diff --git a/baffao-proxy/src/proxy.rs b/baffao-proxy/src/proxy.rs
@@ -4,7 +4,7 @@ use axum::{
     response::IntoResponse,
 };
 use axum_extra::extract::CookieJar;
-use baffao_core::{handlers::proxy, oauth::OAuthHttpHandler};
+use baffao::{handlers::proxy, oauth::OAuthHttpHandler};
 
 use crate::settings::Settings;
 use crate::state::HttpClient;

diff --git a/baffao-proxy/src/session.rs b/baffao-proxy/src/session.rs
@@ -1,6 +1,6 @@
 use axum::{extract::State, response::IntoResponse, Json};
 use axum_extra::extract::cookie::CookieJar;
-use baffao_core::{handlers::get_session_from_cookie, session::Session};
+use baffao::{handlers::get_session_from_cookie, session::Session};
 use serde::Serialize;
 
 use crate::settings::Settings;

diff --git a/baffao-proxy/src/settings.rs b/baffao-proxy/src/settings.rs
@@ -2,7 +2,7 @@ use config::{Config, ConfigError, Environment, File};
 use serde::Deserialize;
 use std::env;
 
-use baffao_core::{
+use baffao::{
     oauth::OAuthConfig,
     settings::{JwtConfig, ServerConfig},
 };

diff --git a/baffao-proxy/src/state.rs b/baffao-proxy/src/state.rs
@@ -1,5 +1,5 @@
 use axum::{body::Body, extract::FromRef};
-use baffao_core::oauth::OAuthHttpHandler;
+use baffao::oauth::OAuthHttpHandler;
 use hyper_util::client::legacy::connect::HttpConnector;
 
 use crate::settings::Settings;

diff --git a/baffao/Cargo.toml b/baffao/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "baffao"
+version = "0.0.1"
+authors = ["CerberAuth <[email protected]>"]
+repository = "https://github.com/cerberauth/baffao"
+homepage = "https://github.com/cerberauth/baffao"
+documentation = "https://github.com/cerberauth/baffao"
+keywords = ["proxy", "oauth2", "authentication", "authorization", "auth"]
+license = "MIT"
+description = "BAckend For Frontend for your SPA authentication and authorization."
+edition = "2021"
+readme = "../README.md"
+
+[dependencies]
+anyhow = "1.0.80"
+axum-extra = { version = "0.9.2", features = ["cookie"] }
+base64 = "0.22.0"
+chrono = "0.4.35"
+config = "0.14.0"
+cookie = "0.18.0"
+hex = "0.4.3"
+http = "1.1.0"
+jsonwebtoken = "9.2.0"
+oauth2 = "4.4.2"
+reqwest = "0.11.24"
+ring = "0.17.8"
+serde = "1.0.197"
+serde_json = "1.0.114"
diff --git a/baffao-core/src/cookies.rs → baffao/src/cookies.rs b/baffao-core/src/cookies.rs → baffao/src/cookies.rs
diff --git a/baffao-core/src/error.rs → baffao/src/error.rs b/baffao-core/src/error.rs → baffao/src/error.rs
diff --git a/baffao-core/src/handlers/authorize.rs → baffao/src/handlers/authorize.rs b/baffao-core/src/handlers/authorize.rs → baffao/src/handlers/authorize.rs
diff --git a/baffao-core/src/handlers/callback.rs → baffao/src/handlers/callback.rs b/baffao-core/src/handlers/callback.rs → baffao/src/handlers/callback.rs
diff --git a/baffao-core/src/handlers/get_session.rs → baffao/src/handlers/get_session.rs b/baffao-core/src/handlers/get_session.rs → baffao/src/handlers/get_session.rs
diff --git a/baffao-core/src/handlers/mod.rs → baffao/src/handlers/mod.rs b/baffao-core/src/handlers/mod.rs → baffao/src/handlers/mod.rs
diff --git a/baffao-core/src/handlers/proxy.rs → baffao/src/handlers/proxy.rs b/baffao-core/src/handlers/proxy.rs → baffao/src/handlers/proxy.rs
diff --git a/baffao-core/src/lib.rs → baffao/src/lib.rs b/baffao-core/src/lib.rs → baffao/src/lib.rs
diff --git a/baffao-core/src/oauth/client.rs → baffao/src/oauth/client.rs b/baffao-core/src/oauth/client.rs → baffao/src/oauth/client.rs
diff --git a/baffao-core/src/oauth/http.rs → baffao/src/oauth/http.rs b/baffao-core/src/oauth/http.rs → baffao/src/oauth/http.rs
diff --git a/baffao-core/src/oauth/mod.rs → baffao/src/oauth/mod.rs b/baffao-core/src/oauth/mod.rs → baffao/src/oauth/mod.rs
diff --git a/baffao-core/src/session/extract_session.rs → baffao/src/session/extract_session.rs b/baffao-core/src/session/extract_session.rs → baffao/src/session/extract_session.rs
diff --git a/baffao-core/src/session/mod.rs → baffao/src/session/mod.rs b/baffao-core/src/session/mod.rs → baffao/src/session/mod.rs
diff --git a/baffao-core/src/session/update_session.rs → baffao/src/session/update_session.rs b/baffao-core/src/session/update_session.rs → baffao/src/session/update_session.rs
diff --git a/baffao-core/src/settings.rs → baffao/src/settings.rs b/baffao-core/src/settings.rs → baffao/src/settings.rs