@@ -32,30 +32,30 @@ public EmailParser(IEmailViewRender alternativeViewRenderer)
3232 /// <param name="emailViewOutput">The email view output.</param>
3333 /// <param name="email">The <see cref="Email"/> used to generate the output.</param>
3434 /// <returns>A <see cref="MailMessage"/> containing the email headers and content.</returns>
35- public async Task < MailMessage > ParseAsync ( string emailViewOutput , Email email )
35+ public async Task < MailMessage > ParseAsync ( string emailViewOutput , Email email , ImageEmbedder ? imageEmbedder = null )
3636 {
3737 var message = new MailMessage ( ) ;
38- await InitializeMailMessageAsync ( message , emailViewOutput , email ) ;
38+ await InitializeMailMessageAsync ( message , emailViewOutput , email , imageEmbedder ) ;
3939 return message ;
4040 }
4141
42- private async Task InitializeMailMessageAsync ( MailMessage message , string emailViewOutput , Email email )
42+ private async Task InitializeMailMessageAsync ( MailMessage message , string emailViewOutput , Email email , ImageEmbedder ? imageEmbedder = null )
4343 {
4444 if ( string . IsNullOrWhiteSpace ( emailViewOutput ) )
4545 {
4646 throw new ArgumentNullException ( nameof ( emailViewOutput ) ) ;
4747 }
4848 using ( var reader = new StringReader ( emailViewOutput ) )
4949 {
50- await ParserUtils . ParseHeadersAsync ( reader , ( key , value ) => ProcessHeaderAsync ( key , value , message , email ) ) ;
50+ await ParserUtils . ParseHeadersAsync ( reader , ( key , value ) => ProcessHeaderAsync ( key , value , message , email , imageEmbedder ) ) ;
5151 AssignCommonHeaders ( message , email ) ;
5252 if ( message . AlternateViews . Count == 0 )
5353 {
5454 var messageBody = reader . ReadToEnd ( ) . Trim ( ) ;
55- if ( email . ImageEmbedder . HasImages )
55+ if ( imageEmbedder != null && imageEmbedder . HasImages )
5656 {
5757 var view = AlternateView . CreateAlternateViewFromString ( messageBody , new ContentType ( "text/html" ) ) ;
58- email . ImageEmbedder . AddImagesToView ( view ) ;
58+ imageEmbedder . AddImagesToView ( view ) ;
5959 message . AlternateViews . Add ( view ) ;
6060 message . Body = "Plain text not available." ;
6161 message . IsBodyHtml = false ;
@@ -112,19 +112,29 @@ private void AssignCommonHeaders(MailMessage message, Email email)
112112 private void AssignCommonHeader < T > ( Email email , string header , Action < T > assign )
113113 where T : class
114114 {
115- object value ;
115+ object ? value ;
116116 if ( email . ViewData . TryGetValue ( header , out value ) )
117117 {
118- var typedValue = value as T ;
119- if ( typedValue != null ) assign ( typedValue ) ;
118+ if ( value is T typedValue )
119+ {
120+ assign ( typedValue ) ;
121+ return ;
122+ }
123+ }
124+ var foundKV = email . ViewData . Where ( x => String . Equals ( x . Key , header , StringComparison . OrdinalIgnoreCase ) && x . Value is T typedValue ) ;
125+ if ( foundKV . Any ( ) )
126+ {
127+ var val = foundKV . First ( ) ;
128+ assign ( ( T ) val . Value ) ;
129+ return ;
120130 }
121131 }
122132
123- private async Task ProcessHeaderAsync ( string key , string value , MailMessage message , Email email )
133+ private async Task ProcessHeaderAsync ( string key , string value , MailMessage message , Email email , ImageEmbedder ? imageEmbedder )
124134 {
125135 if ( IsAlternativeViewsHeader ( key ) )
126136 {
127- foreach ( var view in CreateAlternativeViews ( value , email ) )
137+ foreach ( var view in CreateAlternativeViews ( value , email , imageEmbedder ) )
128138 {
129139 message . AlternateViews . Add ( await view ) ;
130140 }
@@ -135,17 +145,17 @@ private async Task ProcessHeaderAsync(string key, string value, MailMessage mess
135145 }
136146 }
137147
138- private IEnumerable < Task < AlternateView > > CreateAlternativeViews ( string deliminatedViewNames , Email email )
148+ private IEnumerable < Task < AlternateView > > CreateAlternativeViews ( string deliminatedViewNames , Email email , ImageEmbedder ? imageEmbedder )
139149 {
140150 var viewNames = deliminatedViewNames . Split ( new [ ] { ',' , ' ' , ';' } , StringSplitOptions . RemoveEmptyEntries ) ;
141- return viewNames . Select ( v => CreateAlternativeView ( email , v ) ) . ToList ( ) ;
151+ return viewNames . Select ( v => CreateAlternativeView ( email , v , imageEmbedder ) ) . ToList ( ) ;
142152 }
143153
144- private async Task < AlternateView > CreateAlternativeView ( Email email , string alternativeViewName )
154+ private async Task < AlternateView > CreateAlternativeView ( Email email , string alternativeViewName , ImageEmbedder ? imageEmbedder )
145155 {
146156 var fullViewName = GetAlternativeViewName ( email , alternativeViewName ) ;
147- var output = await alternativeViewRenderer . RenderAsync ( email , fullViewName ) ;
148- string contentType ;
157+ var output = await alternativeViewRenderer . RenderAsync ( email , fullViewName , imageEmbedder ) ;
158+ string ? contentType ;
149159 string body ;
150160 using ( var reader = new StringReader ( output ) )
151161 {
@@ -179,7 +189,10 @@ private async Task<AlternateView> CreateAlternativeView(Email email, string alte
179189 // A different charset can be specified in the Content-Type header.
180190 // e.g. Content-Type: text/html; charset=utf-8
181191 }
182- email . ImageEmbedder . AddImagesToView ( alternativeView ) ;
192+ if ( imageEmbedder != null )
193+ {
194+ imageEmbedder . AddImagesToView ( alternativeView ) ;
195+ }
183196 return alternativeView ;
184197 }
185198
@@ -206,9 +219,9 @@ private MemoryStream CreateStreamOfBody(string body)
206219 return stream ;
207220 }
208221
209- private string ParseHeadersForContentType ( StringReader reader )
222+ private string ? ParseHeadersForContentType ( StringReader reader )
210223 {
211- string contentType = null ;
224+ string ? contentType = null ;
212225 ParserUtils . ParseHeaders ( reader , ( key , value ) =>
213226 {
214227 if ( key . Equals ( "content-type" , StringComparison . OrdinalIgnoreCase ) )
0 commit comments