22#![ allow( deprecated) ]
33
44use futures:: SinkExt as _;
5- use jsonwebtoken:: { DecodingKey , EncodingKey } ;
65use libsql:: Database ;
76use libsql_server:: {
87 auth:: {
@@ -11,7 +10,6 @@ use libsql_server::{
1110 } ,
1211 config:: UserApiConfig ,
1312} ;
14- use ring:: signature:: { Ed25519KeyPair , KeyPair } ;
1513use tempfile:: tempdir;
1614use tokio_stream:: StreamExt ;
1715use tokio_tungstenite:: {
@@ -20,7 +18,10 @@ use tokio_tungstenite::{
2018} ;
2119use turmoil:: net:: TcpStream ;
2220
23- use crate :: common:: net:: { init_tracing, SimServer , TestServer , TurmoilConnector } ;
21+ use crate :: common:: {
22+ auth:: { encode, key_pair} ,
23+ net:: { init_tracing, SimServer , TestServer , TurmoilConnector } ,
24+ } ;
2425
2526async fn make_standalone_server ( auth_strategy : Auth ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
2627 init_tracing ( ) ;
@@ -41,20 +42,14 @@ async fn make_standalone_server(auth_strategy: Auth) -> Result<(), Box<dyn std::
4142}
4243
4344fn gen_test_jwt_auth ( ) -> ( Auth , String ) {
44- let doc = Ed25519KeyPair :: generate_pkcs8 ( & ring :: rand :: SystemRandom :: new ( ) ) . unwrap ( ) ;
45- let encoding_key = EncodingKey :: from_ed_der ( doc . as_ref ( ) ) ;
45+ let ( encoding_key , decoding_key ) = key_pair ( ) ;
46+ let jwt_keys = vec ! [ jsonwebtoken :: DecodingKey :: from_ed_components ( & decoding_key ) . unwrap ( ) ] ;
4647
47- let pair = Ed25519KeyPair :: from_pkcs8 ( doc. as_ref ( ) ) . unwrap ( ) ;
48- let decoding_key = DecodingKey :: from_ed_der ( pair. public_key ( ) . as_ref ( ) ) ;
48+ let auth = Auth :: new ( user_auth_strategies:: Jwt :: new ( jwt_keys) ) ;
4949
5050 let claims = Token :: default ( ) ;
5151
52- let header = jsonwebtoken:: Header :: new ( jsonwebtoken:: Algorithm :: EdDSA ) ;
53- let token = jsonwebtoken:: encode ( & header, & claims, & encoding_key) . unwrap ( ) ;
54-
55- let jwt_keys = vec ! [ decoding_key] ;
56-
57- let auth = Auth :: new ( user_auth_strategies:: Jwt :: new ( jwt_keys) ) ;
52+ let token = encode ( & claims, & encoding_key) ;
5853
5954 ( auth, token)
6055}
0 commit comments