ADAM / AIAHTML5

Closed
Merge Request #1029 · created by Vijay Pal

Bug Fixed RM#204962

From ADAM:Vijay_Dev into ADAM:Sanket_Dev

From Vijay_Dev into Sanket_Dev

Closed by Vijay Pal

Changes were not merged into target branch

1 participants
Inline Side-by-side
Showing 2 changed files
400-SOURCECODE/AIAHTML5.ADMIN.API/Custom/EmailUtility.cs
  Edit  View file @6fb40d3
... ... @@ -30,15 +30,19 @@ namespace AIAHTML5.ADMIN.API.Custom
30 30  
31 31 public void SendMail(MailMessage mm)
32 32 {
  33 + System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; //Added By Vijay RM#204962
33 34 SmtpClient smtp = new SmtpClient();
34 35 smtp.Host = ConfigurationManager.AppSettings["SMTPAddress"];
35 36 smtp.EnableSsl = Convert.ToBoolean(ConfigurationManager.AppSettings["EnableSSL"]);
36   - System.Net.NetworkCredential NetworkCred = new System.Net.NetworkCredential(ConfigurationManager.AppSettings["SMTPUsername"], ConfigurationManager.AppSettings["SenderPassword"]);
  37 + #region Change emailAuthUser By Vijay RM#204962
  38 + //System.Net.NetworkCredential NetworkCred = new System.Net.NetworkCredential(ConfigurationManager.AppSettings["SMTPUsername"], ConfigurationManager.AppSettings["SenderPassword"]);
  39 + System.Net.NetworkCredential NetworkCred = new System.Net.NetworkCredential(ConfigurationManager.AppSettings["emailAuthUser"], ConfigurationManager.AppSettings["SenderPassword"]);
  40 + #endregion
37 41 smtp.Credentials = NetworkCred;
38 42 smtp.Port = Convert.ToInt32(ConfigurationManager.AppSettings["SMTPPort"]);
39 43 string ccAddress = ConfigurationManager.AppSettings["NotifyCopyAddress"];
40   - string[] emailArr = ccAddress.Split(',');
41   - if (mm.From.ToString().Equals("pfizerhelp@ebix.com"))
  44 + string[] emailArr = ccAddress.Split(',');
  45 + if (mm.From.ToString().Equals("adamsupport@ebix.com")) //Change Email Id "pfizerhelp@ebix.com" to adamsupport@ebix.com By By Vijay RM#204962
42 46 {
43 47 ccAddress = emailArr[0];
44 48 if (!ccAddress.Equals(""))
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Web.config
  Edit  View file @6fb40d3
... ... @@ -4,25 +4,32 @@
4 4 http://go.microsoft.com/fwlink/?LinkId=301879
5 5 -->
6 6 <configuration>
7   - <configSections>
8   - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
9   - </configSections>
10   - <appSettings>
11   - <add key="webpages:Version" value="3.0.0.0" />
12   - <add key="webpages:Enabled" value="false" />
13   - <add key="ClientValidationEnabled" value="true" />
14   - <add key="UnobtrusiveJavaScriptEnabled" value="true" />
15   - <add key="Enablecors" value="false" />
16   - <add key="SenderEmailAddress" value="harpreet.banwait@ebix.com" />
  7 + <configSections>
  8 + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
  9 + </configSections>
  10 + <appSettings>
  11 + <add key="webpages:Version" value="3.0.0.0" />
  12 + <add key="webpages:Enabled" value="false" />
  13 + <add key="ClientValidationEnabled" value="true" />
  14 + <add key="UnobtrusiveJavaScriptEnabled" value="true" />
  15 + <add key="Enablecors" value="false" />
  16 + <!--<add key="SenderEmailAddress" value="harpreet.banwait@ebix.com" />
17 17 <add key="ErrorNotificationEmailAddress" value="harpreet.banwait@ebix.com" />
18 18 <add key="SenderPassword" value="HpRack%2016" />
19 19 <add key="SMTPAddress" value="smtp.emailsrvr.com" />
20   - <add key="SMTPPort" value="587" />
21   - <add key="EnableSSL" value="false" />
22   - <add key="NotifyEmailAddress" value="harpreet.banwait@ebix.com" />
23   - <add key="NotifyCopyAddress" value="harpreet.banwait@ebix.com" />
24   - </appSettings>
25   - <!--
  20 + <add key="EnableSSL" value="false" />-->
  21 + <add key="SenderEmailAddress" value="adamsupport@ebix.com" />
  22 + <add key="emailAuthUser" value="AKIA57I3T2NSLUM7CDWZ" />
  23 + <add key="SenderPassword" value="BCRCdvy4aTH0GSbSEdHkEUjkElAuestJ5NpFwzVE7lrs" />
  24 + <add key="SMTPAddress" value="email-smtp.us-east-1.amazonaws.com" />
  25 + <add key="ErrorNotificationEmailAddress" value="harpreet.banwait@ebix.com" />
  26 + <add key="SMTPPort" value="587" />
  27 + <add key="EnableSSL" value="true" />
  28 + <add key="NotifyEmailAddress" value="harpreet.banwait@ebix.com" />
  29 + <!--<add key="NotifyCopyAddress" value="harpreet.banwait@ebix.com" />-->
  30 + <add key="NotifyCopyAddress" value="educationsupport@ebix.com" />
  31 + </appSettings>
  32 + <!--
26 33 For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
27 34  
28 35 The following attributes can be set on the <httpRuntime> tag.
... ... @@ -30,57 +37,57 @@
30 37 <httpRuntime targetFramework="4.8" />
31 38 </system.Web>
32 39 -->
33   - <system.web>
34   - <compilation debug="true" targetFramework="4.5" />
35   - <httpRuntime targetFramework="4.5" />
36   - <customErrors mode="Off"></customErrors>
37   - </system.web>
38   - <runtime>
39   - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
40   - <dependentAssembly>
41   - <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
42   - <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
43   - </dependentAssembly>
44   - <dependentAssembly>
45   - <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
46   - <bindingRedirect oldVersion="1.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
47   - </dependentAssembly>
48   - <dependentAssembly>
49   - <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
50   - <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
51   - </dependentAssembly>
52   - <dependentAssembly>
53   - <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
54   - <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
55   - </dependentAssembly>
56   - <dependentAssembly>
57   - <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
58   - <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
59   - </dependentAssembly>
60   - <dependentAssembly>
61   - <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
62   - <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
63   - </dependentAssembly>
64   - <dependentAssembly>
65   - <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
66   - <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
67   - </dependentAssembly>
68   - <dependentAssembly>
69   - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
70   - <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
71   - </dependentAssembly>
72   - </assemblyBinding>
73   - </runtime>
74   - <connectionStrings>
75   - <add name="AIADatabaseV5Entities1" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.53;initial catalog=AIADatabaseV5;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
76   - <!--<add name="AIADatabaseV5Entities" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.53;initial catalog=AIADatabaseV5;persist security info=True;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
77   - <add name="AIADatabaseV5Entities" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.61;initial catalog=AIADatabaseV5;persist security info=True;user id=sa;password=Ebix@123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
78   - </connectionStrings>
79   - <entityFramework>
80   - <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
81   - </entityFramework>
82   - <system.webServer>
83   - <!--<rewrite>
  40 + <system.web>
  41 + <compilation debug="true" targetFramework="4.5" />
  42 + <httpRuntime targetFramework="4.5" />
  43 + <customErrors mode="Off"></customErrors>
  44 + </system.web>
  45 + <runtime>
  46 + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
  47 + <dependentAssembly>
  48 + <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
  49 + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
  50 + </dependentAssembly>
  51 + <dependentAssembly>
  52 + <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
  53 + <bindingRedirect oldVersion="1.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
  54 + </dependentAssembly>
  55 + <dependentAssembly>
  56 + <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
  57 + <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
  58 + </dependentAssembly>
  59 + <dependentAssembly>
  60 + <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
  61 + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
  62 + </dependentAssembly>
  63 + <dependentAssembly>
  64 + <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
  65 + <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
  66 + </dependentAssembly>
  67 + <dependentAssembly>
  68 + <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  69 + <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
  70 + </dependentAssembly>
  71 + <dependentAssembly>
  72 + <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  73 + <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
  74 + </dependentAssembly>
  75 + <dependentAssembly>
  76 + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
  77 + <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
  78 + </dependentAssembly>
  79 + </assemblyBinding>
  80 + </runtime>
  81 + <connectionStrings>
  82 + <add name="AIADatabaseV5Entities1" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.53;initial catalog=AIADatabaseV5;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
  83 + <!--<add name="AIADatabaseV5Entities" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.53;initial catalog=AIADatabaseV5;persist security info=True;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
  84 + <add name="AIADatabaseV5Entities" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.61;initial catalog=AIADatabaseV5;persist security info=True;user id=sa;password=Ebix@123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
  85 + </connectionStrings>
  86 + <entityFramework>
  87 + <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
  88 + </entityFramework>
  89 + <system.webServer>
  90 + <!--<rewrite>
84 91 <rules>
85 92 <rule name="AngularJS Routes" stopProcessing="true">
86 93 <match url=".*" />
... ... @@ -93,11 +100,11 @@
93 100 </rule>
94 101 </rules>
95 102 </rewrite>-->
96   - <handlers>
97   - <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
98   - <remove name="OPTIONSVerbHandler" />
99   - <remove name="TRACEVerbHandler" />
100   - <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
101   - </handlers>
102   - </system.webServer>
  103 + <handlers>
  104 + <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
  105 + <remove name="OPTIONSVerbHandler" />
  106 + <remove name="TRACEVerbHandler" />
  107 + <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
  108 + </handlers>
  109 + </system.webServer>
103 110 </configuration>
104 111 \ No newline at end of file
... ...