archive/FoxTube
Archived
1
0
Fork 0
Code Actions Activity

Added authorization mechanism

Browse Source
This commit is contained in:
Michael Gordeev
2019-12-05 00:58:09 +03:00
parent 903c0c563d
commit e2b2a7cc8d
9 changed files with 148 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FoxTube.Core/FoxTube.Core.csproj
+6 -8
View File
@@ -136,7 +136,7 @@
<Compile Include="Helpers\Metrics.cs" />
<Compile Include="Helpers\Settings.cs" />
<Compile Include="Helpers\StoreInterop.cs" />
<Compile Include="Helpers\UserControl.cs" />
<Compile Include="Helpers\UsersControl.cs" />
<Compile Include="Helpers\Utils.cs" />
<Compile Include="Models\Inbox\Changelog.cs" />
<Compile Include="Models\Inbox\DeveloperMessage.cs" />
@@ -153,6 +153,9 @@
<PackageReference Include="AngleSharp">
<Version>0.13.0</Version>
</PackageReference>
<PackageReference Include="ExtendedYouTubeAPI">
<Version>1.0.1</Version>
</PackageReference>
<PackageReference Include="Google.Apis.Auth">
<Version>1.42.0</Version>
</PackageReference>
@@ -163,10 +166,10 @@
<Version>1.42.0.1758</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>2.6.1</Version>
<Version>2.6.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
<Version>2.6.1</Version>
<Version>2.6.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
@@ -186,11 +189,6 @@
<Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
</SDKReference>
</ItemGroup>
<ItemGroup>
<Reference Include="YouTube.API">
<HintPath>..\Src\YouTube.API.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
FoxTube.Core/Helpers/UserControl.cs → FoxTube.Core/Helpers/UsersControl.cs
+20 -6
View File
@@ -2,21 +2,26 @@
using Google.Apis.Oauth2.v2;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Windows.Security.Authentication.Web;
using YouTube.Authorization;
using YouTube;
using System.Text.RegularExpressions;
using Windows.Security.Credentials;
using FoxTube.Core.Models;
using YouTube;
using System.Threading;
using Google.Apis.YouTube.v3;
namespace FoxTube
{
public static class UserControl
public static class UsersControl
{
static ExtendedYouTubeService _defaultService = new ExtendedYouTubeService(new Google.Apis.Services.BaseClientService.Initializer
{
ApplicationName = "FoxTube",
ApiKey = "AIzaSyD7tpbuvmYDv9h4udo9L_g3r0sLPFAnN00"
});
static string[] Scopes { get; } = new string[]
{
Oauth2Service.Scope.UserinfoProfile,
@@ -32,6 +37,7 @@ namespace FoxTube
public static User CurrentUser { get; set; }
public static bool Authorized => CurrentUser != null;
public static ExtendedYouTubeService Service => CurrentUser?.Service ?? _defaultService;
public static async Task<bool> AddUser()
{
@@ -42,8 +48,10 @@ namespace FoxTube
switch(result.ResponseStatus)
{
case WebAuthenticationStatus.Success:
UserCredential credential = await AuthorizationHelpers.ExchangeToken(ClientSecrets, new Regex(@"(?<=code=).?\w+").Match(result.ResponseData).Value); // TODO: Add credential assignment
UserCredential credential = await AuthorizationHelpers.ExchangeToken(ClientSecrets, new Regex(@"(?<=code=).?\w+").Match(result.ResponseData).Value);
CurrentUser = new User(credential);
PasswordVault passwordVault = new PasswordVault();
passwordVault.Add(new PasswordCredential("foxtube", CurrentUser.UserInfo.Id, credential.Token.RefreshToken));
return true;
case WebAuthenticationStatus.UserCancel:
break;
@@ -57,7 +65,8 @@ namespace FoxTube
public static async Task Initialize()
{
PasswordVault passwordVault = new PasswordVault();
List<PasswordCredential> credentials = passwordVault.FindAllByResource("foxtube").ToList();
IReadOnlyList<PasswordCredential> credentials;
credentials = passwordVault.RetrieveAll();
if (credentials.Count == 0)
return;
@@ -67,7 +76,12 @@ namespace FoxTube
CurrentUser = new User(credential);
}
public static async Task Logout() =>
public static async Task Logout()
{
PasswordVault passwordVault = new PasswordVault();
PasswordCredential credential = passwordVault.Retrieve("foxtube", CurrentUser.UserInfo.Id);
passwordVault.Remove(credential);
await CurrentUser.Credential.RevokeTokenAsync(CancellationToken.None);
}
}
}
FoxTube.Core/Models/User.cs
+43 -9
View File
@@ -1,24 +1,58 @@
using Google.Apis.Auth.OAuth2;
using Google.Apis.Oauth2.v2;
using Google.Apis.Oauth2.v2.Data;
using Google.Apis.Services;
using Google.Apis.YouTube.v3;
using Google.Apis.YouTube.v3.Data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using YouTube;
namespace FoxTube.Core.Models
{
public class User
{
public string Name { get; set; }
public string Email { get; set; }
internal string RefreshToken { get; set; }
public UserCredential Credential { get; set; }
public Channel Channel { get; set; }
public Userinfoplus UserInfo { get; }
public UserCredential Credential { get; }
public Channel Channel { get; private set; }
public List<Subscription> Subscriptions { get; } = new List<Subscription>();
public ExtendedYouTubeService Service { get; }
public User(UserCredential credential)
{
Credential = credential;
BaseClientService.Initializer initializer = new BaseClientService.Initializer
{
ApplicationName = "FoxTube",
HttpClientInitializer = Credential
};
Service = new ExtendedYouTubeService(initializer);
UserInfo = new Oauth2Service(initializer).Userinfo.Get().Execute();
// TODO: Retrieve history and WL
SubscriptionsResource.ListRequest subRequest = Service.Subscriptions.List("snippet");
subRequest.Mine = true;
subRequest.MaxResults = 50;
subRequest.Order = SubscriptionsResource.ListRequest.OrderEnum.Relevance;
SubscriptionListResponse subResponse;
string nextToken = null;
Subscriptions.Clear();
do
{
subRequest.PageToken = nextToken;
subResponse = subRequest.Execute();
foreach (Subscription s in subResponse.Items)
Subscriptions.Add(s);
nextToken = subResponse.NextPageToken;
} while (!string.IsNullOrWhiteSpace(nextToken));
var request = Service.Channels.List("snippet,contentDetails");
request.Mine = true;
Channel = request.Execute().Items[0];
}
}
}
FoxTube/App.xaml.cs
+1 -1
View File
@@ -19,7 +19,7 @@ namespace FoxTube
protected override async void OnLaunched(LaunchActivatedEventArgs e)
{
await UserControl.Initialize();
await UsersControl.Initialize();
await StoreInterop.UpdateStoreState();
if (Settings.LastReviewedVersion != Metrics.CurrentVersion)
Inbox.PushChangelog();
FoxTube/Controls/AccountManager.xaml
+3 -2
View File
@@ -5,10 +5,11 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Label="Michael 'XFox' Gordeev"
Label="Sign in"
xmlns:ui="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
Style="{StaticResource AppBarButtonRevealStyle}">
Style="{StaticResource AppBarButtonRevealStyle}"
Loaded="AppBarButton_Loaded">
<AppBarButton.Icon>
<FontIcon Glyph="&#xE1E2;"/>
FoxTube/Controls/AccountManager.xaml.cs
+23 -7
View File
@@ -10,18 +10,34 @@ namespace FoxTube.Controls
async void Flyout_Opening(object sender, object e)
{
if (UserControl.Authorized)
if (UsersControl.Authorized)
return;
(sender as Flyout).Hide();
if(await UserControl.AddUser())
if (await UsersControl.AddUser())
UpdateData();
}
void AppBarButton_Loaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
{
banner.Source = new BitmapImage(UserControl.CurrentUser.Channel.BrandingSettings.Image.BannerMobileLowImageUrl.ToUri()) { DecodePixelWidth = 300, DecodePixelHeight = 60 };
avatar.ProfilePicture = new BitmapImage(UserControl.CurrentUser.Channel.Snippet.Thumbnails.Default__.Url.ToUri()) { DecodePixelHeight = 40, DecodePixelWidth = 40 };
name.Text = UserControl.CurrentUser.Name;
email.Text = UserControl.CurrentUser.Email;
}
if (UsersControl.Authorized)
UpdateData();
else
MainPage.Current.Update();
}
void UpdateData()
{
Label = UsersControl.CurrentUser.UserInfo.Name;
Icon = new SymbolIcon(Symbol.Contact);
banner.Source = new BitmapImage(UsersControl.CurrentUser.Channel.BrandingSettings.Image.BannerMobileLowImageUrl.ToUri()) { DecodePixelWidth = 300, DecodePixelHeight = 60 };
avatar.ProfilePicture = new BitmapImage(UsersControl.CurrentUser.Channel.Snippet.Thumbnails.Default__.Url.ToUri()) { DecodePixelHeight = 40, DecodePixelWidth = 40 };
name.Text = UsersControl.CurrentUser.UserInfo.Name;
email.Text = UsersControl.CurrentUser.UserInfo.Email;
MainPage.Current.Update();
}
}
}
FoxTube/FoxTube.csproj
+1 -1
View File
@@ -292,7 +292,7 @@
<Version>6.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.2.190917002</Version>
<Version>2.3.191129002</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
FoxTube/MainPage.xaml
+18 -4
View File
@@ -8,7 +8,8 @@
xmlns:ui="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:FoxTube.Controls"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:models="using:FoxTube.Core.Models">
xmlns:models="using:FoxTube.Core.Models"
xmlns:data="using:Google.Apis.YouTube.v3.Data">
<Page.Background>
<AcrylicBrush BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}" TintOpacity=".5"/>
</Page.Background>
@@ -59,6 +60,19 @@
</ui:NavigationViewList>
</ui:NavigationView.PaneFooter>
<ui:NavigationView.MenuItemTemplate>
<DataTemplate x:DataType="data:Subscription">
<StackPanel Orientation="Horizontal" Padding="5" Margin="-5,0,0,0" Tag="{Binding Snippet.ResourceId.ChannelId}">
<PersonPicture Height="20" Margin="-5,0,15,0">
<PersonPicture.ProfilePicture>
<BitmapImage UriSource="{Binding Snippet.Thumbnails.Medium.Url}" DecodePixelHeight="20" DecodePixelWidth="20"/>
</PersonPicture.ProfilePicture>
</PersonPicture>
<TextBlock FontSize="14" Text="{Binding Snippet.Title}"/>
</StackPanel>
</DataTemplate>
</ui:NavigationView.MenuItemTemplate>
<ui:NavigationView.MenuItems>
<ui:NavigationViewItem Icon="Home" Content="Home" Name="home"/>
<ui:NavigationViewItem Content="Subscriptions" Name="subscriptions">
@@ -67,7 +81,7 @@
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
<ui:NavigationViewItemHeader Content="Library"/>
<ui:NavigationViewItemHeader Content="Library" Name="libraryHeader"/>
<ui:NavigationViewItem Content="History" Name="history">
<ui:NavigationViewItem.Icon>
@@ -82,11 +96,11 @@
<ui:NavigationViewItem Icon="Clock" Content="Watch later" Name="wl"/>
<ui:NavigationViewItem Icon="Download" Content="Downloads" Name="download"/>
<ui:NavigationViewItemHeader Content="Subscriptions"/>
<ui:NavigationViewItemHeader Content="Subscriptions" Name="subscriptionsHeader"/>
<ui:NavigationViewItemHeader Content="Best of YouTube"/>
<ui:NavigationViewItemHeader Content="Best of YouTube" Name="categoriesHeader"/>
<ui:NavigationViewItem Content="Music" Name="music">
<ui:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE189;"/>
FoxTube/MainPage.xaml.cs
+31
View File
@@ -1,5 +1,6 @@
using FoxTube.Core.Helpers;
using FoxTube.Core.Models;
using Google.Apis.YouTube.v3.Data;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -235,5 +236,35 @@ namespace FoxTube
break;
}
}
public void Update()
{
if(UsersControl.Authorized)
{
for (int i = NavigationViewControl.MenuItems.IndexOf(subscriptions); i < NavigationViewControl.MenuItems.IndexOf(categoriesHeader); i++)
(NavigationViewControl.MenuItems[i] as FrameworkElement).Visibility = Visibility.Visible;
for (int i = NavigationViewControl.MenuItems.IndexOf(categoriesHeader); i < NavigationViewControl.MenuItems.Count; i++)
(NavigationViewControl.MenuItems[i] as FrameworkElement).Visibility = Visibility.Collapsed;
foreach (Subscription i in UsersControl.CurrentUser.Subscriptions)
NavigationViewControl.MenuItems.Insert(NavigationViewControl.MenuItems.IndexOf(categoriesHeader), i);
}
else
{
IEnumerable<object> subs = from i in NavigationViewControl.MenuItems
where string.IsNullOrWhiteSpace((i as FrameworkElement).Name)
select i;
foreach (object i in subs)
NavigationViewControl.MenuItems.Remove(i);
for (int i = NavigationViewControl.MenuItems.IndexOf(subscriptions); i < NavigationViewControl.MenuItems.IndexOf(categoriesHeader); i++)
(NavigationViewControl.MenuItems[i] as FrameworkElement).Visibility = Visibility.Collapsed;
for (int i = NavigationViewControl.MenuItems.IndexOf(categoriesHeader); i < NavigationViewControl.MenuItems.Count; i++)
(NavigationViewControl.MenuItems[i] as FrameworkElement).Visibility = Visibility.Visible;
}
}
}
}