Merge pull request #25 from guscatalano/snshanka/neighborEviction

Merging
guscatalano · Jul 24, 2019 · 561210e · 561210e
2 parents 1ee4d7f + e6536f6
commit 561210e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/WlihaHackEviction/Models/Model.cs b/WlihaHackEviction/Models/Model.cs
@@ -156,4 +156,4 @@ public class PermitInfo
         [DataMember]
         public string Location1 { get; set; }
     }
-}
+}
diff --git a/WlihaHackEviction/Startup.cs b/WlihaHackEviction/Startup.cs
@@ -26,6 +26,9 @@ public void ConfigureServices(IServiceCollection services)
             // Configure the DBContext
             services.AddDbContext<EvictionDatabaseContext>(options =>
                 options.UseSqlServer(connectionStringFromConfig));
+                //options.UseSqlServer(Configuration.GetConnectionString("SQLConnection")));
+
+            services.AddCors();
 
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
 
@@ -52,7 +55,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseSwagger();
             app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"));
-
+            app.UseCors(builder => builder
+                .SetIsOriginAllowed((origin) => { return true; }) // for now, allow any origin
+                .AllowAnyMethod()
+                .AllowAnyHeader());
             app.UseHttpsRedirection();
             app.UseMvc(routes =>
             {

diff --git a/WlihaHackEviction/appsettings.json b/WlihaHackEviction/appsettings.json
@@ -5,7 +5,8 @@
     }
   },
   "ConnectionStrings": {
-    "MySQLConnection": ""
+    "MySQLConnection": "",
+    "SQLConnection": "Server=ijfods31344.database.windows.net;Database=wliha;User ID=wliha;Password=***REMOVED***;MultipleActiveResultSets=true"
   },
   "AllowedHosts": "*",
   "KeyVaultName": "neighborevictions"
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,4 +156,4 @@ public class PermitInfo @@
             [DataMember]
             public string Location1 { get; set; }
         }
-    }
+    }