Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion DB/DB.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
1 change: 1 addition & 0 deletions WebApp/App_Start/IdentityConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ public override Task<ClaimsIdentity> CreateUserIdentityAsync(ApplicationUser use
return user.GenerateUserIdentityAsync((ApplicationUserManager)UserManager);
}


public static ApplicationSignInManager Create(IdentityFactoryOptions<ApplicationSignInManager> options, IOwinContext context)
{
return new ApplicationSignInManager(context.GetUserManager<ApplicationUserManager>(), context.Authentication);
Expand Down
17 changes: 12 additions & 5 deletions WebApp/App_Start/Startup.Auth.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
using System;
using Microsoft.AspNet.Identity;
using Microsoft.AspNet.Identity.Owin;
using Microsoft.Owin;
using Microsoft.Owin.Security.Cookies;
using Microsoft.Owin.Security.Google;
using Owin;
using WebApp.Models;
using Microsoft.Owin.Security.OAuth;

namespace WebApp
{
public partial class Startup
{

public static OAuthAuthorizationServerOptions OAuthOptions { get; private set; }

public static string PublicClientId { get; private set; }
// For more information on configuring authentication, please visit http://go.microsoft.com/fwlink/?LinkId=301864
public void ConfigureAuth(IAppBuilder app)
{
Expand All @@ -22,7 +24,7 @@ public void ConfigureAuth(IAppBuilder app)
// Enable the application to use a cookie to store information for the signed in user
// and to use a cookie to temporarily store information about a user logging in with a third party login provider
// Configure the sign in cookie
app.UseCookieAuthentication(new CookieAuthenticationOptions
/*app.UseCookieAuthentication(new CookieAuthenticationOptions
{
AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie,
LoginPath = new PathString("/Account/Login"),
Expand All @@ -35,7 +37,12 @@ public void ConfigureAuth(IAppBuilder app)
regenerateIdentity: (manager, user) => user.GenerateUserIdentityAsync(manager))
}
});
app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);
app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);*/

// Configure the application for OAuth based flow

// Enable the application to use bearer tokens to authenticate users
app.UseOAuthBearerTokens(OAuthOptions);

// Enables the application to temporarily store user information when they are verifying the second factor in the two-factor authentication process.
app.UseTwoFactorSignInCookie(DefaultAuthenticationTypes.TwoFactorCookie, TimeSpan.FromMinutes(5));
Expand Down
2 changes: 1 addition & 1 deletion WebApp/Controllers/ProjectController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public JsonResult GetImagesFormProject(String sidRoot)
return Json(movies, JsonRequestBehavior.AllowGet);
}
[HttpGet, Route("Project/id{sidRoot}/Project")]
public JsonResult GetPtojectsFormProject(String sidRoot)
public JsonResult GetProjectsFormProject(String sidRoot)
{
var idRoot = new ObjectId();
if (!ObjectId.TryParse(sidRoot, out idRoot))
Expand Down
4 changes: 3 additions & 1 deletion WebApp/Models/IdentityModels.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Data.Entity;
using System;
using System.Data.Entity;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Identity;
Expand Down Expand Up @@ -31,6 +32,7 @@ public string Id
public string LastName { get; set; }
public string Email { get; set; }
public string Phone { get; set; }

}

public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
Expand Down
2 changes: 1 addition & 1 deletion WebApp/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<appSettings>
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="MONGOLAB_URI" value="mongodb://localhost/Easel"/>
<add key="MONGOLAB_URI" value="mongodb://localhost/Easel" />
<add key="ClientValidationEnabled" value="true" />
<!--<add key="MONGOLAB_URI" value="mongodb://localhost/Easel"/>-->
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
Expand Down
1 change: 1 addition & 0 deletions WebApp/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<package id="MongoDB.Driver" version="2.2.4" targetFramework="net452" />
<package id="MongoDB.Driver.Core" version="2.2.4" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />
<package id="NuGet.CommandLine" version="3.4.3" targetFramework="net452" developmentDependency="true" />
<package id="Owin" version="1.0" targetFramework="net452" />
<package id="Respond" version="1.2.0" targetFramework="net452" />
<package id="WebGrease" version="1.5.2" targetFramework="net452" />
Expand Down
18 changes: 18 additions & 0 deletions appveyor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
configuration: Release

# restore NuGet packages before running MSBuild
before_build:
- nuget restore Ease-L.sln

# package Web Application project for Web Deploy
build:
verbosity: minimal
publish_wap: true

cache:
- packages -> **\packages.config

deploy:
- provider: Environment
name: appvey deploy
site_name: www.ease-l.xyz
Loading