End of the day commit

SocialFeedCollector.Job/App.config

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="SharePointClientId" value="YourSPClientIDHere"/>
-    <add key="SharePointClientSecret" value="YourSPClientSecretHere="/>
-    <add key="SharePointSiteUrl" value="YourSPSiteUrlHere"/>
+    <add key="SharePointClientId" value="33206122-2f2d-42e1-b966-aa5c31072ec5"/>
+    <add key="SharePointClientSecret" value="QPkA5fZEkA88NmTyXwjmYtOQwajciziktWge3vC3R1k="/>
+    <add key="SharePointSiteUrl" value="https://codeholio.sharepoint.com/sites/sampledevsite/social365"/>
     <add key="SharePointListName" value="SocialFeeds"/>
     <add key="SocialMediaQuery" value="brexit"/>
-    <add key="TwitterConsumerKey" value="YourTwitterConsumerKeyHere" />
-    <add key="TwitterConsumerSecret" value="YourTwitterConsumerSecretHere" />
-    <add key="InstagramClientKey" value="YourInstagramClientKeyHere" />
-    <add key="InstagramClientSecret" value="YourInstagramClientSecretHere" />
-    <add key="GoogleAPIKey" value="YourGoogleAPIKeyHere" />
+    <add key="TwitterConsumerKey" value="k0lKFT9Z3IdCT1emt2DG8V60u" />
+    <add key="TwitterConsumerSecret" value="9MXGpYQcHk7v9hxjnc0nbIiQQ3tUiSWEgHsQiLxsYtle4UFfsW" />
+    <add key="InstagramClientKey" value="19e50e97291e46578572808a778990db" />
+    <add key="InstagramClientSecret" value="af140d59a01d405e820be4e21e32017b" />
+    <add key="GoogleAPIKey" value="AIzaSyCronqC5w-sxl89EmtSM7NYXFJLsnuTX48" />
   </appSettings>  
   <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />

SocialFeedCollector.Job/ApplicationSettings.cs → SocialFeedCollector.Job/Models/ApplicationSettings.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SocialFeedCollector.Job
+namespace SocialFeedCollector.Job.Models
 {
     public class ApplicationSettings
     {

SocialFeedCollector.Job/Program.cs

@@ -1,5 +1,8 @@
 using Microsoft.SharePoint.Client;
+using SocialFeedCollector.Job.Models;
 using SocialMediaAdapters;
+using SocialMediaAdapters.Adapters;
+using SocialMediaAdapters.Models;
 using System;
 using System.Collections.Generic;
 using System.Configuration;

SocialFeedCollector.Job/SocialFeedCollector.Job.csproj

@@ -104,7 +104,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApplicationSettings.cs" />
+    <Compile Include="Models\ApplicationSettings.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SharePointContext.cs" />

SocialFeedCollector.Job/TokenHelper.cs

@@ -709,11 +709,11 @@ public static string EnsureTrailingSlash(string url)
         //
         // Hosted add-in configuration
         //
-        private static readonly string ClientId = string.IsNullOrEmpty(WebConfigurationManager.AppSettings.Get("SharePointClientId")) ? WebConfigurationManager.AppSettings.Get("HostedAppName") : WebConfigurationManager.AppSettings.Get("ClientId");
+        private static readonly string ClientId = string.IsNullOrEmpty(WebConfigurationManager.AppSettings.Get("SharePointClientId")) ? WebConfigurationManager.AppSettings.Get("HostedAppName") : WebConfigurationManager.AppSettings.Get("SharePointClientId");
         private static readonly string IssuerId = string.IsNullOrEmpty(WebConfigurationManager.AppSettings.Get("IssuerId")) ? ClientId : WebConfigurationManager.AppSettings.Get("IssuerId");
         private static readonly string HostedAppHostNameOverride = WebConfigurationManager.AppSettings.Get("HostedAppHostNameOverride");
         private static readonly string HostedAppHostName = WebConfigurationManager.AppSettings.Get("HostedAppHostName");
-        private static readonly string ClientSecret = string.IsNullOrEmpty(WebConfigurationManager.AppSettings.Get("SharePointClientSecret")) ? WebConfigurationManager.AppSettings.Get("HostedAppSigningKey") : WebConfigurationManager.AppSettings.Get("ClientSecret");
+        private static readonly string ClientSecret = string.IsNullOrEmpty(WebConfigurationManager.AppSettings.Get("SharePointClientSecret")) ? WebConfigurationManager.AppSettings.Get("HostedAppSigningKey") : WebConfigurationManager.AppSettings.Get("SharePointClientSecret");
         private static readonly string SecondaryClientSecret = WebConfigurationManager.AppSettings.Get("SecondaryClientSecret");
         private static readonly string Realm = WebConfigurationManager.AppSettings.Get("Realm");
         private static readonly string ServiceNamespace = WebConfigurationManager.AppSettings.Get("Realm");

SocialFeedCollector.ListInstances/AppManifest.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--Created:cb85b80c-f585-40ff-8bfc-12ff4d0e34a9-->
 <App xmlns="http://schemas.microsoft.com/sharepoint/2012/app/manifest"
-     Name="SocialFeedCollectorListInstances"
+     Name="Social365"
      ProductID="{f8920508-537f-44cc-896c-914a570f952e}"
-     Version="1.0.0.0"
+     Version="1.0.0.2"
      SharePointMinVersion="16.0.0.0"
 >
   <Properties>
-    <Title>SocialFeedCollector.ListInstances</Title>
-    <StartPage>~appWebUrl/Pages/Default.aspx?{StandardTokens}</StartPage>
+    <Title>Social Feeds</Title>
+    <StartPage>~appWebUrl/Lists/SocialFeeds</StartPage>
   </Properties>
 
   <AppPrincipal>

SocialMediaAdapters/GoogleAdapter.cs → SocialMediaAdapters/Adapters/GoogleAdapter.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SocialMediaAdapters
+namespace SocialMediaAdapters.Adapters
 {
     using System.ServiceModel.Discovery;
     using System.Web.Mvc;

SocialMediaAdapters/InstagramAdapter.cs → SocialMediaAdapters/Adapters/InstagramAdapter.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SocialMediaAdapters
+namespace SocialMediaAdapters.Adapters
 {
     using InstaSharp;
     using InstaSharp.Models;

SocialMediaAdapters/InstagramOAuth.cs → SocialMediaAdapters/Adapters/InstagramOAuth.cs

@@ -1,4 +1,4 @@
-namespace SocialMediaAdapters
+namespace SocialMediaAdapters.Adapters
 {
     using System.Net.Http;
 

SocialMediaAdapters/TwitterAdapter.cs → SocialMediaAdapters/Adapters/TwitterAdapter.cs

@@ -4,12 +4,13 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SocialMediaAdapters
+namespace SocialMediaAdapters.Adapters
 {
     using System.Web;
     using System.Web.Mvc;
 
     using LinqToTwitter;
+    using Models;
 
     public static class TwitterAdapter
     {

SocialMediaAdapters/FeedSource.cs → SocialMediaAdapters/Models/FeedSource.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SocialMediaAdapters
+namespace SocialMediaAdapters.Models
 {
     public enum FeedSource
     {

SocialMediaAdapters/SocialFeedItem.cs → SocialMediaAdapters/Models/SocialFeedItem.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SocialMediaAdapters
+namespace SocialMediaAdapters.Models
 {
     public class SocialFeedItem
     {

SocialMediaAdapters/SocialMediaAdapters.csproj

@@ -176,12 +176,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FeedSource.cs" />
-    <Compile Include="GoogleAdapter.cs" />
-    <Compile Include="InstagramAdapter.cs" />
-    <Compile Include="InstagramOAuth.cs" />
-    <Compile Include="SocialFeedItem.cs" />
-    <Compile Include="TwitterAdapter.cs" />
+    <Compile Include="Models\FeedSource.cs" />
+    <Compile Include="Adapters\GoogleAdapter.cs" />
+    <Compile Include="Adapters\InstagramAdapter.cs" />
+    <Compile Include="Adapters\InstagramOAuth.cs" />
+    <Compile Include="Models\SocialFeedItem.cs" />
+    <Compile Include="Adapters\TwitterAdapter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>