Merge remote-tracking branch 'origin/accountManagement' into accountManagement

Conflicts:
	Zenergy/Zenergy/Controllers/AccountController.cs
	Zenergy/Zenergy/Controllers/ApiControllers/membersController.cs
	Zenergy/Zenergy/Providers/ApplicationOAuthProvider.cs
	Zenergy/Zenergy/Scripts/Lib/_references.js
	Zenergy/Zenergy/Services/UserServices.cs
	Zenergy/Zenergy/Zenergy.csproj

Author: Clement-Roque

Diff for: Zenergy/Zenergy/Controllers/AccountController.cs

@@ -515,4 +515,8 @@ public System.Web.Mvc.ActionResult Index()
             return View();
         }
     }
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> origin/accountManagement

Diff for: Zenergy/Zenergy/Controllers/ApiControllers/membersController.cs

@@ -13,7 +13,10 @@
 
 namespace Zenergy.Controllers.ApiControllers
 {
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/accountManagement
     [Authorize]
     public class membersController : ApiController
     {

Diff for: Zenergy/Zenergy/Providers/ApplicationOAuthProvider.cs

@@ -51,7 +51,10 @@ public override async Task GrantResourceOwnerCredentials(OAuthGrantResourceOwner
             identity.AddClaim(new Claim("mail", context.UserName));
             identity.AddClaim(new Claim("role", "user"));
             identity.AddClaim(new Claim(ClaimTypes.Name, context.UserName));
+            //identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, user.userId.ToString()));
+            identity.AddClaim(new Claim("UserId", user.userId.ToString()));
 
+<<<<<<< HEAD
             //identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, user.userId.ToString()));
             identity.AddClaim(new Claim("UserId", user.userId.ToString()));
 
@@ -76,6 +79,8 @@ public override async Task GrantResourceOwnerCredentials(OAuthGrantResourceOwner
             identity.AddClaim(new Claim("UserId", user.userId.ToString()));
 
 
+=======
+>>>>>>> origin/accountManagement
             if (user.member != null)
             {
                 identity.AddClaim(new Claim(ClaimTypes.Role, "Member"));

Diff for: Zenergy/Zenergy/Services/UserServices.cs

@@ -53,6 +53,7 @@ public async Task<user> findByMailAndPassword(string userMail, string userPass)
                 System.Diagnostics.Debug.WriteLine(e.StackTrace);
                 return null;
             }
+<<<<<<< HEAD
         }
 
         public async Task<user> findByMail(string userMail)
@@ -67,12 +68,14 @@ public async Task<user> findByMail(string userMail)
                 System.Diagnostics.Debug.WriteLine(e.StackTrace);
                 return null;
             }
+=======
+>>>>>>> origin/accountManagement
         }
 
         public async Task CreateUser(user u)
         {
-                db.user.Add(u);
-                await db.SaveChangesAsync();
+            db.user.Add(u);
+            await db.SaveChangesAsync();
         }
 
     }

Diff for: Zenergy/Zenergy/Zenergy.csproj

@@ -302,11 +302,15 @@
     <Content Include="favicon.ico" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
+<<<<<<< HEAD
 <<<<<<< HEAD
     <Content Include="Pages\profile.html" />
 =======
     <Content Include="Scripts\Controllers\accountManagementPageController.js" />
 >>>>>>> adding view/controller and BE controller
+=======
+    <Content Include="Scripts\Controllers\accountManagementPageController.js" />
+>>>>>>> origin/accountManagement
     <Content Include="Scripts\Controllers\homePageController.js" />
     <Content Include="Scripts\Controllers\loginPageController.js" />
     <Content Include="Scripts\Controllers\mainController.js" />
@@ -1169,7 +1173,10 @@
     <Content Include="Views\Login\index.cshtml" />
     <Content Include="Views\Register\index.cshtml" />
     <Content Include="Views\AccountManagement\index.cshtml" />
+<<<<<<< HEAD
 >>>>>>> adding view/controller and BE controller
+=======
+>>>>>>> origin/accountManagement
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />