Working out some of the appview structure

.gitignore

···
 .direnv
 .env
 .devenv
+
+.db/
+**/.db/

Cargo.lock

···
 checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
- "axum-core",
+ "axum-core 0.4.5",
  "bytes",
  "futures-util",
  "http",
···
  "hyper",
  "hyper-util",
  "itoa",
- "matchit",
+ "matchit 0.7.3",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
+dependencies = [
+ "axum-core 0.5.2",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit 0.8.4",
  "memchr",
  "mime",
  "percent-encoding",
···
  "async-trait",
  "bytes",
  "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
+dependencies = [
+ "bytes",
+ "futures-core",
  "http",
  "http-body",
  "http-body-util",
···
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
+[[package]]
 name = "cordyceps"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "ab03c107fafeb3ee9f5925686dbb7a73bc76e3932abb0d2b365cb64b169cf04c"
 
 [[package]]
+name = "diesel"
+version = "2.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff3e1edb1f37b4953dd5176916347289ed43d7119cc2e6c7c3f7849ff44ea506"
+dependencies = [
+ "diesel_derives",
+ "libsqlite3-sys",
+ "time",
+]
+
+[[package]]
+name = "diesel_derives"
+version = "2.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68d4216021b3ea446fd2047f5c8f8fe6e98af34508a254a01e4d6bc1e844f84d"
+dependencies = [
+ "diesel_table_macro_syntax",
+ "dsl_auto_type",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "diesel_table_macro_syntax"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
+dependencies = [
+ "syn",
+]
+
+[[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "dsl_auto_type"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139ae9aca7527f85f26dd76483eb38533fd84bd571065da1739656ef71c5ff5b"
+dependencies = [
+ "darling",
+ "either",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
 name = "ecdsa"
 version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "hashlink"
-version = "0.10.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
···
 ]
 
 [[package]]
+name = "http-range-header"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c"
+
+[[package]]
 name = "httparse"
 version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.33.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947e6816f7825b2b45027c2c32e7085da9934defa535de4a6a46b10a4d5257fa"
+checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
 dependencies = [
  "cc",
  "pkg-config",
···
 checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
+[[package]]
 name = "memchr"
 version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "merde"
-version = "10.0.7"
+version = "10.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd8dc7668eb89ede52dc09d4b21a8c2f7c9cd47168ea1f82550f705615d9b99"
+checksum = "5ec14139b169a3bb101da2dd8c0c2e47ddaf63000075662635c64c985bb5ae7b"
 dependencies = [
  "merde_core",
  "merde_json",
···
 
 [[package]]
 name = "merde_core"
-version = "10.0.6"
+version = "10.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e937026f22a5a3567bc402f1edf871ecab0e0222cd6f829ea58abae0185e759c"
+checksum = "714d8f25279d095f8d23392476e2e82427e8689348e34f90ddc0712497e157de"
 dependencies = [
  "camino",
  "compact_bytes",
···
 
 [[package]]
 name = "merde_json"
-version = "10.0.6"
+version = "10.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a729dbfff53e394d26496e43edd4725032cd70f917e9f050fa5639f6a4af3abd"
+checksum = "d354c179fe95a0568c8ffb95c276f73556ecb95edca76f742505320e7545cea9"
 dependencies = [
  "itoa",
  "lexical-parse-float",
···
 
 [[package]]
 name = "merde_msgpack"
-version = "10.0.6"
+version = "10.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe4620c27f9a69f4d105f011855584217648923920273e082507a3b464a8159"
+checksum = "f2b710370fee77ca3cb8e6666a2586f26f3a653d7b2e338ede77a13c99108c5e"
 dependencies = [
  "merde_core",
  "rmp",
···
 
 [[package]]
 name = "merde_yaml"
-version = "10.0.6"
+version = "10.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c36f61da594ecad0ed986ceeb5061eba47a36fcf839576ce525c7e4ff08f3fa"
+checksum = "cb581c31249876b3b385a2cc50fafc666adc9c316874819b7aac7266b3c26c17"
 dependencies = [
  "merde_core",
  "yaml-rust2",
···
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
 
 [[package]]
 name = "minijinja"
···
 
 [[package]]
 name = "ordered-float"
-version = "5.0.0"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
 dependencies = [
  "num-traits",
 ]
···
 
 [[package]]
 name = "rusqlite"
-version = "0.35.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a22715a5d6deef63c637207afbe68d0c72c3f8d0022d7cf9714c442d6157606b"
+checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e"
 dependencies = [
  "bitflags",
  "fallible-iterator",
  "fallible-streaming-iterator",
- "hashlink 0.10.0",
+ "hashlink 0.9.1",
  "libsqlite3-sys",
  "smallvec",
 ]
···
 ]
 
 [[package]]
+name = "tower-cookies"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151b5a3e3c45df17466454bb74e9ecedecc955269bdedbf4d150dfa393b55a36"
+dependencies = [
+ "axum-core 0.5.2",
+ "cookie",
+ "futures-util",
+ "http",
+ "parking_lot",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "http-range-header",
+ "httpdate",
+ "mime",
+ "mime_guess",
+ "percent-encoding",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
 name = "tower-layer"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 name = "weaver-appview"
 version = "0.1.0"
 dependencies = [
- "axum",
+ "atrium-api",
+ "atrium-common",
+ "atrium-identity",
+ "atrium-oauth",
+ "atrium-xrpc",
+ "axum 0.8.4",
  "clap",
+ "diesel",
+ "dotenvy",
  "tokio",
+ "tower",
+ "tower-cookies",
+ "tower-http",
  "weaver-common",
  "weaver-workspace-hack",
 ]
···
 name = "weaver-server"
 version = "0.1.0"
 dependencies = [
- "axum",
+ "axum 0.7.9",
  "clap",
  "tokio",
  "weaver-common",

crates/weaver-appview/Cargo.toml

···
 [dependencies]
 weaver-common = { path = "../weaver-common" }
 weaver-workspace-hack = { version = "0.1", path = "../weaver-workspace-hack" }
+clap = { version = "4.5", features = ["derive", "env", "cargo", "unicode"] }
 
-axum = "0.7.5"
+axum = "0.8"
+tower = "0.5"
+tower-http = { version = "0.6", features = ["fs"] }
+tower-cookies = "0.11"
+
+
 tokio = { version = "1.44", features = ["full"] }
+atrium-oauth = "0.1.1"
+atrium-xrpc = "0.12.3"
+atrium-api =  "0.25.3"
+atrium-common = "0.1.1"
+atrium-identity = "0.1.3"
 
 
-clap = { version = "4.5", features = ["derive", "env", "cargo", "unicode"] }
+diesel = { version = "2.2.0", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
+# build libsqlite3 as part of the build process
+# uncomment this line if you run into setup issues
+# libsqlite3-sys = { version = "0.30", features = ["bundled"] }
+dotenvy = "0.15"

crates/weaver-appview/diesel.toml

···
+# For documentation on how to configure this file,
+# see https://diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/schema.rs"
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
+
+[migrations_directory]
+dir = "/home/orual/Projects/weaver.sh/crates/weaver-appview/migrations"

crates/weaver-appview/src/main.rs

···
+mod oauth;
+
 #[tokio::main]
 async fn main() {}

crates/weaver-cli/src/main.rs

···
 use std::{
     error,
     io::{BufRead, Write, stdin, stdout},
-    sync::Arc,
 };
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn error::Error>> {
-    let client = weaver_common::oauth::default_oauth_client("http://127.0.0.1/callback")?;
+    let client = weaver_common::oauth::default_oauth_client("https://appview.weaver.sh")?;
     println!(
         "Authorization url: {}",
         client
             .authorize(
-                std::env::var("PDS_URL").unwrap_or(String::from("https://atproto.systems")),
+                std::env::var("HANDLE").unwrap_or(String::from("https://atproto.systems")),
                 AuthorizeOptions {
                     scopes: vec![
                         Scope::Known(KnownScope::Atproto),

crates/weaver-common/Cargo.toml

···
 license.workspace = true
 publish = false
 
+[features]
+default = ["dev"]
+dev = []
+
 [dependencies]
 n0-future = { workspace = true }
 weaver-workspace-hack = { version = "0.1", path = "../weaver-workspace-hack" }
 markdown-weaver = { workspace = true }
-libsqlite3-sys = { version = "0.33.0", features = ["bundled"] }
+libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 
 http = "1.3.1"
 

crates/weaver-common/src/oauth.rs

···
     did::{CommonDidResolver, CommonDidResolverConfig, DEFAULT_PLC_DIRECTORY_URL},
     handle::{AtprotoHandleResolver, AtprotoHandleResolverConfig},
 };
+#[cfg(not(feature = "dev"))]
+use atrium_oauth::AtprotoClientMetadata;
+#[cfg(feature = "dev")]
+use atrium_oauth::AtprotoLocalhostClientMetadata;
 use atrium_oauth::{
-    AtprotoLocalhostClientMetadata, DefaultHttpClient, KnownScope, OAuthClient, OAuthClientConfig,
-    OAuthResolverConfig, Scope,
+    DefaultHttpClient, KnownScope, OAuthClient, OAuthClientConfig, OAuthResolverConfig, Scope,
     store::{
         session::{MemorySessionStore, Session},
         state::{InternalStateData, MemoryStateStore},
···
     atrium_oauth::Error,
 > {
     let http_client = Arc::new(atrium_oauth::DefaultHttpClient::default());
+    let keys = if cfg!(feature = "dev") { None } else { todo!() };
     let config = OAuthClientConfig {
-        client_metadata: AtprotoLocalhostClientMetadata {
-            redirect_uris: Some(vec![url.as_ref().to_string()]),
-            scopes: Some(vec![
-                Scope::Known(KnownScope::Atproto),
-                Scope::Known(KnownScope::TransitionGeneric),
-            ]),
-        },
-        keys: None,
+        client_metadata: default_client_metadata(url.as_ref()),
+        keys,
         resolver: OAuthResolverConfig {
             did_resolver: CommonDidResolver::new(CommonDidResolverConfig {
                 plc_directory_url: DEFAULT_PLC_DIRECTORY_URL.to_string(),
···
     let client = OAuthClient::new(config)?;
     Ok(client)
 }
+
+#[cfg(feature = "dev")]
+pub fn default_client_metadata(_host: &str) -> AtprotoLocalhostClientMetadata {
+    AtprotoLocalhostClientMetadata {
+        redirect_uris: make_redirect_uris("http://127.0.0.1:4000"),
+        scopes: make_scopes(),
+    }
+}
+
+#[cfg(not(feature = "dev"))]
+pub fn default_client_metadata(host: &str) -> AtprotoClientMetadata {
+    AtprotoClientMetadata {
+        client_id: host.to_string(),
+        redirect_uris: make_redirect_uris(host),
+        scopes: make_scopes(),
+        token_endpoint_auth_method: AuthMethod::PrivateKeyJwt,
+        grant_types: vec![GrantType::AuthorizationCode, GrantType::RefreshToken],
+        token_endpoint_auth_signing_alg: Some(String::from("ES256")),
+    }
+}
+
+#[inline]
+fn make_redirect_uris(url: &str) -> Option<Vec<String>> {
+    Some(vec![format!("{}/oauth/callback", url)])
+}
+
+#[inline]
+fn make_scopes() -> Option<Vec<Scope>> {
+    Some(vec![
+        Scope::Known(KnownScope::Atproto),
+        Scope::Known(KnownScope::TransitionGeneric),
+    ])
+}

docs/oauth/client-metadata.json

···
-{
-  "client_id": "https://appview.weaver.sh/oauth/client-metadata.json",
-  "application_type": "native",
-  "client_name": "Weaver Appview",
-  "client_uri": "https://appview.weaver.sh",
-  "dpop_bound_access_tokens": true,
-  "grant_types": ["authorization_code", "refresh_token"],
-  "redirect_uris": ["http://127.0.0.1:8080/oauth/callback"],
-  "response_types": ["code"],
-  "scope": "atproto transition:generic",
-  "token_endpoint_auth_method": "none"
-}

flake.nix

···
         NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
 
         LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:$NIX_LD_LIBRARY_PATH";
+        DATABASE_URL = "./.db/weaver.db";
 
         # Additional dev-shell environment variables can be set directly
         # MY_CUSTOM_DEVELOPMENT_VAR = "something else";
···
           cargo-hakari
           nixd
           alejandra
+          diesel-cli
         ];
       };
     });