Your ROOT_URL in app.ini is https://git.cloudchain.link/ but you are visiting https://dash.bss.nz/open-source-mirrors/jellyfin/commit/98012480f70cdfa918bbea1ae975d6f7cb8c7f67?style=split&whitespace=ignore-change
You should set ROOT_URL correctly, otherwise the web may not work correctly.
5 changed files with
45 additions and
3 deletions
@ -125,7 +125,7 @@ namespace MediaBrowser.Api
return ResultFactory . GetStaticFileResult ( Request , path ) ;
return ResultFactory . GetStaticFileResult ( Request , path ) ;
}
}
private readonly char [ ] _dashReplaceChars = new [ ] { '?' , '/' } ;
private readonly char [ ] _dashReplaceChars = { '?' , '/' } ;
private const char SlugChar = '-' ;
private const char SlugChar = '-' ;
protected MusicArtist GetArtist ( string name , ILibraryManager libraryManager )
protected MusicArtist GetArtist ( string name , ILibraryManager libraryManager )
@ -168,6 +168,11 @@ namespace MediaBrowser.Api
{
{
var user = userManager . GetUserById ( userId . Value ) ;
var user = userManager . GetUserById ( userId . Value ) ;
if ( user = = null )
{
throw new ArgumentException ( "User not found" ) ;
}
return folder . GetRecursiveChildren ( user ) ;
return folder . GetRecursiveChildren ( user ) ;
}
}
@ -177,6 +182,11 @@ namespace MediaBrowser.Api
{
{
var user = userManager . GetUserById ( userId . Value ) ;
var user = userManager . GetUserById ( userId . Value ) ;
if ( user = = null )
{
throw new ArgumentException ( "User not found" ) ;
}
return userManager . GetUserById ( userId . Value ) . RootFolder . GetRecursiveChildren ( user ) ;
return userManager . GetUserById ( userId . Value ) . RootFolder . GetRecursiveChildren ( user ) ;
}
}
@ -357,6 +357,23 @@ namespace MediaBrowser.Api
{
{
var auth = AuthorizationContext . GetAuthorizationInfo ( Request ) ;
var auth = AuthorizationContext . GetAuthorizationInfo ( Request ) ;
if ( string . IsNullOrWhiteSpace ( auth . Client ) )
{
auth . Client = "Unknown app" ;
}
if ( string . IsNullOrWhiteSpace ( auth . Device ) )
{
auth . Device = "Unknown device" ;
}
if ( string . IsNullOrWhiteSpace ( auth . Version ) )
{
auth . Version = "Unknown version" ;
}
if ( string . IsNullOrWhiteSpace ( auth . DeviceId ) )
{
auth . DeviceId = "Unknown device id" ;
}
var result = _sessionMananger . AuthenticateNewSession ( request . Username , request . Password , auth . Client , auth . Version ,
var result = _sessionMananger . AuthenticateNewSession ( request . Username , request . Password , auth . Client , auth . Version ,
auth . DeviceId , auth . Device , Request . RemoteIp , Request . IsLocal ) . Result ;
auth . DeviceId , auth . Device , Request . RemoteIp , Request . IsLocal ) . Result ;
@ -21,12 +21,13 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// <summary>
/// Class Folder
/// Class Folder
/// </summary>
/// </summary>
public class Folder : BaseItem , IHasThemeMedia
public class Folder : BaseItem , IHasThemeMedia , IHasTags
{
{
public static IUserManager UserManager { get ; set ; }
public static IUserManager UserManager { get ; set ; }
public List < Guid > ThemeSongIds { get ; set ; }
public List < Guid > ThemeSongIds { get ; set ; }
public List < Guid > ThemeVideoIds { get ; set ; }
public List < Guid > ThemeVideoIds { get ; set ; }
public List < string > Tags { get ; set ; }
public Folder ( )
public Folder ( )
{
{
@ -34,6 +35,7 @@ namespace MediaBrowser.Controller.Entities
ThemeSongIds = new List < Guid > ( ) ;
ThemeSongIds = new List < Guid > ( ) ;
ThemeVideoIds = new List < Guid > ( ) ;
ThemeVideoIds = new List < Guid > ( ) ;
Tags = new List < string > ( ) ;
}
}
/// <summary>
/// <summary>
@ -7,8 +7,15 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// <summary>
/// Class Studio
/// Class Studio
/// </summary>
/// </summary>
public class Studio : BaseItem , IItemByName
public class Studio : BaseItem , IItemByName , IHasTags
{
{
public List < string > Tags { get ; set ; }
public Studio ( )
{
Tags = new List < string > ( ) ;
}
/// <summary>
/// <summary>
/// Gets the user data key.
/// Gets the user data key.
/// </summary>
/// </summary>
@ -66,6 +66,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
? null
? null
: UserManager . GetUserById ( new Guid ( auth . UserId ) ) ;
: UserManager . GetUserById ( new Guid ( auth . UserId ) ) ;
if ( user = = null & ! string . IsNullOrWhiteSpace ( auth . UserId ) )
{
// TODO: Re-enable
//throw new ArgumentException("User with Id " + auth.UserId + " not found");
}
if ( user ! = null & & user . Configuration . IsDisabled )
if ( user ! = null & & user . Configuration . IsDisabled )
{
{
throw new UnauthorizedAccessException ( "User account has been disabled." ) ;
throw new UnauthorizedAccessException ( "User account has been disabled." ) ;