Merge branch 'feature/track-user-location-mongodb' into dev

christian147 · christian147 · commit e5a59a1bdfa7 · 2017-06-13T11:26:47.000+02:00
# Conflicts:
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs
@@ -16,7 +16,7 @@ public string CreateAuthorizationRequest()
             dic.Add("client_id", "xamarin");
             dic.Add("client_secret", "secret"); 
             dic.Add("response_type", "code id_token token");
-            dic.Add("scope", "openid profile basket orders offline_access");
+            dic.Add("scope", "openid profile basket orders locations offline_access");
 
             dic.Add("redirect_uri", GlobalSetting.Instance.IdentityCallback);
             dic.Add("nonce", Guid.NewGuid().ToString("N"));
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationService.cs
@@ -5,6 +5,6 @@
     
     public interface ILocationService
     {
-        Task UpdateUserLocation(LocationRequest newLocReq);
+        Task UpdateUserLocation(LocationRequest newLocReq, string token);
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs
@@ -14,15 +14,15 @@ public LocationService(IRequestProvider requestProvider)
             _requestProvider = requestProvider;
         }
 
-        public async Task UpdateUserLocation(LocationRequest newLocReq)
+        public async Task UpdateUserLocation(LocationRequest newLocReq, string token)
         {
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.LocationEndpoint);
 
             builder.Path = "api/v1/locations";
 
             string uri = builder.ToString();
 
-            var result = await _requestProvider.PostAsync(uri, newLocReq);
+            await _requestProvider.PostAsync(uri, newLocReq, token);
         }
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
@@ -215,8 +215,10 @@ private void Logout()
             if(Settings.UseMocks)
             {
                 Settings.AuthAccessToken = string.Empty;
-                Settings.AuthIdToken = string.Empty;
+                Settings.AuthIdToken = string.Empty;     
             }
+
+            Settings.UseFakeLocation = false;
         }
 
         private async Task NavigateAsync(string url)
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
@@ -140,6 +140,8 @@ public double Longitude
             }
         }
 
+        public bool UserIsLogged => !string.IsNullOrEmpty(Settings.AuthAccessToken);
+
         public ICommand ToggleMockServicesCommand => new Command(async () => await ToggleMockServicesAsync());
 
         public ICommand ToggleFakeLocationCommand => new Command(() => ToggleFakeLocationAsync());
@@ -194,8 +196,9 @@ private async Task ToggleSendLocationAsync()
                 Latitude = _latitude,
                 Longitude = _longitude
             };
+            var authToken = Settings.AuthAccessToken;
 
-            await _locationService.UpdateUserLocation(locationRequest);
+            await _locationService.UpdateUserLocation(locationRequest, authToken);
         }
 
         private void UpdateInfo()
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
@@ -163,7 +163,8 @@
                         Grid.ColumnSpan="2"/>
                     <StackLayout 
                         Grid.Column="0"                       
-                        Grid.Row="4">
+                        Grid.Row="4"
+                        IsVisible="{Binding UserIsLogged}">
                         <Label 
                             Text="{Binding TitleUseFakeLocation}"
                             TextColor="{StaticResource GreenColor}"
@@ -179,7 +180,8 @@
                         Animate="True"     
                         Checked="{Binding UseFakeLocation, Mode=TwoWay}"
                         Command="{Binding ToggleFakeLocationCommand}"
-                        Style="{StaticResource SettingsToggleButtonStyle}">
+                        Style="{StaticResource SettingsToggleButtonStyle}"
+                        IsVisible="{Binding UserIsLogged}">
                         <controls:ToggleButton.CheckedImage>
                             <OnPlatform x:TypeArguments="ImageSource"
                               Android="switch_on.png"
@@ -193,7 +195,7 @@
                               WinPhone="Assets/switchOff.png"/>
                         </controls:ToggleButton.UnCheckedImage>
                     </controls:ToggleButton>
-                    <!-- ENDPOINT -->
+                    <!-- FAKE LOCATIONS -->
                     <StackLayout
                         Grid.Row="5"
                         Grid.Column="0"
@@ -205,7 +207,7 @@
                             Style="{StaticResource HeaderLabelStyle}"/>
                         <Entry
                             Text="{Binding Latitude, Mode=TwoWay}"
-                            Keyboard="Numeric">
+                            Keyboard="Text">
                             <Entry.Style>
                                 <OnPlatform 
                                     x:TypeArguments="Style"
@@ -219,7 +221,7 @@
                             Style="{StaticResource HeaderLabelStyle}"/>
                         <Entry
                             Text="{Binding Longitude, Mode=TwoWay}"
-                            Keyboard="Numeric">
+                            Keyboard="Text">
                             <Entry.Style>
                                 <OnPlatform 
                                     x:TypeArguments="Style"
diff --git a/src/Services/Identity/Identity.API/Configuration/Config.cs b/src/Services/Identity/Identity.API/Configuration/Config.cs
@@ -77,7 +77,8 @@ public static IEnumerable<Client> GetClients(Dictionary<string,string> clientsUr
                         "locations"
                     },
                     //Allow requesting refresh tokens for long lived API access
-                    AllowOfflineAccess = true                    
+                    AllowOfflineAccess = true,
+                    AllowAccessTokensViaBrowser = true
                 },
                 new Client
                 {
diff --git a/src/Services/Location/Locations.API/Controllers/LocationsController.cs b/src/Services/Location/Locations.API/Controllers/LocationsController.cs
@@ -21,11 +21,11 @@ public LocationsController(ILocationsService locationsService, IIdentityService
         }
 
         //GET api/v1/[controller]/user/1
-        [Route("user/{userId:int}")]
+        [Route("user/{userId:guid}")]
         [HttpGet]
-        public async Task<IActionResult> GetUserLocation(int userId)
+        public async Task<IActionResult> GetUserLocation(Guid userId)
         {
-            var userLocation = await _locationsService.GetUserLocation(userId);
+            var userLocation = await _locationsService.GetUserLocation(userId.ToString());
             return Ok(userLocation);
         }
 
diff --git a/src/Services/Location/Locations.API/Infrastructure/Repositories/ILocationsRepository.cs b/src/Services/Location/Locations.API/Infrastructure/Repositories/ILocationsRepository.cs
@@ -11,7 +11,7 @@ public interface ILocationsRepository
 
         Task<List<Locations>> GetLocationListAsync();
 
-        Task<UserLocation> GetUserLocationAsync(int userId);
+        Task<UserLocation> GetUserLocationAsync(string userId);
 
         Task<List<Locations>> GetCurrentUserRegionsListAsync(LocationRequest currentPosition);
 
diff --git a/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs b/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs
@@ -28,7 +28,7 @@ public async Task<Locations> GetAsync(string locationId)
                                  .FirstOrDefaultAsync();
         }
 
-        public async Task<UserLocation> GetUserLocationAsync(int userId)
+        public async Task<UserLocation> GetUserLocationAsync(string userId)
         {
             var filter = Builders<UserLocation>.Filter.Eq("UserId", userId);
             return await _context.UserLocation
diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs
@@ -9,7 +9,7 @@ public interface ILocationsService
     {
         Task<Locations> GetLocation(string locationId);
 
-        Task<UserLocation> GetUserLocation(int id);
+        Task<UserLocation> GetUserLocation(string id);
 
         Task<List<Locations>> GetAllLocation();
 
diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
@@ -23,9 +23,14 @@ public async Task<Locations> GetLocation(string locationId)
             return await _locationsRepository.GetAsync(locationId);
         }
 
-        public async Task<UserLocation> GetUserLocation(int id)
+        public async Task<UserLocation> GetUserLocation(string id)
         {
-            return await _locationsRepository.GetUserLocationAsync(id);
+            if (!Guid.TryParse(id, out Guid userId))
+            {
+                throw new ArgumentException("Not valid userId");
+            }
+
+            return await _locationsRepository.GetUserLocationAsync(userId.ToString());
         }
 
         public async Task<List<Locations>> GetAllLocation()
@@ -35,7 +40,7 @@ public async Task<List<Locations>> GetAllLocation()
 
         public async Task<bool> AddOrUpdateUserLocation(string id, LocationRequest currentPosition)
         {
-            if (!int.TryParse(id, out int userId))
+            if (!Guid.TryParse(id, out Guid userId))
             {
                 throw new ArgumentException("Not valid userId");
             }
@@ -50,7 +55,7 @@ public async Task<bool> AddOrUpdateUserLocation(string id, LocationRequest curre
 
             // If current area found, then update user location
             var locationAncestors = new List<string>();
-            var userLocation = await _locationsRepository.GetUserLocationAsync(userId);
+            var userLocation = await _locationsRepository.GetUserLocationAsync(userId.ToString());
             userLocation = userLocation ?? new UserLocation();
             userLocation.UserId = userId;
             userLocation.LocationId = currentUserAreaLocationList[0].Id;
diff --git a/src/Services/Location/Locations.API/Model/UserLocation.cs b/src/Services/Location/Locations.API/Model/UserLocation.cs
@@ -9,7 +9,7 @@ public class UserLocation
         [BsonIgnoreIfDefault]
         [BsonRepresentation(BsonType.ObjectId)]
         public string Id { get; set; }
-        public int UserId { get; set; } = 0;
+        public Guid UserId { get; set; }
         [BsonRepresentation(BsonType.ObjectId)]
         public string LocationId { get; set; }
         public DateTime UpdateDate { get; set; }
diff --git a/test/Services/IntegrationTests/Services/Locations/LocationsScenarioBase.cs b/test/Services/IntegrationTests/Services/Locations/LocationsScenarioBase.cs
@@ -27,7 +27,7 @@ public static string LocationBy(string id)
                 return $"api/v1/locations/{id}";
             }
 
-            public static string UserLocationBy(int id)
+            public static string UserLocationBy(Guid id)
             {
                 return $"api/v1/locations/user/{id}";
             }
diff --git a/test/Services/IntegrationTests/Services/Locations/LocationsScenarios.cs b/test/Services/IntegrationTests/Services/Locations/LocationsScenarios.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
+using System;
 
 namespace IntegrationTests.Services.Locations
 {
@@ -18,7 +19,7 @@ public async Task Set_new_user_seattle_location_response_ok_status_code()
         {
             using (var server = CreateServer())
             {
-                var userId = 1234;
+                var userId = new Guid("4611ce3f-380d-4db5-8d76-87a8689058ed");
                 var content = new StringContent(BuildLocationsRequest(-122.315752, 47.604610), UTF8Encoding.UTF8, "application/json");
 
                 // Expected result
@@ -50,7 +51,7 @@ public async Task Set_new_user_readmond_location_response_ok_status_code()
         {
             using (var server = CreateServer())
             {
-                var userId = 1234;
+                var userId = new Guid("4611ce3f-380d-4db5-8d76-87a8689058ed");
                 var content = new StringContent(BuildLocationsRequest(-122.119998, 47.690876), UTF8Encoding.UTF8, "application/json");
 
                 // Expected result
@@ -82,7 +83,7 @@ public async Task Set_new_user_Washington_location_response_ok_status_code()
         {
             using (var server = CreateServer())
             {
-                var userId = 1234;
+                var userId = new Guid("4611ce3f-380d-4db5-8d76-87a8689058ed");
                 var content = new StringContent(BuildLocationsRequest(-121.040360, 48.091631), UTF8Encoding.UTF8, "application/json");
 
                 // Expected result
diff --git a/test/Services/IntegrationTests/Services/Locations/LocationsTestsStartup.cs b/test/Services/IntegrationTests/Services/Locations/LocationsTestsStartup.cs
@@ -3,7 +3,10 @@
     using IntegrationTests.Middleware;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.eShopOnContainers.Services.Locations.API;
+    using System.Security.Claims;
+    using System.Threading.Tasks;
 
     public class LocationsTestsStartup : Startup
     {
@@ -15,12 +18,29 @@ protected override void ConfigureAuth(IApplicationBuilder app)
         {
             if (Configuration["isTest"] == bool.TrueString.ToLowerInvariant())
             {
-                app.UseMiddleware<AutoAuthorizeMiddleware>();
+                app.UseMiddleware<LocationAuthorizeMiddleware>();
             }
             else
             {
                 base.ConfigureAuth(app);
             }
         }
+
+        class LocationAuthorizeMiddleware
+        {
+            private readonly RequestDelegate _next;
+            public LocationAuthorizeMiddleware(RequestDelegate rd)
+            {
+                _next = rd;
+            }
+
+            public async Task Invoke(HttpContext httpContext)
+            {
+                var identity = new ClaimsIdentity("cookies");
+                identity.AddClaim(new Claim("sub", "4611ce3f-380d-4db5-8d76-87a8689058ed"));
+                httpContext.User.AddIdentity(identity);
+                await _next.Invoke(httpContext);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`
`6`	`6`	`public interface ILocationService`
`7`	`7`	`{`
`8`		`- Task UpdateUserLocation(LocationRequest newLocReq);`
	`8`	`+ Task UpdateUserLocation(LocationRequest newLocReq, string token);`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ public LocationService(IRequestProvider requestProvider)`
`14`	`14`	`_requestProvider = requestProvider;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public async Task UpdateUserLocation(LocationRequest newLocReq)`
	`17`	`+ public async Task UpdateUserLocation(LocationRequest newLocReq, string token)`
`18`	`18`	`{`
`19`	`19`	`UriBuilder builder = new UriBuilder(GlobalSetting.Instance.LocationEndpoint);`
`20`	`20`
`21`	`21`	`builder.Path = "api/v1/locations";`
`22`	`22`
`23`	`23`	`string uri = builder.ToString();`
`24`	`24`
`25`		`- var result = await _requestProvider.PostAsync(uri, newLocReq);`
	`25`	`+ await _requestProvider.PostAsync(uri, newLocReq, token);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,10 @@ private void Logout()`
`215`	`215`	`if(Settings.UseMocks)`
`216`	`216`	`{`
`217`	`217`	`Settings.AuthAccessToken = string.Empty;`
`218`		`- Settings.AuthIdToken = string.Empty;`
	`218`	`+ Settings.AuthIdToken = string.Empty;`
`219`	`219`	`}`
	`220`	`+`
	`221`	`+ Settings.UseFakeLocation = false;`
`220`	`222`	`}`
`221`	`223`
`222`	`224`	`private async Task NavigateAsync(string url)`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,8 @@ public double Longitude`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
	`143`	`+ public bool UserIsLogged => !string.IsNullOrEmpty(Settings.AuthAccessToken);`
	`144`	`+`
`143`	`145`	`public ICommand ToggleMockServicesCommand => new Command(async () => await ToggleMockServicesAsync());`
`144`	`146`
`145`	`147`	`public ICommand ToggleFakeLocationCommand => new Command(() => ToggleFakeLocationAsync());`
`@@ -194,8 +196,9 @@ private async Task ToggleSendLocationAsync()`
`194`	`196`	`Latitude = _latitude,`
`195`	`197`	`Longitude = _longitude`
`196`	`198`	`};`
	`199`	`+ var authToken = Settings.AuthAccessToken;`
`197`	`200`
`198`		`- await _locationService.UpdateUserLocation(locationRequest);`
	`201`	`+ await _locationService.UpdateUserLocation(locationRequest, authToken);`
`199`	`202`	`}`
`200`	`203`
`201`	`204`	`private void UpdateInfo()`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ public LocationsController(ILocationsService locationsService, IIdentityService`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`//GET api/v1/[controller]/user/1`
`24`		`- [Route("user/{userId:int}")]`
	`24`	`+ [Route("user/{userId:guid}")]`
`25`	`25`	`[HttpGet]`
`26`		`- public async Task<IActionResult> GetUserLocation(int userId)`
	`26`	`+ public async Task<IActionResult> GetUserLocation(Guid userId)`
`27`	`27`	`{`
`28`		`- var userLocation = await _locationsService.GetUserLocation(userId);`
	`28`	`+ var userLocation = await _locationsService.GetUserLocation(userId.ToString());`
`29`	`29`	`return Ok(userLocation);`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async Task<Locations> GetAsync(string locationId)`
`28`	`28`	`.FirstOrDefaultAsync();`
`29`	`29`	`}`
`30`	`30`
`31`		`- public async Task<UserLocation> GetUserLocationAsync(int userId)`
	`31`	`+ public async Task<UserLocation> GetUserLocationAsync(string userId)`
`32`	`32`	`{`
`33`	`33`	`var filter = Builders<UserLocation>.Filter.Eq("UserId", userId);`
`34`	`34`	`return await _context.UserLocation`