Skip to content

Commit 46c8ba1

Browse files
ismcagdasismcagdas
committed
resolved #94: Integrated bsb admin
1 parent b6b3e67 commit 46c8ba1

File tree

9 files changed

+16
-162
lines changed

9 files changed

+16
-162
lines changed

‎src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,6 @@
189189
<HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
190190
<Private>True</Private>
191191
</Reference>
192-
<Reference Include="Microsoft.Owin.Security.Facebook, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
193-
<HintPath>..\packages\Microsoft.Owin.Security.Facebook.3.0.1\lib\net45\Microsoft.Owin.Security.Facebook.dll</HintPath>
194-
<Private>True</Private>
195-
</Reference>
196192
<Reference Include="Microsoft.Owin.Security.Google, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
197193
<HintPath>..\packages\Microsoft.Owin.Security.Google.3.0.1\lib\net45\Microsoft.Owin.Security.Google.dll</HintPath>
198194
<Private>True</Private>
@@ -2714,7 +2710,9 @@
27142710
</ItemGroup>
27152711
<ItemGroup>
27162712
<Content Include="Views\web.config" />
2717-
<Content Include="packages.config" />
2713+
<Content Include="packages.config">
2714+
<SubType>Designer</SubType>
2715+
</Content>
27182716
<Content Include="Views\About\Index.cshtml" />
27192717
<Content Include="Views\Layout\_LanguageSelection.cshtml" />
27202718
<Content Include="Views\Layout\_SideBarNav.cshtml" />

‎src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/Startup.cs‎

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
using System;
2-
using System.Configuration;
3-
using Abp.Hangfire;
4-
using Abp.Owin;
1+
using Abp.Owin;
52
using AbpCompanyName.AbpProjectName.Api.Controllers;
63
using AbpCompanyName.AbpProjectName.WebMpa;
7-
using Hangfire;
84
using Microsoft.AspNet.Identity;
95
using Microsoft.Owin;
106
using Microsoft.Owin.Security.Cookies;
11-
using Microsoft.Owin.Security.Facebook;
12-
using Microsoft.Owin.Security.Google;
13-
using Microsoft.Owin.Security.Twitter;
147
using Owin;
158

169
[assembly: OwinStartup(typeof(Startup))]
@@ -33,21 +26,6 @@ public void Configuration(IAppBuilder app)
3326

3427
app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);
3528

36-
if (IsTrue("ExternalAuth.Facebook.IsEnabled"))
37-
{
38-
app.UseFacebookAuthentication(CreateFacebookAuthOptions());
39-
}
40-
41-
if (IsTrue("ExternalAuth.Twitter.IsEnabled"))
42-
{
43-
app.UseTwitterAuthentication(CreateTwitterAuthOptions());
44-
}
45-
46-
if (IsTrue("ExternalAuth.Google.IsEnabled"))
47-
{
48-
app.UseGoogleAuthentication(CreateGoogleAuthOptions());
49-
}
50-
5129
app.MapSignalR();
5230

5331
//ENABLE TO USE HANGFIRE dashboard (Requires enabling Hangfire in AbpProjectNameWebModule)
@@ -56,45 +34,5 @@ public void Configuration(IAppBuilder app)
5634
// Authorization = new[] { new AbpHangfireAuthorizationFilter() } //You can remove this line to disable authorization
5735
//});
5836
}
59-
60-
private static FacebookAuthenticationOptions CreateFacebookAuthOptions()
61-
{
62-
var options = new FacebookAuthenticationOptions
63-
{
64-
AppId = ConfigurationManager.AppSettings["ExternalAuth.Facebook.AppId"],
65-
AppSecret = ConfigurationManager.AppSettings["ExternalAuth.Facebook.AppSecret"]
66-
};
67-
68-
options.Scope.Add("email");
69-
options.Scope.Add("public_profile");
70-
71-
return options;
72-
}
73-
74-
private static TwitterAuthenticationOptions CreateTwitterAuthOptions()
75-
{
76-
return new TwitterAuthenticationOptions
77-
{
78-
ConsumerKey = ConfigurationManager.AppSettings["ExternalAuth.Twitter.ConsumerKey"],
79-
ConsumerSecret = ConfigurationManager.AppSettings["ExternalAuth.Twitter.ConsumerSecret"]
80-
};
81-
}
82-
83-
private static GoogleOAuth2AuthenticationOptions CreateGoogleAuthOptions()
84-
{
85-
return new GoogleOAuth2AuthenticationOptions
86-
{
87-
ClientId = ConfigurationManager.AppSettings["ExternalAuth.Google.ClientId"],
88-
ClientSecret = ConfigurationManager.AppSettings["ExternalAuth.Google.ClientSecret"]
89-
};
90-
}
91-
92-
private static bool IsTrue(string appSettingName)
93-
{
94-
return string.Equals(
95-
ConfigurationManager.AppSettings[appSettingName],
96-
"true",
97-
StringComparison.InvariantCultureIgnoreCase);
98-
}
9937
}
10038
}

‎src/AbpCompanyName.AbpProjectName.WebMpa/Web.config‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
<add key="webpages:Enabled" value="false" />
2020
<add key="ClientValidationEnabled" value="true" />
2121
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
22-
<add key="ExternalAuth.Facebook.IsEnabled" value="true" />
23-
<add key="ExternalAuth.Facebook.AppId" value="694254287442405" />
24-
<add key="ExternalAuth.Facebook.AppSecret" value="29b990a63f7522635b6dfee7d4d97faa" />
25-
<add key="ExternalAuth.Twitter.IsEnabled" value="false" />
26-
<add key="ExternalAuth.Twitter.ConsumerKey" value="" />
27-
<add key="ExternalAuth.Twitter.ConsumerSecret" value="" />
28-
<add key="ExternalAuth.Google.IsEnabled" value="false" />
29-
<add key="ExternalAuth.Google.ClientId" value="" />
30-
<add key="ExternalAuth.Google.ClientSecret" value="" />
3122
</appSettings>
3223
<connectionStrings>
3324
<add name="Default" connectionString="Server=localhost; Database=AbpProjectName; Trusted_Connection=True;" providerName="System.Data.SqlClient" />

‎src/AbpCompanyName.AbpProjectName.WebMpa/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@
5757
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net452" />
5858
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net452" />
5959
<package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net452" />
60-
<package id="Microsoft.Owin.Security.Facebook" version="3.0.1" targetFramework="net452" />
61-
<package id="Microsoft.Owin.Security.Google" version="3.0.1" targetFramework="net452" />
6260
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net452" />
63-
<package id="Microsoft.Owin.Security.Twitter" version="3.0.1" targetFramework="net452" />
6461
<package id="Microsoft.Owin.StaticFiles" version="3.1.0" targetFramework="net461" />
6562
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
6663
<package id="Modernizr" version="2.8.3" targetFramework="net452" />

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,16 @@
180180
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
181181
<Private>True</Private>
182182
</Reference>
183-
<Reference Include="Microsoft.Owin.Security, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
184-
<HintPath>..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
183+
<Reference Include="Microsoft.Owin.Security, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
184+
<HintPath>..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
185185
<Private>True</Private>
186186
</Reference>
187187
<Reference Include="Microsoft.Owin.Security.Cookies, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
188188
<HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
189189
<Private>True</Private>
190190
</Reference>
191-
<Reference Include="Microsoft.Owin.Security.Facebook, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
192-
<HintPath>..\packages\Microsoft.Owin.Security.Facebook.3.0.1\lib\net45\Microsoft.Owin.Security.Facebook.dll</HintPath>
191+
<Reference Include="Microsoft.Owin.Security.Facebook, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
192+
<HintPath>..\packages\Microsoft.Owin.Security.Facebook.3.1.0\lib\net45\Microsoft.Owin.Security.Facebook.dll</HintPath>
193193
<Private>True</Private>
194194
</Reference>
195195
<Reference Include="Microsoft.Owin.Security.Google, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/layout/sidebar-footer.cshtml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<div class="legal" ng-controller="app.views.layout.sidebarFooter as vm">
1+
@using AbpCompanyName.AbpProjectName
2+
<div class="legal" ng-controller="app.views.layout.sidebarFooter as vm">
23
<div class="copyright">
3-
&copy; {{currentYear}} <a href="javascript:void(0);">AbpProjectName</a>.
4+
&copy; {{vm.currentYear}} <a href="javascript:void(0);">AbpProjectName</a>.
45
</div>
56
<div class="version">
6-
<b>Version </b> {{versionText}}
7+
<b>Version </b> v@(AppVersionHelper.Version) [@AppVersionHelper.ReleaseDate.ToString("yyyyMMdd")]
78
</div>
89
</div>

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App_Start/Startup.cs‎

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
using System;
2-
using System.Configuration;
3-
using Abp.Owin;
1+
using Abp.Owin;
42
using AbpCompanyName.AbpProjectName.Api.Controllers;
53
using AbpCompanyName.AbpProjectName.WebSpaAngular;
64
using Microsoft.AspNet.Identity;
75
using Microsoft.Owin;
86
using Microsoft.Owin.Security.Cookies;
9-
using Microsoft.Owin.Security.Facebook;
10-
using Microsoft.Owin.Security.Google;
11-
using Microsoft.Owin.Security.Twitter;
127
using Owin;
138

149
[assembly: OwinStartup(typeof(Startup))]
@@ -31,62 +26,7 @@ public void Configuration(IAppBuilder app)
3126

3227
app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);
3328

34-
if (IsTrue("ExternalAuth.Facebook.IsEnabled"))
35-
{
36-
app.UseFacebookAuthentication(CreateFacebookAuthOptions());
37-
}
38-
39-
if (IsTrue("ExternalAuth.Twitter.IsEnabled"))
40-
{
41-
app.UseTwitterAuthentication(CreateTwitterAuthOptions());
42-
}
43-
44-
if (IsTrue("ExternalAuth.Google.IsEnabled"))
45-
{
46-
app.UseGoogleAuthentication(CreateGoogleAuthOptions());
47-
}
48-
4929
app.MapSignalR();
5030
}
51-
52-
private static FacebookAuthenticationOptions CreateFacebookAuthOptions()
53-
{
54-
var options = new FacebookAuthenticationOptions
55-
{
56-
AppId = ConfigurationManager.AppSettings["ExternalAuth.Facebook.AppId"],
57-
AppSecret = ConfigurationManager.AppSettings["ExternalAuth.Facebook.AppSecret"]
58-
};
59-
60-
options.Scope.Add("email");
61-
options.Scope.Add("public_profile");
62-
63-
return options;
64-
}
65-
66-
private static TwitterAuthenticationOptions CreateTwitterAuthOptions()
67-
{
68-
return new TwitterAuthenticationOptions
69-
{
70-
ConsumerKey = ConfigurationManager.AppSettings["ExternalAuth.Twitter.ConsumerKey"],
71-
ConsumerSecret = ConfigurationManager.AppSettings["ExternalAuth.Twitter.ConsumerSecret"]
72-
};
73-
}
74-
75-
private static GoogleOAuth2AuthenticationOptions CreateGoogleAuthOptions()
76-
{
77-
return new GoogleOAuth2AuthenticationOptions
78-
{
79-
ClientId = ConfigurationManager.AppSettings["ExternalAuth.Google.ClientId"],
80-
ClientSecret = ConfigurationManager.AppSettings["ExternalAuth.Google.ClientSecret"]
81-
};
82-
}
83-
84-
private static bool IsTrue(string appSettingName)
85-
{
86-
return string.Equals(
87-
ConfigurationManager.AppSettings[appSettingName],
88-
"true",
89-
StringComparison.InvariantCultureIgnoreCase);
90-
}
9131
}
9232
}

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Web.config‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
<add key="webpages:Enabled" value="false" />
2020
<add key="ClientValidationEnabled" value="true" />
2121
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
22-
<add key="ExternalAuth.Facebook.IsEnabled" value="false" />
23-
<add key="ExternalAuth.Facebook.AppId" value="" />
24-
<add key="ExternalAuth.Facebook.AppSecret" value="" />
25-
<add key="ExternalAuth.Twitter.IsEnabled" value="false" />
26-
<add key="ExternalAuth.Twitter.ConsumerKey" value="" />
27-
<add key="ExternalAuth.Twitter.ConsumerSecret" value="" />
28-
<add key="ExternalAuth.Google.IsEnabled" value="false" />
29-
<add key="ExternalAuth.Google.ClientId" value="" />
30-
<add key="ExternalAuth.Google.ClientSecret" value="" />
3122
</appSettings>
3223
<connectionStrings>
3324
<add name="Default" connectionString="Server=localhost; Database=AbpProjectName; Trusted_Connection=True;" providerName="System.Data.SqlClient" />
@@ -106,7 +97,7 @@
10697
</dependentAssembly>
10798
<dependentAssembly>
10899
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
109-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
100+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
110101
</dependentAssembly>
111102
<dependentAssembly>
112103
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/packages.config‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,10 @@
5959
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net461" />
6060
<package id="Microsoft.Owin.FileSystems" version="3.1.0" targetFramework="net461" />
6161
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net452" />
62-
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net452" />
62+
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net461" />
6363
<package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net452" />
64-
<package id="Microsoft.Owin.Security.Facebook" version="3.0.1" targetFramework="net452" />
65-
<package id="Microsoft.Owin.Security.Google" version="3.0.1" targetFramework="net452" />
64+
<package id="Microsoft.Owin.Security.Facebook" version="3.1.0" targetFramework="net461" />
6665
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net452" />
67-
<package id="Microsoft.Owin.Security.Twitter" version="3.0.1" targetFramework="net452" />
6866
<package id="Microsoft.Owin.StaticFiles" version="3.1.0" targetFramework="net461" />
6967
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
7068
<package id="Modernizr" version="2.8.3" targetFramework="net452" />

0 commit comments

Comments
 (0)