@@ -1634,18 +1634,6 @@ async fn run_refresh_worker_tick(
16341634 }
16351635 continue ;
16361636 }
1637- let strategy = ProviderCredentialRefreshStrategy :: try_from ( state. strategy )
1638- . unwrap_or ( ProviderCredentialRefreshStrategy :: Unspecified ) ;
1639- if !is_gateway_mintable_strategy ( strategy) {
1640- warn ! (
1641- provider = %state. provider_name,
1642- credential_key = %state. credential_key,
1643- strategy = %refresh_strategy_name( state. strategy) ,
1644- status = %state. status,
1645- "skipping non-gateway-mintable provider credential refresh state"
1646- ) ;
1647- continue ;
1648- }
16491637 let mut state = match migrate_inline_secret_material ( store, credentials, & state) . await {
16501638 Ok ( state) => state,
16511639 Err ( err) => {
@@ -1672,6 +1660,18 @@ async fn run_refresh_worker_tick(
16721660 "provider refresh material cleanup failed; continuing with live refresh"
16731661 ) ;
16741662 }
1663+ let strategy = ProviderCredentialRefreshStrategy :: try_from ( state. strategy )
1664+ . unwrap_or ( ProviderCredentialRefreshStrategy :: Unspecified ) ;
1665+ if !is_gateway_mintable_strategy ( strategy) {
1666+ warn ! (
1667+ provider = %state. provider_name,
1668+ credential_key = %state. credential_key,
1669+ strategy = %refresh_strategy_name( state. strategy) ,
1670+ status = %state. status,
1671+ "skipping non-gateway-mintable provider credential refresh state"
1672+ ) ;
1673+ continue ;
1674+ }
16751675 let due = state. next_refresh_at_ms <= 0 || state. next_refresh_at_ms <= now_ms;
16761676 let rotation_requested = state. status == "rotation_requested" ;
16771677 info ! (
@@ -2692,6 +2692,63 @@ mod tests {
26922692 ) ;
26932693 }
26942694
2695+ #[ tokio:: test]
2696+ async fn refresh_worker_migrates_legacy_secrets_before_skipping_non_mintable_state ( ) {
2697+ let store = test_store ( ) . await ;
2698+ let provider = provider ( "legacy-external" , "outlook" ) ;
2699+ store. put_message ( & provider) . await . unwrap ( ) ;
2700+ let state = new_refresh_state (
2701+ & provider,
2702+ "default" ,
2703+ "MS_GRAPH_ACCESS_TOKEN" ,
2704+ NewRefreshStateConfig {
2705+ strategy : ProviderCredentialRefreshStrategy :: External ,
2706+ material : HashMap :: from ( [ (
2707+ "legacy_secret" . to_string ( ) ,
2708+ "move-me-out-of-the-database" . to_string ( ) ,
2709+ ) ] ) ,
2710+ secret_material_keys : vec ! [ "legacy_secret" . to_string( ) ] ,
2711+ expires_at_ms : 0 ,
2712+ token_url : String :: new ( ) ,
2713+ scopes : Vec :: new ( ) ,
2714+ refresh_before_seconds : 0 ,
2715+ max_lifetime_seconds : 0 ,
2716+ additional_output_keys : HashMap :: new ( ) ,
2717+ } ,
2718+ )
2719+ . unwrap ( ) ;
2720+ put_refresh_state ( & store, & state) . await . unwrap ( ) ;
2721+ let credentials = test_credentials ( ) ;
2722+
2723+ run_refresh_worker_tick ( & store, Some ( & credentials) , None )
2724+ . await
2725+ . unwrap ( ) ;
2726+
2727+ let stored = get_refresh_state (
2728+ & store,
2729+ "default" ,
2730+ provider. object_id ( ) ,
2731+ "MS_GRAPH_ACCESS_TOKEN" ,
2732+ )
2733+ . await
2734+ . unwrap ( )
2735+ . unwrap ( ) ;
2736+ assert ! ( !stored. material. contains_key( "legacy_secret" ) ) ;
2737+ assert ! ( stored. secret_material_handles. contains_key( "legacy_secret" ) ) ;
2738+ assert_eq ! ( stored. status, "configured" ) ;
2739+ assert_eq ! (
2740+ credentials
2741+ . resolve_refresh_material(
2742+ refresh_material_scope( & stored) ,
2743+ & stored. secret_material_handles,
2744+ )
2745+ . await
2746+ . unwrap( )
2747+ . get( "legacy_secret" ) ,
2748+ Some ( & "move-me-out-of-the-database" . to_string( ) )
2749+ ) ;
2750+ }
2751+
26952752 #[ tokio:: test]
26962753 async fn refresh_worker_finalizes_tombstoned_refresh_material ( ) {
26972754 let store = test_store ( ) . await ;
0 commit comments