Merge branch 'feature/stats' into dev

GrpcShared/DTO/Track/TrackResponse.cs

@@ -0,0 +1,70 @@
+using ProtoBuf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GrpcShared.DTO.Track
+{
+    [ProtoContract]
+    public class TrackResponse
+    {
+        [ProtoMember(1)]
+        public int? Timestamp{ get; set; }
+        [ProtoMember(2)]
+        public int? Progress_ms { get; set; }
+        [ProtoMember(3)]
+        public bool? Is_playing { get; set; }
+        [ProtoMember(4)]
+        public Item? Item { get; set; }
+
+    }
+    [ProtoContract]
+    public class Item
+    {
+        [ProtoMember(1)]
+        public Album? Album { get; set; }
+        [ProtoMember(2)]
+        public Artist[]? Artists { get; set; }
+        [ProtoMember(3)]
+        public string? Id { get; set; }
+        [ProtoMember(4)]
+        public string? Name { get; set; }
+        [ProtoMember(5)]
+        public string? Href { get; set; }
+
+    }
+    [ProtoContract]
+    public class Album
+    {
+        [ProtoMember(1)]
+        public string? Id { get; set; }
+        [ProtoMember(2)]
+        public string? Name { get; set; }
+        [ProtoMember(3)]
+        public Image[]? Images { get; set; }
+        [ProtoMember(4)]
+        public string? Href { get; set; }
+    }
+    [ProtoContract]
+    public class Artist
+    {
+        [ProtoMember(1)]
+        public string? Id { get; set; }
+        [ProtoMember(2)]
+        public string? Name { get; set; }
+        [ProtoMember(3)]
+        public string? Href { get; set; }
+    }
+    [ProtoContract]
+    public class Image
+    {
+        [ProtoMember(1)]
+        public int? Height{ get; set; }
+        [ProtoMember(2)]
+        public string? Url { get; set; }
+        [ProtoMember(3)]
+        public int? Width { get; set; }
+    }
+}

GrpcShared/Interfaces/IStatsService.cs

@@ -0,0 +1,16 @@
+using GrpcShared.DTO.Track;
+using ProtoBuf.Grpc.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GrpcShared.Interfaces
+{
+    [Service]
+    public interface IStatsService
+    {
+        Task<TrackResponse> GetCurrentlyPlayingTrack(string token);
+    }
+}

NemAnCore/App.razor

@@ -1,6 +1,9 @@
-<Router AppAssembly="@typeof(App).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+<CascadingAuthenticationState>
+<Router AppAssembly="@typeof(App).Assembly">
+    <Found Context="routeData">       
+        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" >
+            <NotAuthorized>Sorry nisi autorizovan</NotAuthorized>
+        </AuthorizeRouteView>
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
     <NotFound>
@@ -10,3 +13,4 @@
         </LayoutView>
     </NotFound>
 </Router>
+</CascadingAuthenticationState>

NemAnCore/AuthProvider.cs

@@ -0,0 +1,26 @@
+using Blazored.SessionStorage;
+using System.Security.Claims;
+
+namespace NemAnBlazor
+{
+    public class AuthProvider : AuthenticationStateProvider
+    {
+        private readonly ISessionStorageService _sessionStorage;
+        public AuthProvider(ISessionStorageService sessionStorage)
+        {
+            _sessionStorage = sessionStorage;
+        }
+        public override async Task<AuthenticationState> GetAuthenticationStateAsync()
+        {
+            string token = await _sessionStorage.GetItemAsync<string>("token");
+
+            ClaimsIdentity identity = new ();
+            ClaimsPrincipal user = new (identity);
+            AuthenticationState state = new(user);
+
+            NotifyAuthenticationStateChanged(Task.FromResult(state));
+
+            return state;
+        }
+    }
+}

NemAnCore/NemAnBlazor.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="Blazored.SessionStorage" Version="2.2.0" />
     <PackageReference Include="Grpc.Net.Client" Version="2.47.0" />
     <PackageReference Include="Grpc.Net.Client.Web" Version="2.47.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.7" PrivateAssets="all" />
     <PackageReference Include="protobuf-net.Grpc" Version="1.0.171" />

NemAnCore/Pages/Callback.razor

@@ -3,20 +3,15 @@
 @inject NavigationManager NavigationMgr
 @inject IAuthClientService AuthService
 @inject Blazored.SessionStorage.ISessionStorageService sessionStorage
-<PageTitle>Callback page</PageTitle>
+<PageTitle>Redirecting...</PageTitle>
 
 
-<p role="status">Current count: @currentCount</p>
+<p role="status">Loading...</p>
 
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
 
 @code {
-    private int currentCount = 0;
-
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
+   
+   
     protected override async Task OnInitializedAsync()
     {
         string url = NavigationMgr.Uri;

NemAnCore/Pages/Home.razor

@@ -1,7 +1,15 @@
 @page "/home"
 <h3>Home</h3>
 
-<p>pozdrav, login radi</p>
+<p>login radi</p>
+<AuthorizeView>
+    <Authorized> 
+        <p>autorizovan si</p>
+    </Authorized>
+    <NotAuthorized>
+        <p>nisi autorizovan</p>
+    </NotAuthorized>
+</AuthorizeView>
 @code {
 
 }

NemAnCore/Program.cs

@@ -1,3 +1,4 @@
+global using Microsoft.AspNetCore.Components.Authorization;
 using Blazored.SessionStorage;
 using Grpc.Net.Client;
 using Grpc.Net.Client.Web;
@@ -25,6 +26,7 @@ builder.Services.AddScoped(_ =>
 builder.Services.AddScoped<ITrackClientService, TrackClientService>();
 builder.Services.AddScoped<IAuthClientService, AuthClientService>();
 builder.Services.AddBlazoredSessionStorage();
-
+builder.Services.AddScoped<AuthenticationStateProvider, AuthProvider>();
+builder.Services.AddAuthorizationCore();
 await builder.Build().RunAsync();
 

NemAnCore/Services/Interfaces/IStatsClientService.cs

@@ -0,0 +1,6 @@
+namespace NemAnBlazor.Services.Interfaces
+{
+    public interface IStatsClientService
+    {
+    }
+}

NemAnCore/Services/StatsClientService.cs

@@ -0,0 +1,8 @@
+using NemAnBlazor.Services.Interfaces;
+
+namespace NemAnBlazor.Services
+{
+    public class StatsClientService :IStatsClientService
+    {
+    }
+}

NemAnCore/_Imports.razor

@@ -8,4 +8,5 @@
 @using Microsoft.JSInterop
 @using NemAnBlazor
 @using NemAnBlazor.Shared
-@using System.Web
+@using System.Web
+@using Microsoft.AspNetCore.Components.Authorization

gRPCServer/Services/StatsService.cs

@@ -0,0 +1,20 @@
+
+using GrpcShared.DTO.Track;
+using GrpcShared.Interfaces;
+
+namespace SpotifyService.Services
+{
+    public class StatsService : IStatsService
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+
+        public StatsService(IHttpClientFactory httpClientFactory)
+        {
+            _httpClientFactory = httpClientFactory;
+        }
+        public Task<TrackResponse> GetCurrentlyPlayingTrack(string token)
+        {
+            return null;
+        }
+    }
+}