Moved Web.Core project to .netcoreapp1.1.

hikalkan · hikalkan · commit 3f4d05d2d17a · 2017-04-24T15:20:15.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web.Core</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Web.Core</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -16,26 +16,32 @@
     <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+  </PropertyGroup>
+
+    <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.csproj" />
+    <ProjectReference Include="..\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Web.SignalR" Version="2.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.1" />
-    <PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
     <PackageReference Include="Abp.AspNetCore" Version="2.0.1" />
-    <PackageReference Include="Abp.Owin" Version="2.0.1" />
-    <PackageReference Include="Abp.Zero.AspNetCore" Version="2.0.1" />
+    <PackageReference Include="Abp.ZeroCore" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+
+    <PackageReference Include="Abp.Web.SignalR" Version="2.0.1" />
+    <PackageReference Include="Abp.Owin" Version="2.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs
@@ -4,24 +4,28 @@
 using Abp.AspNetCore;
 using Abp.AspNetCore.Configuration;
 using Abp.Modules;
-using Abp.Web.SignalR;
-using Abp.Zero.AspNetCore;
+using Abp.Reflection.Extensions;
 using Abp.Zero.Configuration;
 using AbpCompanyName.AbpProjectName.Authentication.JwtBearer;
 using AbpCompanyName.AbpProjectName.Configuration;
-using AbpCompanyName.AbpProjectName.EntityFramework;
+using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
 
+#if FEATURE_SIGNALR
+using Abp.Web.SignalR;
+#endif
+
 namespace AbpCompanyName.AbpProjectName
 {
     [DependsOn(
          typeof(AbpProjectNameApplicationModule),
          typeof(AbpProjectNameEntityFrameworkModule),
-         typeof(AbpAspNetCoreModule),
-         typeof(AbpZeroAspNetCoreModule),
-         typeof(AbpWebSignalRModule)
+         typeof(AbpAspNetCoreModule)
+#if FEATURE_SIGNALR 
+        ,typeof(AbpWebSignalRModule)
+#endif
      )]
     public class AbpProjectNameWebCoreModule : AbpModule
     {
@@ -45,7 +49,7 @@ public override void PreInitialize()
 
             Configuration.Modules.AbpAspNetCore()
                  .CreateControllersForAppServices(
-                     typeof(AbpProjectNameApplicationModule).Assembly
+                     typeof(AbpProjectNameApplicationModule).GetAssembly()
                  );
 
             ConfigureTokenAuth();
@@ -65,7 +69,7 @@ private void ConfigureTokenAuth()
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameWebCoreModule).GetAssembly());
         }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalAuthManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalAuthManager.cs
@@ -1,9 +1,7 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Abp.Dependency;
-using Abp.Zero.AspNetCore;
 
 namespace AbpCompanyName.AbpProjectName.Authentication.External
 {
@@ -26,7 +24,7 @@ public Task<bool> IsValidUser(string provider, string providerKey, string provid
             }
         }
 
-        public Task<ExternalLoginUserInfo> GetUserInfo(string provider, string accessCode)
+        public Task<ExternalAuthUserInfo> GetUserInfo(string provider, string accessCode)
         {
             using (var providerApi = CreateProviderApi(provider))
             {
@@ -39,7 +37,7 @@ public IDisposableDependencyObjectWrapper<IExternalAuthProviderApi> CreateProvid
             var providerInfo = _externalAuthConfiguration.Providers.FirstOrDefault(p => p.Name == provider);
             if (providerInfo == null)
             {
-                throw new ApplicationException("Unknown external auth provider: " + provider);
+                throw new Exception("Unknown external auth provider: " + provider);
             }
 
             var providerApi = _iocResolver.ResolveAsDisposable<IExternalAuthProviderApi>(providerInfo.ProviderApiType);
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalAuthProviderApiBase.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalAuthProviderApiBase.cs
@@ -1,9 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+﻿using System.Threading.Tasks;
 using Abp.Dependency;
-using Abp.Zero.AspNetCore;
 
 namespace AbpCompanyName.AbpProjectName.Authentication.External
 {
@@ -19,9 +15,9 @@ public void Initialize(ExternalLoginProviderInfo providerInfo)
         public async Task<bool> IsValidUser(string userId, string accessCode)
         {
             var userInfo = await GetUserInfo(accessCode);
-            return userInfo.LoginInfo.ProviderKey == userId;
+            return userInfo.ProviderKey == userId;
         }
 
-        public abstract Task<ExternalLoginUserInfo> GetUserInfo(string accessCode);
+        public abstract Task<ExternalAuthUserInfo> GetUserInfo(string accessCode);
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalAuthUserInfo.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalAuthUserInfo.cs
@@ -0,0 +1,15 @@
+﻿namespace AbpCompanyName.AbpProjectName.Authentication.External
+{
+    public class ExternalAuthUserInfo
+    {
+        public string ProviderKey { get; set; }
+
+        public string Name { get; set; }
+
+        public string EmailAddress { get; set; }
+
+        public string Surname { get; set; }
+
+        public string Provider { get; set; }
+    }
+}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalLoginProviderInfo.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/ExternalLoginProviderInfo.cs
@@ -1,7 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace AbpCompanyName.AbpProjectName.Authentication.External
 {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/Facebook/FacebookAuthProviderApi.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/Facebook/FacebookAuthProviderApi.cs
@@ -4,20 +4,19 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using Abp.Zero.AspNetCore;
-using Microsoft.AspNet.Identity;
 using Microsoft.AspNetCore.Authentication.Facebook;
 using Microsoft.AspNetCore.WebUtilities;
 using Newtonsoft.Json.Linq;
 using Abp.Extensions;
+using Microsoft.AspNetCore.Identity;
 
 namespace AbpCompanyName.AbpProjectName.Authentication.External.Facebook
 {
     public class FacebookAuthProviderApi : ExternalAuthProviderApiBase
     {
         public const string Name = "Facebook";
 
-        public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)
+        public override async Task<ExternalAuthUserInfo> GetUserInfo(string accessCode)
         {
             var endpoint = QueryHelpers.AddQueryString("https://graph.facebook.com/v2.8/me", "access_token", accessCode);
             endpoint = QueryHelpers.AddQueryString(endpoint, "appsecret_proof", GenerateAppSecretProof(accessCode));
@@ -43,12 +42,13 @@ public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)
                     name += middleName;
                 }
 
-                return new ExternalLoginUserInfo
+                return new ExternalAuthUserInfo
                 {
                     Name = name,
                     EmailAddress = FacebookHelper.GetEmail(payload),
                     Surname = FacebookHelper.GetLastName(payload),
-                    LoginInfo = new UserLoginInfo(Name, FacebookHelper.GetId(payload))
+                    Provider = Name,
+                    ProviderKey = FacebookHelper.GetId(payload)
                 };
             }
         }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/Google/GoogleAuthProviderApi.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/Google/GoogleAuthProviderApi.cs
@@ -2,8 +2,6 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using Abp.Zero.AspNetCore;
-using Microsoft.AspNet.Identity;
 using Microsoft.AspNetCore.Authentication.Google;
 using Newtonsoft.Json.Linq;
 
@@ -13,7 +11,7 @@ public class GoogleAuthProviderApi : ExternalAuthProviderApiBase
     {
         public const string Name = "Google";
 
-        public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)
+        public override async Task<ExternalAuthUserInfo> GetUserInfo(string accessCode)
         {
             using (var client = new HttpClient())
             {
@@ -31,12 +29,13 @@ public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)
 
                 var payload = JObject.Parse(await response.Content.ReadAsStringAsync());
 
-                return new ExternalLoginUserInfo
+                return new ExternalAuthUserInfo
                 {
                     Name = GoogleHelper.GetName(payload),
                     EmailAddress = GoogleHelper.GetEmail(payload),
                     Surname = GoogleHelper.GetFamilyName(payload),
-                    LoginInfo = new UserLoginInfo(Name, GoogleHelper.GetId(payload))
+                    ProviderKey = GoogleHelper.GetId(payload),
+                    Provider = Name
                 };
             }
         }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/IExternalAuthManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/IExternalAuthManager.cs
@@ -1,12 +1,11 @@
 ﻿using System.Threading.Tasks;
-using Abp.Zero.AspNetCore;
 
 namespace AbpCompanyName.AbpProjectName.Authentication.External
 {
     public interface IExternalAuthManager
     {
         Task<bool> IsValidUser(string provider, string providerKey, string providerAccessCode);
 
-        Task<ExternalLoginUserInfo> GetUserInfo(string provider, string accessCode);
+        Task<ExternalAuthUserInfo> GetUserInfo(string provider, string accessCode);
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/IExternalAuthProviderApi.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Authentication/External/IExternalAuthProviderApi.cs
@@ -1,5 +1,4 @@
 ﻿using System.Threading.Tasks;
-using Abp.Zero.AspNetCore;
 
 namespace AbpCompanyName.AbpProjectName.Authentication.External
 {
@@ -9,7 +8,7 @@ public interface IExternalAuthProviderApi
 
         Task<bool> IsValidUser(string userId, string accessCode);
 
-        Task<ExternalLoginUserInfo> GetUserInfo(string accessCode);
+        Task<ExternalAuthUserInfo> GetUserInfo(string accessCode);
 
         void Initialize(ExternalLoginProviderInfo providerInfo);
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/AbpProjectNameControllerBase.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/AbpProjectNameControllerBase.cs
@@ -1,6 +1,6 @@
 using Abp.AspNetCore.Mvc.Controllers;
 using Abp.IdentityFramework;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 
 namespace AbpCompanyName.AbpProjectName.Controllers
 {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/TokenAuthController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/TokenAuthController.cs
@@ -10,14 +10,13 @@
 using Abp.MultiTenancy;
 using Abp.Runtime.Security;
 using Abp.UI;
-using Abp.Zero.AspNetCore;
 using AbpCompanyName.AbpProjectName.Authentication.External;
 using AbpCompanyName.AbpProjectName.Authentication.JwtBearer;
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.Models.TokenAuth;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
 namespace AbpCompanyName.AbpProjectName.Controllers
@@ -81,7 +80,7 @@ public async Task<ExternalAuthenticateResultModel> ExternalAuthenticate([FromBod
         {
             var externalUser = await GetExternalUserInfo(model);
 
-            var loginResult = await _logInManager.LoginAsync(new UserLoginInfo(model.AuthProvider, model.ProviderKey), GetTenancyNameOrNull());
+            var loginResult = await _logInManager.LoginAsync(new UserLoginInfo(model.AuthProvider, model.ProviderKey, model.AuthProvider), GetTenancyNameOrNull());
 
             switch (loginResult.Result)
             {
@@ -107,7 +106,7 @@ public async Task<ExternalAuthenticateResultModel> ExternalAuthenticate([FromBod
                         }
 
                         //Try to login again with newly registered user!
-                        loginResult = await _logInManager.LoginAsync(new UserLoginInfo(model.AuthProvider, model.ProviderKey), GetTenancyNameOrNull());
+                        loginResult = await _logInManager.LoginAsync(new UserLoginInfo(model.AuthProvider, model.ProviderKey, model.AuthProvider), GetTenancyNameOrNull());
                         if (loginResult.Result != AbpLoginResultType.Success)
                         {
                             throw _abpLoginResultTypeHelper.CreateExceptionForFailedLoginAttempt(
@@ -134,7 +133,7 @@ public async Task<ExternalAuthenticateResultModel> ExternalAuthenticate([FromBod
             }
         }
 
-        private async Task<User> RegisterExternalUserAsync(ExternalLoginUserInfo externalUser)
+        private async Task<User> RegisterExternalUserAsync(ExternalAuthUserInfo externalUser)
         {
             var user = await _userRegistrationManager.RegisterAsync(
                 externalUser.Name,
@@ -149,8 +148,8 @@ private async Task<User> RegisterExternalUserAsync(ExternalLoginUserInfo externa
             {
                 new UserLogin
                 {
-                    LoginProvider = externalUser.LoginInfo.LoginProvider,
-                    ProviderKey = externalUser.LoginInfo.ProviderKey,
+                    LoginProvider = externalUser.Provider,
+                    ProviderKey = externalUser.ProviderKey,
                     TenantId = user.TenantId
                 }
             };
@@ -160,10 +159,10 @@ private async Task<User> RegisterExternalUserAsync(ExternalLoginUserInfo externa
             return user;
         }
 
-        private async Task<ExternalLoginUserInfo> GetExternalUserInfo(ExternalAuthenticateModel model)
+        private async Task<ExternalAuthUserInfo> GetExternalUserInfo(ExternalAuthenticateModel model)
         {
             var userInfo = await _externalAuthManager.GetUserInfo(model.AuthProvider, model.ProviderAccessCode);
-            if (userInfo.LoginInfo.ProviderKey != model.ProviderKey)
+            if (userInfo.ProviderKey != model.ProviderKey)
             {
                 throw new UserFriendlyException(L("CouldNotValidateExternalUser"));
             }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if FEATURE_SIGNALR 
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
@@ -34,3 +35,4 @@ public static IApplicationBuilder UseAppBuilder(
         }
     }
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using System.Linq;`
`4`	`3`	`using System.Threading.Tasks;`
`5`	`4`	`using Abp.Dependency;`
`6`		`-using Abp.Zero.AspNetCore;`
`7`	`5`
`8`	`6`	`namespace AbpCompanyName.AbpProjectName.Authentication.External`
`9`	`7`	`{`
`@@ -26,7 +24,7 @@ public Task<bool> IsValidUser(string provider, string providerKey, string provid`
`26`	`24`	`}`
`27`	`25`	`}`
`28`	`26`
`29`		`- public Task<ExternalLoginUserInfo> GetUserInfo(string provider, string accessCode)`
	`27`	`+ public Task<ExternalAuthUserInfo> GetUserInfo(string provider, string accessCode)`
`30`	`28`	`{`
`31`	`29`	`using (var providerApi = CreateProviderApi(provider))`
`32`	`30`	`{`
`@@ -39,7 +37,7 @@ public IDisposableDependencyObjectWrapper<IExternalAuthProviderApi> CreateProvid`
`39`	`37`	`var providerInfo = _externalAuthConfiguration.Providers.FirstOrDefault(p => p.Name == provider);`
`40`	`38`	`if (providerInfo == null)`
`41`	`39`	`{`
`42`		`- throw new ApplicationException("Unknown external auth provider: " + provider);`
	`40`	`+ throw new Exception("Unknown external auth provider: " + provider);`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`var providerApi = _iocResolver.ResolveAsDisposable<IExternalAuthProviderApi>(providerInfo.ProviderApiType);`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
	`1`	`+using System.Threading.Tasks;`
`5`	`2`	`using Abp.Dependency;`
`6`		`-using Abp.Zero.AspNetCore;`
`7`	`3`
`8`	`4`	`namespace AbpCompanyName.AbpProjectName.Authentication.External`
`9`	`5`	`{`
`@@ -19,9 +15,9 @@ public void Initialize(ExternalLoginProviderInfo providerInfo)`
`19`	`15`	`public async Task<bool> IsValidUser(string userId, string accessCode)`
`20`	`16`	`{`
`21`	`17`	`var userInfo = await GetUserInfo(accessCode);`
`22`		`- return userInfo.LoginInfo.ProviderKey == userId;`
	`18`	`+ return userInfo.ProviderKey == userId;`
`23`	`19`	`}`
`24`	`20`
`25`		`- public abstract Task<ExternalLoginUserInfo> GetUserInfo(string accessCode);`
	`21`	`+ public abstract Task<ExternalAuthUserInfo> GetUserInfo(string accessCode);`
`26`	`22`	`}`
`27`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`	`2`
`6`	`3`	`namespace AbpCompanyName.AbpProjectName.Authentication.External`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,19 @@`
`4`	`4`	`using System.Security.Cryptography;`
`5`	`5`	`using System.Text;`
`6`	`6`	`using System.Threading.Tasks;`
`7`		`-using Abp.Zero.AspNetCore;`
`8`		`-using Microsoft.AspNet.Identity;`
`9`	`7`	`using Microsoft.AspNetCore.Authentication.Facebook;`
`10`	`8`	`using Microsoft.AspNetCore.WebUtilities;`
`11`	`9`	`using Newtonsoft.Json.Linq;`
`12`	`10`	`using Abp.Extensions;`
	`11`	`+using Microsoft.AspNetCore.Identity;`
`13`	`12`
`14`	`13`	`namespace AbpCompanyName.AbpProjectName.Authentication.External.Facebook`
`15`	`14`	`{`
`16`	`15`	`public class FacebookAuthProviderApi : ExternalAuthProviderApiBase`
`17`	`16`	`{`
`18`	`17`	`public const string Name = "Facebook";`
`19`	`18`
`20`		`- public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)`
	`19`	`+ public override async Task<ExternalAuthUserInfo> GetUserInfo(string accessCode)`
`21`	`20`	`{`
`22`	`21`	`var endpoint = QueryHelpers.AddQueryString("https://graph.facebook.com/v2.8/me", "access_token", accessCode);`
`23`	`22`	`endpoint = QueryHelpers.AddQueryString(endpoint, "appsecret_proof", GenerateAppSecretProof(accessCode));`
`@@ -43,12 +42,13 @@ public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)`
`43`	`42`	`name += middleName;`
`44`	`43`	`}`
`45`	`44`
`46`		`- return new ExternalLoginUserInfo`
	`45`	`+ return new ExternalAuthUserInfo`
`47`	`46`	`{`
`48`	`47`	`Name = name,`
`49`	`48`	`EmailAddress = FacebookHelper.GetEmail(payload),`
`50`	`49`	`Surname = FacebookHelper.GetLastName(payload),`
`51`		`- LoginInfo = new UserLoginInfo(Name, FacebookHelper.GetId(payload))`
	`50`	`+ Provider = Name,`
	`51`	`+ ProviderKey = FacebookHelper.GetId(payload)`
`52`	`52`	`};`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`using System.Net.Http;`
`3`	`3`	`using System.Net.Http.Headers;`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using Abp.Zero.AspNetCore;`
`6`		`-using Microsoft.AspNet.Identity;`
`7`	`5`	`using Microsoft.AspNetCore.Authentication.Google;`
`8`	`6`	`using Newtonsoft.Json.Linq;`
`9`	`7`
`@@ -13,7 +11,7 @@ public class GoogleAuthProviderApi : ExternalAuthProviderApiBase`
`13`	`11`	`{`
`14`	`12`	`public const string Name = "Google";`
`15`	`13`
`16`		`- public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)`
	`14`	`+ public override async Task<ExternalAuthUserInfo> GetUserInfo(string accessCode)`
`17`	`15`	`{`
`18`	`16`	`using (var client = new HttpClient())`
`19`	`17`	`{`
`@@ -31,12 +29,13 @@ public override async Task<ExternalLoginUserInfo> GetUserInfo(string accessCode)`
`31`	`29`
`32`	`30`	`var payload = JObject.Parse(await response.Content.ReadAsStringAsync());`
`33`	`31`
`34`		`- return new ExternalLoginUserInfo`
	`32`	`+ return new ExternalAuthUserInfo`
`35`	`33`	`{`
`36`	`34`	`Name = GoogleHelper.GetName(payload),`
`37`	`35`	`EmailAddress = GoogleHelper.GetEmail(payload),`
`38`	`36`	`Surname = GoogleHelper.GetFamilyName(payload),`
`39`		`- LoginInfo = new UserLoginInfo(Name, GoogleHelper.GetId(payload))`
	`37`	`+ ProviderKey = GoogleHelper.GetId(payload),`
	`38`	`+ Provider = Name`
`40`	`39`	`};`
`41`	`40`	`}`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`		`-using Abp.Zero.AspNetCore;`
`3`	`2`
`4`	`3`	`namespace AbpCompanyName.AbpProjectName.Authentication.External`
`5`	`4`	`{`
`6`	`5`	`public interface IExternalAuthManager`
`7`	`6`	`{`
`8`	`7`	`Task<bool> IsValidUser(string provider, string providerKey, string providerAccessCode);`
`9`	`8`
`10`		`- Task<ExternalLoginUserInfo> GetUserInfo(string provider, string accessCode);`
	`9`	`+ Task<ExternalAuthUserInfo> GetUserInfo(string provider, string accessCode);`
`11`	`10`	`}`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`		`-using Abp.Zero.AspNetCore;`
`3`	`2`
`4`	`3`	`namespace AbpCompanyName.AbpProjectName.Authentication.External`
`5`	`4`	`{`
`@@ -9,7 +8,7 @@ public interface IExternalAuthProviderApi`
`9`	`8`
`10`	`9`	`Task<bool> IsValidUser(string userId, string accessCode);`
`11`	`10`
`12`		`- Task<ExternalLoginUserInfo> GetUserInfo(string accessCode);`
	`11`	`+ Task<ExternalAuthUserInfo> GetUserInfo(string accessCode);`
`13`	`12`
`14`	`13`	`void Initialize(ExternalLoginProviderInfo providerInfo);`
`15`	`14`	`}`