Move Google Auth stuff to the class library

OurUmbraco.Site/OurUmbraco.Site.csproj

@@ -351,10 +351,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App_Start\UmbracoAuthTokenServerExtensions.cs" />
-    <Compile Include="App_Start\UmbracoCustomOwinStartup.cs" />
-    <Compile Include="App_Start\UmbracoGoogleAuthExtensions.cs" />
-    <Compile Include="App_Start\UmbracoStandardOwinStartup.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\Search\Search.aspx.cs">
       <DependentUpon>Search.aspx</DependentUpon>

OurUmbraco.Site/web.template.config

@@ -63,7 +63,7 @@
     <add key="enableSimpleMembership" value="false" />
     <add key="autoFormsAuthentication" value="false" />
     <add key="log4net.Config" value="config\log4net.config" />
-    <add key="owin:appStartup" value="UmbracoStandardOwinStartup" />
+    <add key="owin:appStartup" value="OurUmbraco.Our.GoogleOAuth.UmbracoStandardOwinStartup" />
     <add key="Umbraco.ModelsBuilder.Enable" value="false"/>
     <add key="Umbraco.ModelsBuilder.ModelsMode" value="PureLive" />
         

OurUmbraco/Our/GoogleOAuth/UmbracoAuthTokenServerExtensions.cs

@@ -5,7 +5,7 @@ using Microsoft.Owin.Security.OAuth;
 using Owin;
 using Umbraco.IdentityExtensions;
 
-namespace OurUmbraco.Site
+namespace OurUmbraco.Our.GoogleOAuth
 {
     /// <summary>
     /// Extension methods to configure Umbraco for issuing and processing tokens for authentication

OurUmbraco/Our/GoogleOAuth/UmbracoCustomOwinStartup.cs

@@ -1,15 +1,15 @@
 using Microsoft.Owin;
+using OurUmbraco.Our.GoogleOAuth;
 using Owin;
 using Umbraco.Core;
 using Umbraco.Core.Security;
 using Umbraco.Web.Security.Identity;
-using OurUmbraco.Site;
 
 //To use this startup class, change the appSetting value in the web.config called 
 // "owin:appStartup" to be "UmbracoCustomOwinStartup"
 
 [assembly: OwinStartup("UmbracoCustomOwinStartup", typeof(UmbracoCustomOwinStartup))]
-namespace OurUmbraco.Site
+namespace OurUmbraco.Our.GoogleOAuth
 {
     /// <summary>
     /// A custom way to configure OWIN for Umbraco

OurUmbraco/Our/GoogleOAuth/UmbracoGoogleAuthExtensions.cs

@@ -1,13 +1,12 @@
-using System.Runtime;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Owin;
+using Microsoft.Owin.Security.Google;
 using Owin;
 using Umbraco.Core;
 using Umbraco.Web.Security.Identity;
-using Microsoft.Owin.Security.Google;
 
-namespace OurUmbraco.Site
+namespace OurUmbraco.Our.GoogleOAuth
 {
     public static class UmbracoGoogleAuthExtensions
     {

OurUmbraco/Our/GoogleOAuth/UmbracoStandardOwinStartup.cs

@@ -1,11 +1,11 @@
 using System.Web.Configuration;
 using Microsoft.Owin;
+using OurUmbraco.Our.GoogleOAuth;
 using Owin;
 using Umbraco.Web;
-using OurUmbraco.Site;
 
 [assembly: OwinStartup("UmbracoStandardOwinStartup", typeof(UmbracoStandardOwinStartup))]
-namespace OurUmbraco.Site
+namespace OurUmbraco.Our.GoogleOAuth
 {
     /// <summary>
     /// The standard way to configure OWIN for Umbraco
@@ -22,7 +22,7 @@ namespace OurUmbraco.Site
 
             var clientId = WebConfigurationManager.AppSettings["GoogleOAuthClientID"];
             var secret = WebConfigurationManager.AppSettings["GoogleOAuthSecret"];
-            app.ConfigureBackOfficeGoogleAuth(clientId, secret);
+            UmbracoGoogleAuthExtensions.ConfigureBackOfficeGoogleAuth(app, clientId, secret);
         }
     }
 }

OurUmbraco/OurUmbraco.csproj

@@ -138,6 +138,10 @@
       <HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.Owin.Security.Google, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Google.3.0.1\lib\net45\Microsoft.Owin.Security.Google.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
       <Private>True</Private>
@@ -265,6 +269,10 @@
       <HintPath>..\packages\UmbracoCms.Core.7.4.3\lib\umbraco.editorControls.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Umbraco.IdentityExtensions, Version=1.0.5779.34109, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.IdentityExtensions.1.0.0\lib\net45\Umbraco.IdentityExtensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="umbraco.MacroEngines, Version=1.0.5948.18149, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.7.4.3\lib\umbraco.MacroEngines.dll</HintPath>
       <Private>True</Private>
@@ -429,6 +437,10 @@
     <Compile Include="Our\Examine\SearchFilters.cs" />
     <Compile Include="Our\Examine\VersionAnalyzer.cs" />
     <Compile Include="Our\Examine\VersionTokenizer.cs" />
+    <Compile Include="Our\GoogleOAuth\UmbracoAuthTokenServerExtensions.cs" />
+    <Compile Include="Our\GoogleOAuth\UmbracoCustomOwinStartup.cs" />
+    <Compile Include="Our\GoogleOAuth\UmbracoGoogleAuthExtensions.cs" />
+    <Compile Include="Our\GoogleOAuth\UmbracoStandardOwinStartup.cs" />
     <Compile Include="Our\HackedCdfLoader.cs" />
     <Compile Include="Our\Hiccup.cs">
       <SubType>ASPXCodeBehind</SubType>

OurUmbraco/packages.config

@@ -29,6 +29,7 @@
   <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net451" />
   <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net451" />
   <package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net451" />
+  <package id="Microsoft.Owin.Security.Google" version="3.0.1" targetFramework="net451" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net451" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net451" />
@@ -39,6 +40,8 @@
   <package id="semver" version="1.1.2" targetFramework="net451" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
   <package id="UmbracoCms.Core" version="7.4.3" targetFramework="net451" />
+  <package id="UmbracoCms.IdentityExtensions" version="1.0.0" targetFramework="net451" />
+  <package id="UmbracoCms.IdentityExtensions.Google" version="1.0.0" targetFramework="net451" />
   <package id="UrlRewritingNet" version="2.0.7" targetFramework="net451" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
   <package id="YouTrackSharp" version="2.0.11.0" targetFramework="net451" />