Skip to content

Commit 3d82de0

Browse files
committed
update amq-protocol
1 parent 852d78a commit 3d82de0

3 files changed

Lines changed: 28 additions & 28 deletions

File tree

Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ rustls--aws_lc_rs = ["amq-protocol/rustls--aws_lc_rs"] # default, but do
3939
rustls--ring = ["amq-protocol/rustls--ring"] # more compatible, (e.g., easily builds on Windows)
4040

4141
[build-dependencies.amq-protocol-codegen]
42-
version = "^10.0.0-rc.2"
42+
version = "^10.0.0-rc.3"
4343
optional = true
4444

4545
[build-dependencies.serde_json]
@@ -53,7 +53,7 @@ futures-core = "^0.3"
5353
futures-io = "^0.3"
5454

5555
[dependencies.amq-protocol]
56-
version = "^10.0.0-rc.2"
56+
version = "^10.0.0-rc.3"
5757
default-features = false
5858

5959
[dependencies.async-rs]

src/auth.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub trait AuthProvider: Send + Sync + 'static {
3131
}
3232

3333
/// Refresh the current session token (Connection.UpdateSecret)
34-
fn refresh(&self) -> Result<String, String> {
34+
fn refresh(&self) -> Result<LongString, String> {
3535
Err("Refresh not supported on current auth provider".to_string())
3636
}
3737
}
@@ -44,7 +44,7 @@ pub trait TokenProvider: Send + Sync + 'static {
4444
}
4545

4646
/// Create a new token
47-
fn create_token(&self) -> Result<String, String>;
47+
fn create_token(&self) -> Result<LongString, String>;
4848
}
4949

5050
pub(crate) struct DefaultAuthProvider {
@@ -120,7 +120,7 @@ impl<TP: TokenProvider> AuthProvider for TokenAuthProvider<TP> {
120120

121121
fn auth_starter(&self) -> Result<LongString, String> {
122122
Ok(
123-
Credentials::new(String::new(), self.token_provider.create_token()?)
123+
Credentials::new(LongString::default(), self.token_provider.create_token()?)
124124
.sasl_auth_string(self.mechanism),
125125
)
126126
}
@@ -129,7 +129,7 @@ impl<TP: TokenProvider> AuthProvider for TokenAuthProvider<TP> {
129129
self.token_provider.valid_for()
130130
}
131131

132-
fn refresh(&self) -> Result<String, String> {
132+
fn refresh(&self) -> Result<LongString, String> {
133133
self.token_provider.create_token()
134134
}
135135
}
@@ -148,27 +148,27 @@ impl<TP: TokenProvider> AuthProvider for TokenAuthProvider<TP> {
148148
/// ```
149149
pub struct DefaultTokenProvider {
150150
#[allow(clippy::type_complexity)]
151-
valid_for: Box<dyn Fn(&str) -> Option<Duration> + Send + Sync + 'static>,
152-
create_token: Box<dyn Fn() -> Result<String, String> + Send + Sync + 'static>,
153-
token: Mutex<String>,
151+
valid_for: Box<dyn Fn(&LongString) -> Option<Duration> + Send + Sync + 'static>,
152+
create_token: Box<dyn Fn() -> Result<LongString, String> + Send + Sync + 'static>,
153+
token: Mutex<LongString>,
154154
}
155155

156156
impl DefaultTokenProvider {
157157
pub fn new<
158-
VF: Fn(&str) -> Option<Duration> + Send + Sync + 'static,
159-
CT: Fn() -> Result<String, String> + Send + Sync + 'static,
158+
VF: Fn(&LongString) -> Option<Duration> + Send + Sync + 'static,
159+
CT: Fn() -> Result<LongString, String> + Send + Sync + 'static,
160160
>(
161161
valid_for: VF,
162162
create_token: CT,
163163
) -> Self {
164164
Self {
165165
valid_for: Box::new(valid_for),
166166
create_token: Box::new(create_token),
167-
token: Mutex::new(String::new()),
167+
token: Mutex::new(LongString::default()),
168168
}
169169
}
170170

171-
fn lock_token(&self) -> MutexGuard<'_, String> {
171+
fn lock_token(&self) -> MutexGuard<'_, LongString> {
172172
self.token.lock().unwrap_or_else(|e| e.into_inner())
173173
}
174174
}
@@ -178,7 +178,7 @@ impl TokenProvider for DefaultTokenProvider {
178178
(self.valid_for)(&self.lock_token())
179179
}
180180

181-
fn create_token(&self) -> Result<String, String> {
181+
fn create_token(&self) -> Result<LongString, String> {
182182
let token = (self.create_token)()?;
183183
*self.lock_token() = token.clone();
184184
Ok(token)

0 commit comments

Comments
 (0)