[PR #5065] [MERGED] [PM-20306] Migrate Auth Token Interceptor #5447

Closed
opened 2025-11-27 00:00:02 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5065
Author: @SaintPatrck
Created: 4/16/2025
Status: Merged
Merged: 4/16/2025
Merged by: @SaintPatrck

Base: mainHead: network-module/auth-token-interceptor


📝 Commits (1)

  • 3610ba1 [PM-20306] Migrate AuthTokenInterceptor to network module

📊 Changes

11 files changed (+176 additions, -42 deletions)

View changed files

app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthTokenManager.kt (+8 -0)
app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthTokenManagerImpl.kt (+17 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt (+8 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt (+6 -3)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/retrofit/RetrofitsImpl.kt (+2 -2)
app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthTokenManagerTest.kt (+104 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/retrofit/RetrofitsTest.kt (+2 -2)
📝 network/build.gradle.kts (+4 -0)
📝 network/src/main/kotlin/com/bitwarden/network/interceptor/AuthTokenInterceptor.kt (+5 -17)
network/src/main/kotlin/com/bitwarden/network/interceptor/AuthTokenProvider.kt (+12 -0)
📝 network/src/test/kotlin/com/bitwarden/network/interceptor/AuthTokenInterceptorTest.kt (+8 -18)

📄 Description

🎟️ Tracking

PM-20306

📔 Objective

The AuthTokenInterceptor has been moved from the app module to the network module. This change centralizes network-related components and improves code organization.

The changes include:

  • AuthTokenInterceptor Relocation: The AuthTokenInterceptor class was removed from app and added to network.
  • AuthTokenProvider An interface with getActiveAccessTokenOrNull() has been created in network module.
  • AuthTokenManager A new AuthTokenManager interface and its implementation AuthTokenManagerImpl were created to handle authentication tokens.
  • Dependency Updates: The PlatformNetworkModule has been updated to use the new AuthTokenInterceptor from network.
  • Test Update: Updated tests after changes.
  • FakeInterceptorChain Update: Updated imports for the class.
  • network Module Update: Added Hilt and KSP dependencies to the module.

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/5065 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 4/16/2025 **Status:** ✅ Merged **Merged:** 4/16/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `network-module/auth-token-interceptor` --- ### 📝 Commits (1) - [`3610ba1`](https://github.com/bitwarden/android/commit/3610ba15cb4c8b0d4e837116a37f7b4ae147a6d4) [PM-20306] Migrate AuthTokenInterceptor to `network` module ### 📊 Changes **11 files changed** (+176 additions, -42 deletions) <details> <summary>View changed files</summary> ➕ `app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthTokenManager.kt` (+8 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthTokenManagerImpl.kt` (+17 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt` (+8 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt` (+6 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/retrofit/RetrofitsImpl.kt` (+2 -2) ➕ `app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthTokenManagerTest.kt` (+104 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/retrofit/RetrofitsTest.kt` (+2 -2) 📝 `network/build.gradle.kts` (+4 -0) 📝 `network/src/main/kotlin/com/bitwarden/network/interceptor/AuthTokenInterceptor.kt` (+5 -17) ➕ `network/src/main/kotlin/com/bitwarden/network/interceptor/AuthTokenProvider.kt` (+12 -0) 📝 `network/src/test/kotlin/com/bitwarden/network/interceptor/AuthTokenInterceptorTest.kt` (+8 -18) </details> ### 📄 Description ## 🎟️ Tracking PM-20306 ## 📔 Objective The `AuthTokenInterceptor` has been moved from the `app` module to the `network` module. This change centralizes network-related components and improves code organization. The changes include: - **AuthTokenInterceptor Relocation:** The `AuthTokenInterceptor` class was removed from `app` and added to `network`. - **AuthTokenProvider** An interface with `getActiveAccessTokenOrNull()` has been created in `network` module. - **AuthTokenManager** A new `AuthTokenManager` interface and its implementation `AuthTokenManagerImpl` were created to handle authentication tokens. - **Dependency Updates:** The `PlatformNetworkModule` has been updated to use the new `AuthTokenInterceptor` from `network`. - **Test Update:** Updated tests after changes. - **FakeInterceptorChain Update:** Updated imports for the class. - **network Module Update**: Added Hilt and KSP dependencies to the module. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-27 00:00:02 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5447