Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API

Author: christian147

src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs

@@ -55,7 +55,7 @@ protected override async void OnStart()
                 await GetGpsLocation();
             }
 
-            if (!Settings.UseMocks && !string.IsNullOrEmpty(Settings.UserId))
+            if (!Settings.UseMocks && !string.IsNullOrEmpty(Settings.AuthAccessToken))
             {
                 await SendCurrentLocation();
             }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs

@@ -20,7 +20,6 @@ private static ISettings AppSettings
 
         #region Setting Constants
 
-        private const string IdUserId = "user_id";
         private const string AccessToken = "access_token";
         private const string IdToken = "id_token";
         private const string IdUseMocks = "use_mocks";
@@ -40,12 +39,6 @@ private static ISettings AppSettings
 
         #endregion
 
-        public static string UserId
-        {
-            get => AppSettings.GetValueOrDefault<string>(IdUserId);
-            set => AppSettings.AddOrUpdateValue<string>(IdUserId, value);
-        }
-
         public static string AuthAccessToken
         {
             get => AppSettings.GetValueOrDefault<string>(AccessToken, AccessTokenDefault);

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs

@@ -36,7 +36,7 @@ public class CampaignMockService : ICampaignService
             }
         };
 
-        public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string userId, string token)
+        public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token)
         {
             await Task.Delay(500);
 

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs

@@ -17,11 +17,11 @@ public CampaignService(IRequestProvider requestProvider)
             _requestProvider = requestProvider;
         }
 
-        public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string userId, string token)
+        public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token)
         {
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.MarketingEndpoint);
 
-            builder.Path = $"api/v1/campaigns/user/{userId}";
+            builder.Path = "api/v1/campaigns/user";
 
             string uri = builder.ToString();
 

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs

@@ -6,7 +6,7 @@
 
     public interface ICampaignService
     {
-        Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string userId, string token);
+        Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token);
 
         Task<CampaignItem> GetCampaignByIdAsync(int id, string token);
     }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs

@@ -36,7 +36,7 @@ public override async Task InitializeAsync(object navigationData)
             IsBusy = true;
 
             // Get campaigns by user
-            Campaigns = await _campaignService.GetAllCampaignsAsync(Settings.UserId, Settings.AuthAccessToken);
+            Campaigns = await _campaignService.GetAllCampaignsAsync(Settings.AuthAccessToken);
 
             IsBusy = false;
         }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs

@@ -217,7 +217,6 @@ private void Logout()
                 Settings.AuthIdToken = string.Empty; 
             }
 
-            Settings.UserId = string.Empty;
             Settings.UseFakeLocation = false;
         }
 
@@ -244,7 +243,6 @@ private async Task NavigateAsync(string url)
                     {
                         Settings.AuthAccessToken = accessToken;
                         Settings.AuthIdToken = authResponse.IdentityToken;
-                        Settings.UserId = authResponse.Values["sub"];
                         await NavigationService.NavigateToAsync<MainViewModel>();
                         await NavigationService.RemoveLastFromBackStackAsync();
                     }

src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs

@@ -21,7 +21,7 @@ public async Task GetFakeCampaigTest()
         public async Task GetFakeCampaignsTest()
         {
             var campaignMockService = new CampaignMockService();
-            var result = await campaignMockService.GetAllCampaignsAsync(Settings.UserId, GlobalSetting.Instance.AuthToken);
+            var result = await campaignMockService.GetAllCampaignsAsync(GlobalSetting.Instance.AuthToken);
 
             Assert.NotEqual(0, result.Count);
         }

src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs

@@ -1,4 +1,6 @@
-namespace Microsoft.eShopOnContainers.Services.Marketing.API.Controllers
+using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Services;
+
+namespace Microsoft.eShopOnContainers.Services.Marketing.API.Controllers
 {
     using System;
     using System.Linq;
@@ -21,14 +23,17 @@ public class CampaignsController : Controller
         private readonly MarketingContext _context;
         private readonly MarketingSettings _settings;
         private readonly IMarketingDataRepository _marketingDataRepository;
+        private readonly IIdentityService _identityService;
 
         public CampaignsController(MarketingContext context,
             IMarketingDataRepository marketingDataRepository,
-             IOptionsSnapshot<MarketingSettings> settings)
+             IOptionsSnapshot<MarketingSettings> settings,
+            IIdentityService identityService)
         {
             _context = context;
             _marketingDataRepository = marketingDataRepository;
             _settings = settings.Value;
+            _identityService = identityService;
         }
 
         [HttpGet]
@@ -124,9 +129,11 @@ public async Task<IActionResult> Delete(int id)
             return NoContent();
         }
 
-        [HttpGet("user/{userId:guid}")]
-        public async Task<IActionResult> GetCampaignsByUserId(Guid userId, int pageSize = 10, int pageIndex = 0)
+        [HttpGet("user")]
+        public async Task<IActionResult> GetCampaignsByUserId( int pageSize = 10, int pageIndex = 0)
         {
+            var userId = _identityService.GetUserIdentity();
+
             var marketingData = await _marketingDataRepository.GetAsync(userId.ToString());
 
             var campaignDtoList = new List<CampaignDTO>();

src/Web/WebMVC/Infrastructure/API.cs

@@ -84,9 +84,9 @@ public static string GetAllTypes(string baseUri)
 
         public static class Marketing
         {
-            public static string GetAllCampaigns(string baseUri, string userId, int take, int page)
+            public static string GetAllCampaigns(string baseUri, int take, int page)
             {
-                return $"{baseUri}user/{userId}?pageSize={take}&pageIndex={page}";
+                return $"{baseUri}user?pageSize={take}&pageIndex={page}";
             }
 
             public static string GetAllCampaignById(string baseUri, int id)