Commit 9c9f6df
Move debugIntuneCE and prodIntuneCE from BrokerData to AppRegistry as App instances, Fixes AB#3539245 (#3012)
[AB#3539245](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3539245)
`debugIntuneCE` and `prodIntuneCE` were defined in `BrokerData` despite
Intune CE (`com.microsoft.intune`) not being a broker app. These belong
in `AppRegistry` alongside other non-broker app identities.
## Changes
- **`BrokerData.kt`**: Removed `debugIntuneCE` and `prodIntuneCE`
companion object entries
- **`AppRegistry.kt`**:
- Added `INTUNE_CE_PROD` and `INTUNE_CE_DEBUG` as `App` instances
- Updated `DEVICE_REGISTRATION_AUTHORIZED_APPS` to reference the new
entries
- Added `FORCE_BROKER_DISCOVERY_ALLOW_LIST` — a new allow-list set for
force broker discovery:
- Prod-only path: `setOf(INTUNE_CE_PROD)`
- Debug path (when `getShouldTrustDebugBrokers()` is true): includes
`INTUNE_CE_PROD`, `INTUNE_CE_DEBUG`, `debugMockLtw`, `debugMockCp`,
`debugMockAuthApp`, and `debugBrokerHost`
- Added imports for `INTUNE_APP_PACKAGE_NAME`,
`INTUNE_APP_SHA512_DEBUG_SIGNATURE`,
`INTUNE_APP_SHA512_RELEASE_SIGNATURE`
- **`changelog.txt`**: Added vNext entry for this change
```kotlin
// Before — in BrokerData companion object
val debugIntuneCE = BrokerData(INTUNE_APP_PACKAGE_NAME, INTUNE_APP_SHA512_DEBUG_SIGNATURE, "debugIntuneCE")
val prodIntuneCE = BrokerData(INTUNE_APP_PACKAGE_NAME, INTUNE_APP_SHA512_RELEASE_SIGNATURE, "prodIntuneCE")
// After — in AppRegistry
val INTUNE_CE_DEBUG = App(nickName = "Intune Company Portal (debug)", packageName = INTUNE_APP_PACKAGE_NAME, signingCertificateThumbprint = INTUNE_APP_SHA512_DEBUG_SIGNATURE)
val INTUNE_CE_PROD = App(nickName = "Intune Company Portal (prod)", packageName = INTUNE_APP_PACKAGE_NAME, signingCertificateThumbprint = INTUNE_APP_SHA512_RELEASE_SIGNATURE)
// New — Force Broker discovery allow list
val FORCE_BROKER_DISCOVERY_ALLOW_LIST = if (BrokerData.getShouldTrustDebugBrokers()) {
buildSet {
add(INTUNE_CE_PROD); add(INTUNE_CE_DEBUG)
add(BrokerData.debugMockLtw); add(BrokerData.debugMockCp)
add(BrokerData.debugMockAuthApp); add(BrokerData.debugBrokerHost)
}
} else {
setOf(INTUNE_CE_PROD)
}
```
<!-- START COPILOT CODING AGENT TIPS -->
---
🔒 GitHub Advanced Security automatically protects Copilot coding agent
pull requests. You can protect all pull requests by enabling Advanced
Security for your repositories. [Learn more about Advanced
Security.](https://gh.io/cca-advanced-security)
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: rpdome <19558668+rpdome@users.noreply.github.com>1 parent 8df4e3e commit 9c9f6df
3 files changed
Lines changed: 34 additions & 16 deletions
File tree
- common/src/main/java/com/microsoft/identity/common/internal
- apps
- broker
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
Lines changed: 33 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
29 | 32 | | |
30 | 33 | | |
31 | 34 | | |
| |||
97 | 100 | | |
98 | 101 | | |
99 | 102 | | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
100 | 115 | | |
101 | 116 | | |
102 | 117 | | |
| |||
128 | 143 | | |
129 | 144 | | |
130 | 145 | | |
131 | | - | |
| 146 | + | |
132 | 147 | | |
133 | 148 | | |
134 | 149 | | |
135 | 150 | | |
136 | 151 | | |
137 | 152 | | |
138 | | - | |
| 153 | + | |
139 | 154 | | |
140 | 155 | | |
141 | 156 | | |
| |||
153 | 168 | | |
154 | 169 | | |
155 | 170 | | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
156 | 187 | | |
Lines changed: 0 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
171 | 171 | | |
172 | 172 | | |
173 | 173 | | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
188 | 174 | | |
189 | 175 | | |
190 | 176 | | |
| |||
0 commit comments