mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-22 10:04:44 +01:00
fixes #941 - Rework password recovery and remove IsLocal checks
This commit is contained in:
@@ -6,10 +6,6 @@ namespace MediaBrowser.Model.Drawing
|
||||
/// </summary>
|
||||
public enum ImageOutputFormat
|
||||
{
|
||||
/// <summary>
|
||||
/// The original
|
||||
/// </summary>
|
||||
Original,
|
||||
/// <summary>
|
||||
/// The BMP
|
||||
/// </summary>
|
||||
@@ -26,6 +22,9 @@ namespace MediaBrowser.Model.Drawing
|
||||
/// The PNG
|
||||
/// </summary>
|
||||
Png,
|
||||
/// <summary>
|
||||
/// The webp
|
||||
/// </summary>
|
||||
Webp
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using MediaBrowser.Model.Drawing;
|
||||
using MediaBrowser.Model.Entities;
|
||||
using System;
|
||||
|
||||
namespace MediaBrowser.Model.Dto
|
||||
{
|
||||
@@ -74,7 +73,7 @@ namespace MediaBrowser.Model.Dto
|
||||
/// Gets or sets the format.
|
||||
/// </summary>
|
||||
/// <value>The format.</value>
|
||||
public ImageOutputFormat Format { get; set; }
|
||||
public ImageOutputFormat? Format { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether [add played indicator].
|
||||
@@ -100,8 +99,6 @@ namespace MediaBrowser.Model.Dto
|
||||
public ImageOptions()
|
||||
{
|
||||
EnableImageEnhancers = true;
|
||||
|
||||
Format = ImageOutputFormat.Original;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -407,6 +407,9 @@
|
||||
<Compile Include="Updates\PackageInfo.cs" />
|
||||
<Compile Include="Updates\PackageVersionInfo.cs" />
|
||||
<Compile Include="Users\AuthenticationResult.cs" />
|
||||
<Compile Include="Users\ForgotPasswordAction.cs" />
|
||||
<Compile Include="Users\ForgotPasswordResult.cs" />
|
||||
<Compile Include="Users\PinRedeemResult.cs" />
|
||||
<None Include="Fody.targets" />
|
||||
<None Include="FodyWeavers.xml" />
|
||||
<None Include="MediaBrowser.Model.snk" />
|
||||
|
||||
10
MediaBrowser.Model/Users/ForgotPasswordAction.cs
Normal file
10
MediaBrowser.Model/Users/ForgotPasswordAction.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
|
||||
namespace MediaBrowser.Model.Users
|
||||
{
|
||||
public enum ForgotPasswordAction
|
||||
{
|
||||
ContactAdmin = 0,
|
||||
PinCode = 1,
|
||||
InNetworkRequired = 2
|
||||
}
|
||||
}
|
||||
23
MediaBrowser.Model/Users/ForgotPasswordResult.cs
Normal file
23
MediaBrowser.Model/Users/ForgotPasswordResult.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using System;
|
||||
|
||||
namespace MediaBrowser.Model.Users
|
||||
{
|
||||
public class ForgotPasswordResult
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the action.
|
||||
/// </summary>
|
||||
/// <value>The action.</value>
|
||||
public ForgotPasswordAction Action { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the pin file.
|
||||
/// </summary>
|
||||
/// <value>The pin file.</value>
|
||||
public string PinFile { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the pin expiration date.
|
||||
/// </summary>
|
||||
/// <value>The pin expiration date.</value>
|
||||
public DateTime? PinExpirationDate { get; set; }
|
||||
}
|
||||
}
|
||||
17
MediaBrowser.Model/Users/PinRedeemResult.cs
Normal file
17
MediaBrowser.Model/Users/PinRedeemResult.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
|
||||
namespace MediaBrowser.Model.Users
|
||||
{
|
||||
public class PinRedeemResult
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether this <see cref="PinRedeemResult"/> is success.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if success; otherwise, <c>false</c>.</value>
|
||||
public bool Success { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the users reset.
|
||||
/// </summary>
|
||||
/// <value>The users reset.</value>
|
||||
public string[] UsersReset { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user