paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Paul Schneider
2018-07-21 16:15:54 +02:00
parent a531a46fb0
commit 11b76834bc
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yavsc.Abstract/Google/AuthToken.cs → Yavsc.Abstract/Identity/AuthToken.cs
View File

@ -20,7 +20,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace Yavsc.Models.Google namespace Yavsc.Abstract.Identity
{ {
/// <summary> /// <summary>
/// Auth token, as they are received. /// Auth token, as they are received.

9
Yavsc.Abstract/Identity/Me.cs Normal file
View File

@ -0,0 +1,9 @@
namespace Yavsc.Abstract.Identity {
public class Me : UserInfo
{
public AuthToken Token {
get;
set;
}
}
}

1
Yavsc.Server/Services/GoogleApis/PeopleApi.cs
View File

@ -22,6 +22,7 @@
using System.IO; using System.IO;
using System.Net; using System.Net;
using Newtonsoft.Json; using Newtonsoft.Json;
using Yavsc.Abstract.Identity;
using Yavsc.Models.Google; using Yavsc.Models.Google;
namespace Yavsc.GoogleApis namespace Yavsc.GoogleApis

2
Yavsc/ApiControllers/AccountController.cs
View File

@ -142,7 +142,7 @@ namespace Yavsc.WebApi.Controllers
.Include(u=>u.Roles) .Include(u=>u.Roles)
.FirstAsync(u=>u.Id == uid); .FirstAsync(u=>u.Id == uid);
var user = new Me(userData.Id, userData.UserName, userData.Email, var user = new Yavsc.Models.Auth.Me(userData.Id, userData.UserName, userData.Email,
userData.Avatar , userData.Avatar ,
userData.PostalAddress, userData.DedicatedGoogleCalendar ); userData.PostalAddress, userData.DedicatedGoogleCalendar );

19
test/src/YavscWorkInProgress.cs
View File

@ -14,6 +14,7 @@ using Microsoft.Extensions.Localization;
using Microsoft.Extensions.OptionsModel; using Microsoft.Extensions.OptionsModel;
using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.PlatformAbstractions;
using Xunit; using Xunit;
using Xunit.Abstractions;
using Yavsc; using Yavsc;
using Yavsc.Lib; using Yavsc.Lib;
using Yavsc.Models; using Yavsc.Models;
@ -24,21 +25,25 @@ namespace test
public class YavscWorkInProgress : BaseTestContext public class YavscWorkInProgress : BaseTestContext
{ {
ServerSideFixture _serverFixture;
ITestOutputHelper output;
public YavscWorkInProgress(ServerSideFixture serverFixture, ITestOutputHelper output)
{
this.output = output;
_serverFixture = serverFixture;
}
[Fact]
public void GitClone() public void GitClone()
{ {
AppDomain.CurrentDomain.SetData("YAVSC_DB_CONNECTION", "Server=localhost;Port=5432;Database=YavscDev;Username=yavscdev;Password=admin;"); var dbc = _serverFixture._app.Services.GetService(typeof(ApplicationDbContext)) as ApplicationDbContext;
ServiceCollection services = new ServiceCollection();
YavscMandatory.ConfigureServices(services, testprojectAssetPath, out configuration, out provider);
var siteConfig = provider.GetRequiredService<IOptions<SiteSettings>>().Value;
var dbc = provider.GetRequiredService<ApplicationDbContext>();
var firstProject = dbc.Projects.FirstOrDefault(); var firstProject = dbc.Projects.FirstOrDefault();
Assert.NotNull (firstProject); Assert.NotNull (firstProject);
var clone = new GitClone(siteConfig.GitRepository); var clone = new GitClone(_serverFixture._siteSetup.GitRepository);
clone.Launch(firstProject); clone.Launch(firstProject);
} }
} }