From 14dd97794c22be051028a6215d1bd968301071db Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 16 Apr 2025 12:25:27 +0200 Subject: [PATCH] tests/util: Change `MockTokenUser::plaintext` to `String` We only use this struct for testing, where we don't want to hide the plaintext token for debugging purposes. This will also make it easier in the future to construct `MockTokenUser` instances from an existing plaintext token, without going through the `PlainToken` struct. --- src/tests/user.rs | 2 +- src/tests/util.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/user.rs b/src/tests/user.rs index 33e98796849..32819b61c7a 100644 --- a/src/tests/user.rs +++ b/src/tests/user.rs @@ -40,7 +40,7 @@ async fn updating_existing_user_doesnt_change_api_token() -> anyhow::Result<()> assert_ok!(session::save_user_to_database(&gh_user, "bar_token", emails, &mut conn).await); // Use the original API token to find the now updated user - let hashed_token = assert_ok!(HashedToken::parse(token.expose_secret())); + let hashed_token = assert_ok!(HashedToken::parse(token)); let api_token = assert_ok!(ApiToken::find_by_api_token(&mut conn, &hashed_token).await); let user = assert_ok!(User::find(&mut conn, api_token.user_id).await); diff --git a/src/tests/util.rs b/src/tests/util.rs index e37d30c571f..0136cd2478e 100644 --- a/src/tests/util.rs +++ b/src/tests/util.rs @@ -336,7 +336,7 @@ impl MockCookieUser { MockTokenUser { app: self.app.clone(), token, - plaintext, + plaintext: plaintext.expose_secret().into(), } } } @@ -345,13 +345,13 @@ impl MockCookieUser { pub struct MockTokenUser { app: TestApp, token: ApiToken, - plaintext: PlainToken, + plaintext: String, } impl RequestHelper for MockTokenUser { fn request_builder(&self, method: Method, path: &str) -> MockRequest { let mut request = req(method, path); - request.header(header::AUTHORIZATION, self.plaintext.expose_secret()); + request.header(header::AUTHORIZATION, &self.plaintext); request } @@ -366,7 +366,7 @@ impl MockTokenUser { &self.token } - pub fn plaintext(&self) -> &PlainToken { + pub fn plaintext(&self) -> &str { &self.plaintext } }