add new wrapper class for shortkey handlings and add new shortkeys

2021-05-27 22:55:56 +02:00
62 changed files with 2935 additions and 2556 deletions
--- a/apiGo/api/API.go
+++ b/apiGo/api/API.go
@ -1,48 +0,0 @@
-package api
-
-import (
-	gws "github.com/gowebsecure/goWebSecure-go"
-	"github.com/gowebsecure/goWebSecure-go/oauth"
-	"openmediacenter/apiGo/database/settings"
-)
-
-const (
-	VideoNode    = iota
-	TagNode      = iota
-	SettingsNode = iota
-	ActorNode    = iota
-	TVShowNode   = iota
-)
-
-func Init() {
-	AddVideoHandlers()
-	AddSettingsHandlers()
-	AddTagHandlers()
-	AddActorsHandlers()
-	AddTvshowHandlers()
-
-	gws.AddAPINode("video", VideoNode, true)
-	gws.AddAPINode("tags", TagNode, true)
-	gws.AddAPINode("settings", SettingsNode, true)
-	gws.AddAPINode("actor", ActorNode, true)
-	gws.AddAPINode("tvshow", TVShowNode, true)
-
-	// serverinit is blocking
-	gws.ServerInit(func(id string) (oauth.CustomClientInfo, error) {
-		password := settings.GetPassword()
-		// if password not set assign default password
-		if password == nil {
-			defaultpassword := "openmediacenter"
-			password = &defaultpassword
-		}
-
-		clientinfo := oauth.CustomClientInfo{
-			ID:     "openmediacenter",
-			Secret: *password,
-			Domain: "http://localhost:8081",
-			UserID: "openmediacenter",
-		}
-
-		return clientinfo, nil
-	}, 8080)
-}
--- a/apiGo/api/Actors.go
+++ b/apiGo/api/Actors.go
@ -2,7 +2,6 @@ package api

 import (
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
 	"openmediacenter/apiGo/api/types"
 	"openmediacenter/apiGo/database"
 )
@ -24,7 +23,7 @@ func getActorsFromDB() {
 	 * @apiSuccess {string} .Name Actor Name
 	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 	 */
-	gws.AddHandler("getAllActors", ActorNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getAllActors", ActorNode, func(info *HandlerInfo) []byte {
 		query := "SELECT actor_id, name, thumbnail FROM actors"
 		return jsonify(readActorsFromResultset(database.Query(query)))
 	})
@ -42,7 +41,7 @@ func getActorsFromDB() {
 	 * @apiSuccess {string} .Name Actor Name
 	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 	 */
-	gws.AddHandler("getActorsOfVideo", ActorNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getActorsOfVideo", ActorNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			MovieId int
 		}
@ -75,7 +74,7 @@ func getActorsFromDB() {
 	 * @apiSuccess {string} Info.Name Actor Name
 	 * @apiSuccess {string} Info.Thumbnail Actor Thumbnail
 	 */
-	gws.AddHandler("getActorInfo", ActorNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getActorInfo", ActorNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			ActorId int
 		}
@ -115,7 +114,7 @@ func saveActorsToDB() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("createActor", ActorNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("createActor", ActorNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			ActorName string
 		}
@ -139,7 +138,7 @@ func saveActorsToDB() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("addActorToVideo", ActorNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("addActorToVideo", ActorNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			ActorId int
 			MovieId int
--- a/apiGo/api/ApiBase.go
+++ b/apiGo/api/ApiBase.go
@ -0,0 +1,113 @@
+package api
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"gopkg.in/oauth2.v3"
+	"net/http"
+	"openmediacenter/apiGo/api/oauth"
+)
+
+const APIPREFIX = "/api"
+
+const (
+	VideoNode    = iota
+	TagNode      = iota
+	SettingsNode = iota
+	ActorNode    = iota
+	TVShowNode   = iota
+)
+
+type HandlerInfo struct {
+	ID    string
+	Token string
+	Data  map[string]interface{}
+}
+
+type actionStruct struct {
+	Action string
+}
+
+type Handler struct {
+	action  string
+	handler func(info *HandlerInfo) []byte
+	apiNode int
+}
+
+var handlers = make(map[string]Handler)
+
+func AddHandler(action string, apiNode int, h func(info *HandlerInfo) []byte) {
+	// append new handler to the handlers
+	handlers[fmt.Sprintf("%s/%d", action, apiNode)] = Handler{action, h, apiNode}
+}
+
+func ServerInit() {
+	http.Handle(APIPREFIX+"/video", oauth.ValidateToken(handlefunc, VideoNode))
+	http.Handle(APIPREFIX+"/tags", oauth.ValidateToken(handlefunc, TagNode))
+	http.Handle(APIPREFIX+"/settings", oauth.ValidateToken(handlefunc, SettingsNode))
+	http.Handle(APIPREFIX+"/actor", oauth.ValidateToken(handlefunc, ActorNode))
+	http.Handle(APIPREFIX+"/tvshow", oauth.ValidateToken(handlefunc, TVShowNode))
+
+	// initialize oauth service and add corresponding auth routes
+	oauth.InitOAuth()
+}
+
+func handleAPICall(action string, requestBody string, apiNode int, info *HandlerInfo) []byte {
+	handler, ok := handlers[fmt.Sprintf("%s/%d", action, apiNode)]
+	if !ok {
+		// handler doesn't exist!
+		fmt.Printf("no handler found for Action: %d/%s\n", apiNode, action)
+		return nil
+	}
+
+	// check if info even exists
+	if info == nil {
+		info = &HandlerInfo{}
+	}
+
+	// parse the arguments
+	var args map[string]interface{}
+	err := json.Unmarshal([]byte(requestBody), &args)
+
+	if err != nil {
+		fmt.Printf("failed to decode arguments of action %s :: %s\n", action, requestBody)
+	} else {
+		// check if map has an action
+		if _, ok := args["action"]; ok {
+			delete(args, "action")
+		}
+
+		info.Data = args
+	}
+
+	// call the handler
+	return handler.handler(info)
+}
+
+func handlefunc(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *oauth2.TokenInfo) {
+	// only allow post requests
+	if req.Method != "POST" {
+		return
+	}
+
+	buf := new(bytes.Buffer)
+	buf.ReadFrom(req.Body)
+	body := buf.String()
+
+	var t actionStruct
+	err := json.Unmarshal([]byte(body), &t)
+	if err != nil {
+		fmt.Println("failed to read action from request! :: " + body)
+	}
+
+	// load userid from received token object
+	id := (*tokenInfo).GetClientID()
+
+	userinfo := &HandlerInfo{
+		ID:    id,
+		Token: (*tokenInfo).GetCode(),
+	}
+
+	rw.Write(handleAPICall(t.Action, body, node, userinfo))
+}
--- a/apiGo/api/ApiBase_test.go
+++ b/apiGo/api/ApiBase_test.go
@ -0,0 +1,72 @@
+package api
+
+import (
+	"testing"
+)
+
+func cleanUp() {
+	handlers = make(map[string]Handler)
+}
+
+func TestAddHandler(t *testing.T) {
+	cleanUp()
+
+	AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
+		return nil
+	})
+	if len(handlers) != 1 {
+		t.Errorf("Handler insertion failed, got: %d handlers, want: %d.", len(handlers), 1)
+	}
+}
+
+func TestCallOfHandler(t *testing.T) {
+	cleanUp()
+
+	i := 0
+	AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
+		i++
+		return nil
+	})
+
+	// simulate the call of the api
+	handleAPICall("test", "", ActorNode, nil)
+
+	if i != 1 {
+		t.Errorf("Unexpected number of Lambda calls : %d/1", i)
+	}
+}
+
+func TestDecodingOfArguments(t *testing.T) {
+	cleanUp()
+
+	AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
+		var args struct {
+			Test    string
+			TestInt int
+		}
+		err := FillStruct(&args, info.Data)
+		if err != nil {
+			t.Errorf("Error parsing args: %s", err.Error())
+			return nil
+		}
+
+		if args.TestInt != 42 || args.Test != "myString" {
+			t.Errorf("Wrong parsing of argument parameters : %d/42 - %s/myString", args.TestInt, args.Test)
+		}
+
+		return nil
+	})
+
+	// simulate the call of the api
+	handleAPICall("test", `{"Test":"myString","TestInt":42}`, ActorNode, nil)
+}
+
+func TestNoHandlerCovers(t *testing.T) {
+	cleanUp()
+
+	ret := handleAPICall("test", "", ActorNode, nil)
+
+	if ret != nil {
+		t.Error("Expect nil return within unhandled api action")
+	}
+}
--- a/apiGo/api/Helpers.go
+++ b/apiGo/api/Helpers.go
@ -3,6 +3,7 @@ package api
 import (
 	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"openmediacenter/apiGo/api/types"
 	"reflect"
@ -108,7 +109,7 @@ func setField(obj interface{}, name string, value interface{}) error {
 			// if type is convertible - convert and set
 			structFieldValue.Set(val.Convert(structFieldType))
 		} else {
-			return fmt.Errorf("provided value %s type didn't match obj field type and isn't convertible", name)
+			return errors.New("provided value type didn't match obj field type and isn't convertible")
 		}
 	} else {
 		// set value if type is the same
--- a/apiGo/api/Settings.go
+++ b/apiGo/api/Settings.go
@ -3,7 +3,6 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
 	"openmediacenter/apiGo/api/types"
 	"openmediacenter/apiGo/database"
 	"openmediacenter/apiGo/database/settings"
@ -32,23 +31,15 @@ func getSettingsFromDB() {
 	 * @apiSuccess {string} Settings.Password new server password (-1 if no password set)
 	 * @apiSuccess {bool} Settings.TMDBGrabbing TMDB grabbing support to grab tag info and thumbnails
 	 * @apiSuccess {bool} Settings.DarkMode Darkmode enabled?
-	 * @apiSuccess {Object} Sizes Sizes object
-	 * @apiSuccess {uint32} Sizes.VideoNr total number of videos
-	 * @apiSuccess {float32} Sizes.DBSize total size of database
-	 * @apiSuccess {uint32} Sizes.DifferentTags number of different tags available
-	 * @apiSuccess {uint32} Sizes.TagsAdded number of different tags added to videos
+	 * @apiSuccess {uint32} Settings.VideoNr total number of videos
+	 * @apiSuccess {float32} Settings.DBSize total size of database
+	 * @apiSuccess {uint32} Settings.DifferentTags number of different tags available
+	 * @apiSuccess {uint32} Settings.TagsAdded number of different tags added to videos
+	 * @apiSuccess {string} Settings.PathPrefix
 	 */
-	gws.AddHandler("loadGeneralSettings", SettingsNode, func(info *gws.HandlerInfo) []byte {
-		result, _, sizes := database.GetSettings()
-
-		var ret = struct {
-			Settings *types.SettingsType
-			Sizes    *types.SettingsSizeType
-		}{
-			Settings: &result,
-			Sizes:    &sizes,
-		}
-		return jsonify(ret)
+	AddHandler("loadGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
+		result := database.GetSettings()
+		return jsonify(result)
 	})

 	/**
@ -62,9 +53,8 @@ func getSettingsFromDB() {
 	 * @apiSuccess {string} MediacenterName overall name of the mediacenter
 	 * @apiSuccess {string} Pasword new server password (-1 if no password set)
 	 * @apiSuccess {bool} DarkMode Darkmode enabled?
-	 * @apiSuccess {bool} TVShowEnabled is are TVShows enabled
 	 */
-	gws.AddHandler("loadInitialData", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("loadInitialData", SettingsNode, func(info *HandlerInfo) []byte {
 		sett := settings.LoadSettings()

 		type InitialDataTypeResponse struct {
@ -73,7 +63,6 @@ func getSettingsFromDB() {
 			MediacenterName string
 			VideoPath       string
 			TVShowPath      string
-			TVShowEnabled   bool
 		}

 		regexMatchUrl := regexp.MustCompile("^http(|s)://([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}:[0-9]{1,5}")
@ -88,7 +77,6 @@ func getSettingsFromDB() {
 			MediacenterName: sett.MediacenterName,
 			VideoPath:       serverVideoPath,
 			TVShowPath:      serverTVShowPath,
-			TVShowEnabled:   settings.TVShowsEnabled(),
 		}

 		str, _ := json.Marshal(res)
@ -103,17 +91,21 @@ func saveSettingsToDB() {
 	 * @apiName saveGeneralSettings
 	 * @apiGroup Settings
 	 *
-	 * @apiParam {string} VideoPath webserver path to the videos
-	 * @apiParam {string} EpisodePath webserver path to the tvshows
-	 * @apiParam {string} MediacenterName overall name of the mediacenter
-	 * @apiParam {string} Password new server password (-1 if no password set)
-	 * @apiParam {bool} TMDBGrabbing TMDB grabbing support to grab tag info and thumbnails
-	 * @apiParam {bool} DarkMode Darkmode enabled?
+	 * @apiParam {Object} Settings Settings object
+	 * @apiParam {string} Settings.VideoPath webserver path to the videos
+	 * @apiParam {string} Settings.EpisodePath webserver path to the tvshows
+	 * @apiParam {string} Settings.MediacenterName overall name of the mediacenter
+	 * @apiParam {string} Settings.Password new server password (-1 if no password set)
+	 * @apiParam {bool} Settings.TMDBGrabbing TMDB grabbing support to grab tag info and thumbnails
+	 * @apiParam {bool} Settings.DarkMode Darkmode enabled?
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("saveGeneralSettings", SettingsNode, func(info *gws.HandlerInfo) []byte {
-		var args types.SettingsType
+	AddHandler("saveGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
+		// todo correct type here!
+		var args struct {
+			Settings types.SettingsType
+		}
 		if err := FillStruct(&args, info.Data); err != nil {
 			fmt.Println(err.Error())
 			return nil
@ -129,8 +121,8 @@ func saveSettingsToDB() {
                        DarkMode=?
                    WHERE 1`
 		return database.SuccessQuery(query,
-			args.VideoPath, args.EpisodePath, args.Password,
-			args.MediacenterName, args.TMDBGrabbing, args.DarkMode)
+			args.Settings.VideoPath, args.Settings.EpisodePath, args.Settings.Password,
+			args.Settings.MediacenterName, args.Settings.TMDBGrabbing, args.Settings.DarkMode)
 	})
 }

@ -144,7 +136,7 @@ func reIndexHandling() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("startReindex", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("startReindex", SettingsNode, func(info *HandlerInfo) []byte {
 		videoparser.StartReindex()
 		return database.ManualSuccessResponse(nil)
 	})
@ -157,7 +149,7 @@ func reIndexHandling() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("startTVShowReindex", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("startTVShowReindex", SettingsNode, func(info *HandlerInfo) []byte {
 		videoparser.StartTVShowReindex()
 		return database.ManualSuccessResponse(nil)
 	})
@ -168,7 +160,7 @@ func reIndexHandling() {
 	 * @apiName cleanupGravity
 	 * @apiGroup Settings
 	 */
-	gws.AddHandler("cleanupGravity", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("cleanupGravity", SettingsNode, func(info *HandlerInfo) []byte {
 		videoparser.StartCleanup()
 		return nil
 	})
--- a/apiGo/api/TVShows.go
+++ b/apiGo/api/TVShows.go
@ -2,17 +2,10 @@ package api

 import (
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
 	"openmediacenter/apiGo/database"
-	"openmediacenter/apiGo/database/settings"
 )

 func AddTvshowHandlers() {
-	// do not add handlers if tvshows not enabled
-	if !settings.TVShowsEnabled() {
-		return
-	}
-
 	/**
 	 * @api {post} /api/tvshow [getTVShows]
 	 * @apiDescription get all available tv shows
@ -23,7 +16,7 @@ func AddTvshowHandlers() {
 	 * @apiSuccess {uint32} .Id tvshow id
 	 * @apiSuccess {string} .Name tvshow name
 	 */
-	gws.AddHandler("getTVShows", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getTVShows", TVShowNode, func(info *HandlerInfo) []byte {
 		query := "SELECT id, name FROM tvshow"
 		rows := database.Query(query)
 		return jsonify(readTVshowsFromResultset(rows))
@ -43,7 +36,7 @@ func AddTvshowHandlers() {
 	 * @apiSuccess {uint8} .Season Season number
 	 * @apiSuccess {uint8} .Episode Episode number
 	 */
-	gws.AddHandler("getEpisodes", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getEpisodes", TVShowNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			ShowID uint32
 		}
@ -91,7 +84,7 @@ func AddTvshowHandlers() {
 	 * @apiSuccess {uint8} Episode Episode number
 	 * @apiSuccess {string} Path webserver path of video file
 	 */
-	gws.AddHandler("loadEpisode", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("loadEpisode", TVShowNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			ID uint32
 		}
@ -138,7 +131,7 @@ WHERE tvshow_episodes.id=%d`, args.ID)
 	 *
 	 * @apiSuccess {string} . Base64 encoded Thubnail
 	 */
-	gws.AddHandler("readThumbnail", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("readThumbnail", TVShowNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			Id int
 		}
--- a/apiGo/api/Tags.go
+++ b/apiGo/api/Tags.go
@ -2,7 +2,6 @@ package api

 import (
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
 	"openmediacenter/apiGo/database"
 	"regexp"
 )
@ -25,7 +24,7 @@ func deleteFromDB() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("deleteTag", TagNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("deleteTag", TagNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			TagId int
 			Force bool
@ -75,7 +74,7 @@ func getFromDB() {
 	 * @apiSuccess {uint32} TagId
 	 * @apiSuccess {string} TagName name of the Tag
 	 */
-	gws.AddHandler("getAllTags", TagNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getAllTags", TagNode, func(info *HandlerInfo) []byte {
 		query := "SELECT tag_id,tag_name from tags"
 		return jsonify(readTagsFromResultset(database.Query(query)))
 	})
@ -92,7 +91,7 @@ func addToDB() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("createTag", TagNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("createTag", TagNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			TagName string
 		}
@ -116,7 +115,7 @@ func addToDB() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("addTag", TagNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("addTag", TagNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			MovieId int
 			TagId   int
--- a/apiGo/api/Video.go
+++ b/apiGo/api/Video.go
@ -3,7 +3,6 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
 	"net/url"
 	"openmediacenter/apiGo/api/types"
 	"openmediacenter/apiGo/database"
@ -23,89 +22,34 @@ func getVideoHandlers() {
 	 * @apiName GetMovies
 	 * @apiGroup video
 	 *
-	 * @apiParam {int} [Tag=1] id of VideoTag to get videos (1=all)
+	 * @apiParam {int} [Tag=all] id of VideoTag to get videos
 	 *
-	 * @apiSuccess {Object[]} Videos List of Videos
-	 * @apiSuccess {number} Videos.MovieId Id of Video
-	 * @apiSuccess {String} Videos.MovieName  Name of video
-	 * @apiSuccess {String} TagName Name of the Tag returned
+	 * @apiSuccess {Object[]} . List of Videos
+	 * @apiSuccess {number} .MovieId Id of Video
+	 * @apiSuccess {String} .MovieName  Name of video
 	 */
-	gws.AddHandler("getMovies", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getMovies", VideoNode, func(info *HandlerInfo) []byte {
 		var args struct {
-			Tag  uint32
-			Sort uint8
+			Tag int
 		}
 		if err := FillStruct(&args, info.Data); err != nil {
 			fmt.Println(err.Error())
 			return nil
 		}

-		const (
-			date   = iota
-			likes  = iota
-			random = iota
-			names  = iota
-			length = iota
-		)
-
-		// if wrong number passed no sorting is performed
-		var SortClause = ""
-		switch args.Sort {
-		case date:
-			SortClause = "ORDER BY create_date DESC, movie_name"
-			break
-		case likes:
-			SortClause = "ORDER BY likes DESC"
-			break
-		case random:
-			SortClause = "ORDER BY RAND()"
-			break
-		case names:
-			SortClause = "ORDER BY movie_name"
-			break
-		case length:
-			SortClause = "ORDER BY length DESC"
-			break
-		}
-
 		var query string
 		// 1 is the id of the ALL tag
 		if args.Tag != 1 {
-			query = fmt.Sprintf(`SELECT movie_id,movie_name,t.tag_name FROM videos
+			query = fmt.Sprintf(`SELECT movie_id,movie_name FROM videos
 					INNER JOIN video_tags vt on videos.movie_id = vt.video_id
 					INNER JOIN tags t on vt.tag_id = t.tag_id
-					WHERE t.tag_id = %d %s`, args.Tag, SortClause)
+					WHERE t.tag_id = '%d'
+					ORDER BY likes DESC, create_date, movie_name`, args.Tag)
 		} else {
-			query = fmt.Sprintf("SELECT movie_id,movie_name, (SELECT 'All' as tag_name) FROM videos %s", SortClause)
+			query = "SELECT movie_id,movie_name FROM videos ORDER BY create_date DESC, movie_name"
 		}

-		var result struct {
-			Videos  []types.VideoUnloadedType
-			TagName string
-		}
-
-		rows := database.Query(query)
-		vids := []types.VideoUnloadedType{}
-		var name string
-		for rows.Next() {
-			var vid types.VideoUnloadedType
-			err := rows.Scan(&vid.MovieId, &vid.MovieName, &name)
-			if err != nil {
-				return nil
-			}
-			vids = append(vids, vid)
-		}
-		if rows.Close() != nil {
-			return nil
-		}
-
-		// if the tag id doesn't exist the query won't return a name
-		if name == "" {
-			return nil
-		}
-
-		result.Videos = vids
-		result.TagName = name
+		result := readVideosFromResultset(database.Query(query))
 		// jsonify results
 		str, _ := json.Marshal(result)
 		return str
@ -121,7 +65,7 @@ func getVideoHandlers() {
 	 *
 	 * @apiSuccess {string} . Base64 encoded Thubnail
 	 */
-	gws.AddHandler("readThumbnail", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("readThumbnail", VideoNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			Movieid int
 		}
@ -159,7 +103,7 @@ func getVideoHandlers() {
 	 * @apiSuccess {string} Videos.MovieName Video Name
 	 * @apiSuccess {int} Videos.MovieId Video ID
 	 */
-	gws.AddHandler("getRandomMovies", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getRandomMovies", VideoNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			Number int
 		}
@ -220,7 +164,7 @@ func getVideoHandlers() {
 	 * @apiSuccess {number} .MovieId Id of Video
 	 * @apiSuccess {String} .MovieName  Name of video
 	 */
-	gws.AddHandler("getSearchKeyWord", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getSearchKeyWord", VideoNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			KeyWord string
 		}
@ -272,7 +216,7 @@ func loadVideosHandlers() {
 	 * @apiSuccess {string} Actors.Name Actor Name
 	 * @apiSuccess {string} Actors.Thumbnail Portrait Thumbnail
 	 */
-	gws.AddHandler("loadVideo", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("loadVideo", VideoNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			MovieId int
 		}
@ -348,7 +292,7 @@ func loadVideosHandlers() {
 	 * @apiSuccess {uint32} DifferentTags number of different Tags available
 	 * @apiSuccess {uint32} Tagged number of different Tags assigned
 	 */
-	gws.AddHandler("getStartData", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("getStartData", VideoNode, func(info *HandlerInfo) []byte {
 		var result types.StartData
 		// query settings and infotile values
 		query := `
@ -399,7 +343,7 @@ func addToVideoHandlers() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("addLike", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("addLike", VideoNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			MovieId int
 		}
@ -422,7 +366,7 @@ func addToVideoHandlers() {
 	 *
 	 * @apiSuccess {string} result 'success' if successfully or error message if not
 	 */
-	gws.AddHandler("deleteVideo", VideoNode, func(info *gws.HandlerInfo) []byte {
+	AddHandler("deleteVideo", VideoNode, func(info *HandlerInfo) []byte {
 		var args struct {
 			MovieId int
 		}
--- a/apiGo/api/oauth/CustomClientStore.go
+++ b/apiGo/api/oauth/CustomClientStore.go
@ -0,0 +1,57 @@
+package oauth
+
+import (
+	"gopkg.in/oauth2.v3"
+	"openmediacenter/apiGo/database/settings"
+)
+
+type CustomClientStore struct {
+	oauth2.ClientStore
+}
+
+type CustomClientInfo struct {
+	oauth2.ClientInfo
+	ID     string
+	Secret string
+	Domain string
+	UserID string
+}
+
+func NewCustomStore() oauth2.ClientStore {
+	s := new(CustomClientStore)
+	return s
+}
+
+func (a *CustomClientStore) GetByID(id string) (oauth2.ClientInfo, error) {
+	password := settings.GetPassword()
+	// if password not set assign default password
+	if password == nil {
+		defaultpassword := "openmediacenter"
+		password = &defaultpassword
+	}
+
+	clientinfo := CustomClientInfo{
+		ID:     "openmediacenter",
+		Secret: *password,
+		Domain: "http://localhost:8081",
+		UserID: "openmediacenter",
+	}
+
+	return &clientinfo, nil
+}
+
+func (a *CustomClientInfo) GetID() string {
+	return a.ID
+}
+
+func (a *CustomClientInfo) GetSecret() string {
+	return a.Secret
+}
+
+func (a *CustomClientInfo) GetDomain() string {
+	return a.Domain
+}
+
+func (a *CustomClientInfo) GetUserID() string {
+	return a.UserID
+}
--- a/apiGo/api/oauth/Oauth.go
+++ b/apiGo/api/oauth/Oauth.go
@ -0,0 +1,62 @@
+package oauth
+
+import (
+	"gopkg.in/oauth2.v3"
+	"gopkg.in/oauth2.v3/errors"
+	"gopkg.in/oauth2.v3/manage"
+	"gopkg.in/oauth2.v3/server"
+	"gopkg.in/oauth2.v3/store"
+	"log"
+	"net/http"
+)
+
+var srv *server.Server
+
+func InitOAuth() {
+	manager := manage.NewDefaultManager()
+	// token store
+	manager.MustTokenStorage(store.NewMemoryTokenStore())
+
+	// create new secretstore
+	clientStore := NewCustomStore()
+	manager.MapClientStorage(clientStore)
+
+	srv = server.NewServer(server.NewConfig(), manager)
+	srv.SetClientInfoHandler(server.ClientFormHandler)
+	manager.SetRefreshTokenCfg(manage.DefaultRefreshTokenCfg)
+
+	srv.SetInternalErrorHandler(func(err error) (re *errors.Response) {
+		log.Println("Internal Error:", err.Error())
+		return
+	})
+
+	srv.SetResponseErrorHandler(func(re *errors.Response) {
+		log.Println("Response Error:", re.Error.Error())
+	})
+
+	http.HandleFunc("/authorize", func(w http.ResponseWriter, r *http.Request) {
+		err := srv.HandleAuthorizeRequest(w, r)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+		}
+	})
+
+	http.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
+		err := srv.HandleTokenRequest(w, r)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
+	})
+}
+
+func ValidateToken(f func(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *oauth2.TokenInfo), node int) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		tokeninfo, err := srv.ValidationBearerToken(r)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		f(w, r, node, &tokeninfo)
+	}
+}
--- a/apiGo/api/types/Types.go
+++ b/apiGo/api/types/Types.go
@ -46,13 +46,13 @@ type SettingsType struct {
 	PasswordEnabled bool
 	TMDBGrabbing    bool
 	DarkMode        bool
-}

-type SettingsSizeType struct {
 	VideoNr       uint32
 	DBSize        float32
 	DifferentTags uint32
 	TagsAdded     uint32
+
+	PathPrefix string
 }

 type TVShow struct {
--- a/apiGo/database/Database.go
+++ b/apiGo/database/Database.go
@ -90,7 +90,9 @@ func Close() {
 	db.Close()
 }

-func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.SettingsSizeType) {
+func GetSettings() types.SettingsType {
+	var result types.SettingsType
+
 	// query settings and infotile values
 	query := fmt.Sprintf(`
                SELECT (
@ -118,7 +120,7 @@ func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.Se
 	var DarkMode int
 	var TMDBGrabbing int

-	err := QueryRow(query).Scan(&sizes.VideoNr, &sizes.DBSize, &sizes.DifferentTags, &sizes.TagsAdded,
+	err := QueryRow(query).Scan(&result.VideoNr, &result.DBSize, &result.DifferentTags, &result.TagsAdded,
 		&result.VideoPath, &result.EpisodePath, &result.Password, &result.MediacenterName, &TMDBGrabbing, &DarkMode)

 	if err != nil {
@ -128,6 +130,7 @@ func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.Se
 	result.TMDBGrabbing = TMDBGrabbing != 0
 	result.PasswordEnabled = result.Password != "-1"
 	result.DarkMode = DarkMode != 0
-	PathPrefix = SettingsVideoPrefix
-	return
+	result.PathPrefix = SettingsVideoPrefix
+
+	return result
 }
--- a/apiGo/database/settings/Settings.go
+++ b/apiGo/database/settings/Settings.go
@ -1,11 +0,0 @@
-package settings
-
-var tvShowEnabled bool
-
-func TVShowsEnabled() bool {
-	return tvShowEnabled
-}
-
-func SetTVShowEnabled(enabled bool) {
-	tvShowEnabled = enabled
-}
--- a/apiGo/go.mod
+++ b/apiGo/go.mod
@ -4,6 +4,6 @@ go 1.16

 require (
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gowebsecure/goWebSecure-go v0.1.0-beta.1
+	gopkg.in/oauth2.v3 v3.12.0
 	nhooyr.io/websocket v1.8.7
 )
--- a/apiGo/go.sum
+++ b/apiGo/go.sum
@ -1,90 +1,58 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
-github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-session/session v3.1.2+incompatible/go.mod h1:8B3iivBQjrz/JtC68Np2T1yBBLxTan3mn/3OM0CyRt0=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gowebsecure/goWebSecure-go v0.1.0-beta.1 h1:lMaNWyk5udtOAc8U+mUo2FTgNqRwT+Aj5mxDfP5qtx0=
-github.com/gowebsecure/goWebSecure-go v0.1.0-beta.1/go.mod h1:uEM+/1LS6hSBby7VKx2cHZ9btvQ/LC4K3HWKgqDRPs0=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0 h1:QnyrPZZvPmR0AtJCxxfCtI1qN+fYpKTKJ/5opWmZ34k=
 github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
@ -102,26 +70,16 @@ github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e h1:+NL1GDIUOKxVfbp2K
 github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao=
 github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 h1:Otn9S136ELckZ3KKDyCkxapfufrqDqwmGjcHfAyXRrE=
 github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.6.0 h1:uWF8lgKmeaIewWVPwi4GRq2P6+R46IgYZdxWtM+GtEY=
 github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=
 github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
-github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
-github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@ -129,7 +87,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -137,14 +94,12 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@ -154,7 +109,6 @@ gopkg.in/oauth2.v3 v3.12.0/go.mod h1:XEYgKqWX095YiPT+Aw5y3tCn+7/FMnlTFKrupgSiJ3I
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
--- a/apiGo/main.go
+++ b/apiGo/main.go
@ -7,7 +7,6 @@ import (
 	"net/http"
 	"openmediacenter/apiGo/api"
 	"openmediacenter/apiGo/database"
-	settings2 "openmediacenter/apiGo/database/settings"
 	"openmediacenter/apiGo/static"
 	"openmediacenter/apiGo/videoparser"
 )
@ -28,12 +27,18 @@ func main() {
 	database.InitDB(db)
 	defer database.Close()

+	api.AddVideoHandlers()
+	api.AddSettingsHandlers()
+	api.AddTagHandlers()
+	api.AddActorsHandlers()
+	api.AddTvshowHandlers()
+
 	videoparser.SetupSettingsWebsocket()

 	// add the static files
 	static.ServeStaticFiles()

-	api.Init()
+	api.ServerInit()

 	fmt.Printf("OpenMediacenter server up and running on port %d\n", port)
 	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil))
@ -50,12 +55,8 @@ func handleCommandLineArguments() (*database.DatabaseConfig, bool, *string) {

 	pathPrefix := flag.String("ReindexPrefix", "/var/www/openmediacenter", "Prefix path for videos to reindex")

-	disableTVShowSupport := flag.Bool("DisableTVSupport", false, "Disable the TVShow support and pages")
-
 	flag.Parse()

-	settings2.SetTVShowEnabled(!*disableTVShowSupport)
-
 	return &database.DatabaseConfig{
 		DBHost:     *dbhostPtr,
 		DBPort:     *dbPortPtr,
--- a/apiGo/videoparser/VideoParser.go
+++ b/apiGo/videoparser/VideoParser.go
@ -19,9 +19,9 @@ func StartReindex() bool {
 	SendEvent("start")
 	AppendMessage("starting reindex..")

-	mSettings, PathPrefix, _ := database.GetSettings()
+	mSettings := database.GetSettings()
 	// add the path prefix to videopath
-	mSettings.VideoPath = PathPrefix + mSettings.VideoPath
+	mSettings.VideoPath = mSettings.PathPrefix + mSettings.VideoPath

 	// check if path even exists
 	if _, err := os.Stat(mSettings.VideoPath); os.IsNotExist(err) {
@ -64,9 +64,9 @@ func StartTVShowReindex() {
 	SendEvent("start")
 	AppendMessage("starting tvshow reindex...")

-	mSettings, PathPrefix, _ := database.GetSettings()
+	mSettings := database.GetSettings()
 	// add the path prefix to videopath
-	mSettings.EpisodePath = PathPrefix + mSettings.EpisodePath
+	mSettings.EpisodePath = mSettings.PathPrefix + mSettings.EpisodePath

 	// add slash suffix if not existing
 	if !strings.HasSuffix(mSettings.EpisodePath, "/") {
--- a/apiGo/videoparser/tmdb/TMDBApi.go
+++ b/apiGo/videoparser/tmdb/TMDBApi.go
@ -28,27 +28,27 @@ type TVShowTMDB struct {
 }

 type tmdbVidResult struct {
-	PosterPath       *string `json:"poster_path"`
-	Adult            bool    `json:"adult"`
-	Overview         string  `json:"overview"`
-	ReleaseDate      string  `json:"release_date"`
-	GenreIds         []int   `json:"genre_ids"`
-	Id               int     `json:"id"`
-	OriginalTitle    string  `json:"original_title"`
-	OriginalLanguage string  `json:"original_language"`
-	Title            string  `json:"title"`
-	BackdropPath     *string `json:"backdrop_path"`
-	Popularity       int     `json:"popularity"`
-	VoteCount        int     `json:"vote_count"`
-	Video            bool    `json:"video"`
-	VoteAverage      int     `json:"vote_average"`
+	PosterPath       string `json:"poster_path"`
+	Adult            bool   `json:"adult"`
+	Overview         string `json:"overview"`
+	ReleaseDate      string `json:"release_date"`
+	GenreIds         []int  `json:"genre_ids"`
+	Id               int    `json:"id"`
+	OriginalTitle    string `json:"original_title"`
+	OriginalLanguage string `json:"original_language"`
+	Title            string `json:"title"`
+	BackdropPath     string `json:"backdrop_path"`
+	Popularity       int    `json:"popularity"`
+	VoteCount        int    `json:"vote_count"`
+	Video            bool   `json:"video"`
+	VoteAverage      int    `json:"vote_average"`
 }

 type tmdbTvResult struct {
-	PosterPath       *string  `json:"poster_path"`
+	PosterPath       string   `json:"poster_path"`
 	Popularity       int      `json:"popularity"`
 	Id               int      `json:"id"`
-	BackdropPath     *string  `json:"backdrop_path"`
+	BackdropPath     string   `json:"backdrop_path"`
 	VoteAverage      int      `json:"vote_average"`
 	Overview         string   `json:"overview"`
 	FirstAirDate     string   `json:"first_air_date"`
@ -111,16 +111,10 @@ func SearchVideo(MovieName string, year int) *VideoTMDB {
 	// continue label
 cont:

-	var thumbnail = ""
-	if tmdbVid.PosterPath != nil {
-		pic := fetchPoster(*tmdbVid.PosterPath)
-		if pic != nil {
-			thumbnail = *pic
-		}
-	}
+	thumbnail := fetchPoster(tmdbVid.PosterPath)

 	result := VideoTMDB{
-		Thumbnail: thumbnail,
+		Thumbnail: *thumbnail,
 		Overview:  tmdbVid.Overview,
 		Title:     tmdbVid.Title,
 		GenreIds:  tmdbVid.GenreIds,
@ -161,11 +155,9 @@ func SearchTVShow(Name string) *TVShowTMDB {
 		GenreIds:  t.Results[0].GenreIds,
 	}

-	if t.Results[0].PosterPath != nil {
-		pic := fetchPoster(*t.Results[0].PosterPath)
-		if pic != nil {
-			res.Thumbnail = *pic
-		}
+	thumbnail := fetchPoster(t.Results[0].PosterPath)
+	if thumbnail != nil {
+		res.Thumbnail = *thumbnail
 	}

 	return &res
--- a/package.json
+++ b/package.json
@ -12,16 +12,14 @@
    "@fortawesome/free-regular-svg-icons": "^5.15.1",
    "@fortawesome/free-solid-svg-icons": "^5.15.1",
    "@fortawesome/react-fontawesome": "^0.1.13",
-    "bootstrap": "^5.0.2",
+    "bootstrap": "^4.5.3",
    "plyr-react": "^3.0.7",
    "react": "^17.0.1",
    "react-bootstrap": "^1.4.0",
    "react-dom": "^17.0.1",
    "react-router": "^5.2.0",
    "react-router-dom": "^5.2.0",
-    "typescript": "^4.3.5",
-    "gowebsecure": "0.1.1-beta.2",
-    "gowebsecure-react": "0.1.0-beta.3"
+    "typescript": "^4.1.3"
  },
  "scripts": {
    "start": "react-scripts start",
@ -40,7 +38,7 @@
      "text-summary"
    ]
  },
-  "proxy": "http://127.0.0.1:8080",
+  "proxy": "http://127.0.0.1:8081",
  "homepage": "/",
  "browserslist": {
    "production": [
@ -55,34 +53,34 @@
    ]
  },
  "devDependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/user-event": "^13.2.1",
-    "@types/jest": "^26.0.24",
-    "@types/node": "^16.4.7",
-    "@types/react": "^17.0.15",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-router": "5.1.16",
-    "@types/react-router-dom": "^5.1.8",
-    "@typescript-eslint/eslint-plugin": "^4.28.5",
-    "@typescript-eslint/parser": "^4.28.5",
-    "apidoc": "^0.28.1",
+    "@testing-library/jest-dom": "^5.11.6",
+    "@testing-library/react": "^11.2.2",
+    "@testing-library/user-event": "^12.6.0",
+    "@types/jest": "^26.0.19",
+    "@types/node": "^14.14.31",
+    "@types/react": "^17.0.2",
+    "@types/react-dom": "^17.0.1",
+    "@types/react-router": "5.1.12",
+    "@types/react-router-dom": "^5.1.6",
+    "@typescript-eslint/eslint-plugin": "^4.17.0",
+    "@typescript-eslint/parser": "^4.17.0",
    "enzyme": "^3.11.0",
    "enzyme-adapter-react-16": "^1.15.5",
-    "eslint": "^7.31.0",
+    "eslint": "^7.22.0",
    "eslint-config-prettier": "^8.1.0",
    "eslint-formatter-gitlab": "^2.2.0",
    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-jest": "^24.4.0",
+    "eslint-plugin-jest": "^24.3.1",
    "eslint-plugin-prettier": "^3.3.1",
    "eslint-plugin-react": "^7.22.0",
    "eslint-plugin-react-hooks": "^4.2.0",
    "jest-junit": "^12.0.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.2.1",
    "prettier-config": "^1.0.0",
-    "react-scripts": "4.0.3"
+    "react-scripts": "4.0.3",
+    "apidoc": "^0.28.1"
  },
-  "apidoc": {
+  "apidoc":{
    "name": "OpenMediaCenter",
    "description": "API Documentation of OpenMediaCenter",
    "title": "OpenMediaCenter Doc",
--- a/src/App.module.css
+++ b/src/App.module.css
@ -12,7 +12,6 @@
    margin-left: 20px;
    opacity: 0.6;
    text-transform: capitalize;
-    text-decoration: none;
 }

 .navitem:hover {
--- a/src/App.test.js
+++ b/src/App.test.js
@ -18,11 +18,6 @@ describe('<App/>', function () {
    it('are navlinks correct', function () {
        const wrapper = shallow(<App/>);
        wrapper.setState({password: false});
-        expect(wrapper.find('.navitem')).toHaveLength(4);
-
-        GlobalInfos.setTVShowsEnabled(true);
-
-        wrapper.instance().forceUpdate();
        expect(wrapper.find('.navitem')).toHaveLength(5);
    });

--- a/src/App.tsx
+++ b/src/App.tsx
@ -9,17 +9,18 @@ import style from './App.module.css';

 import SettingsPage from './pages/SettingsPage/SettingsPage';
 import CategoryPage from './pages/CategoryPage/CategoryPage';
+import {APINode, callAPI} from './utils/Api';

 import {BrowserRouter as Router, NavLink, Route, Switch} from 'react-router-dom';
 import Player from './pages/Player/Player';
 import ActorOverviewPage from './pages/ActorOverviewPage/ActorOverviewPage';
 import ActorPage from './pages/ActorPage/ActorPage';
-import {APINode, SettingsTypes} from './types/ApiTypes';
+import {SettingsTypes} from './types/ApiTypes';
 import AuthenticationPage from './pages/AuthenticationPage/AuthenticationPage';
 import TVShowPage from './pages/TVShowPage/TVShowPage';
 import TVPlayer from './pages/TVShowPage/TVPlayer';
-import {CookieTokenStore, token} from 'gowebsecure';
-import {callAPI} from 'gowebsecure';
+import {CookieTokenStore} from './utils/TokenStore/CookieTokenStore';
+import {token} from './utils/TokenHandler';

 interface state {
    password: boolean | null; // null if uninitialized - true if pwd needed false if not needed
@ -40,20 +41,15 @@ class App extends React.Component<{}, state> {
        if (token.apiTokenValid()) {
            pwdneeded = false;
        } else {
-            token.refreshAPIToken(
-                (err) => {
-                    if (err === 'invalid_client') {
-                        this.setState({password: true});
-                    } else if (err === '') {
-                        this.setState({password: false});
-                    } else {
-                        console.log('unimplemented token error: ' + err);
-                    }
-                },
-                true,
-                'openmediacenter',
-                '0'
-            );
+            token.refreshAPIToken((err) => {
+                if (err === 'invalid_client') {
+                    this.setState({password: true});
+                } else if (err === '') {
+                    this.setState({password: false});
+                } else {
+                    console.log('unimplemented token error: ' + err);
+                }
+            });
        }

        this.state = {
@ -90,8 +86,6 @@ class App extends React.Component<{}, state> {

            GlobalInfos.setVideoPaths(result.VideoPath, result.TVShowPath);

-            GlobalInfos.setTVShowsEnabled(result.TVShowEnabled);
-
            this.setState({
                mediacentername: result.MediacenterName
            });
@ -152,13 +146,9 @@ class App extends React.Component<{}, state> {
                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/categories'} activeStyle={{opacity: '0.85'}}>
                    Categories
                </NavLink>
-
-                {GlobalInfos.isTVShowEnabled() ? (
-                    <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/tvshows'} activeStyle={{opacity: '0.85'}}>
-                        TV Shows
-                    </NavLink>
-                ) : null}
-
+                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/tvshows'} activeStyle={{opacity: '0.85'}}>
+                    TV Shows
+                </NavLink>
                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/settings'} activeStyle={{opacity: '0.85'}}>
                    Settings
                </NavLink>
@ -178,31 +168,24 @@ class App extends React.Component<{}, state> {
                <Route path='/categories'>
                    <CategoryPage />
                </Route>
+                <Route path='/tvshows'>
+                    <TVShowPage />
+                </Route>
                <Route path='/settings'>
                    <SettingsPage />
                </Route>
                <Route exact path='/player/:id'>
                    <Player />
                </Route>
+                <Route exact path='/tvplayer/:id'>
+                    <TVPlayer />
+                </Route>
                <Route exact path='/actors'>
                    <ActorOverviewPage />
                </Route>
                <Route path='/actors/:id'>
                    <ActorPage />
                </Route>
-
-                {GlobalInfos.isTVShowEnabled() ? (
-                    <Route path='/tvshows'>
-                        <TVShowPage />
-                    </Route>
-                ) : null}
-
-                {GlobalInfos.isTVShowEnabled() ? (
-                    <Route exact path='/tvplayer/:id'>
-                        <TVPlayer />
-                    </Route>
-                ) : null}
-
                <Route path='/'>
                    <HomePage />
                </Route>
--- a/src/elements/DynamicContentContainer/DynamicContentContainer.tsx
+++ b/src/elements/DynamicContentContainer/DynamicContentContainer.tsx
@ -41,24 +41,18 @@ class DynamicContentContainer<T> extends React.Component<Props<T>, state<T>> {

    componentDidUpdate(prevProps: Props<T>): void {
        // when source props change force update!
-        if (
-            // diff the two arrays
-            this.props.data
-                .filter((x) => !prevProps.data.includes(x))
-                .concat(prevProps.data.filter((x) => !this.props.data.includes(x))).length !== 0
-        ) {
-            this.clean((): void => {
-                this.loadPreviewBlock(this.InitialLoadNR);
-            });
+        if (prevProps.data.length !== this.props.data.length) {
+            this.clean();
+            this.loadPreviewBlock(this.InitialLoadNR);
        }
    }

    /**
     * clear all elements rendered...
     */
-    clean(callback: () => void): void {
+    clean(): void {
        this.loadindex = 0;
-        this.setState({loadeditems: []}, callback);
+        this.setState({loadeditems: []});
    }

    render(): JSX.Element {
--- a/src/elements/KeyComponent.tsx
+++ b/src/elements/KeyComponent.tsx
@ -1,32 +0,0 @@
-import React from 'react';
-
-interface Props {
-    listenKey: string;
-    onKey: () => void;
-}
-
-export default class KeyComponent extends React.Component<Props> {
-    constructor(props: Props) {
-        super(props);
-
-        this.handler = this.handler.bind(this);
-    }
-
-    render(): JSX.Element {
-        return <>{this.props.children}</>;
-    }
-
-    componentDidMount(): void {
-        document.addEventListener('keyup', this.handler);
-    }
-
-    componentWillUnmount(): void {
-        document.removeEventListener('keyup', this.handler);
-    }
-
-    private handler(e: KeyboardEvent): void {
-        if (e.key === this.props.listenKey) {
-            this.props.onKey();
-        }
-    }
-}
--- a/src/elements/Popups/AddActorPopup/AddActorPopup.test.js
+++ b/src/elements/Popups/AddActorPopup/AddActorPopup.test.js
@ -1,7 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import AddActorPopup from './AddActorPopup';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../../utils/Api';

 describe('<AddActorPopup/>', function () {
    it('renders without crashing ', function () {
--- a/src/elements/Popups/AddActorPopup/AddActorPopup.tsx
+++ b/src/elements/Popups/AddActorPopup/AddActorPopup.tsx
@ -3,11 +3,10 @@ import React from 'react';
 import ActorTile from '../../ActorTile/ActorTile';
 import style from './AddActorPopup.module.css';
 import {NewActorPopupContent} from '../NewActorPopup/NewActorPopup';
+import {APINode, callAPI} from '../../../utils/Api';
 import {ActorType} from '../../../types/VideoTypes';
 import {GeneralSuccess} from '../../../types/GeneralTypes';
 import FilterButton from '../../FilterButton/FilterButton';
-import {callAPI} from 'gowebsecure';
-import {APINode} from '../../../types/ApiTypes';

 interface Props {
    onHide: () => void;
--- a/src/elements/Popups/AddTagPopup/AddTagPopup.tsx
+++ b/src/elements/Popups/AddTagPopup/AddTagPopup.tsx
@ -1,11 +1,10 @@
 import React from 'react';
 import Tag from '../../Tag/Tag';
 import PopupBase from '../PopupBase';
+import {APINode, callAPI} from '../../../utils/Api';
 import {TagType} from '../../../types/VideoTypes';
 import FilterButton from '../../FilterButton/FilterButton';
 import styles from './AddTagPopup.module.css';
-import {callAPI} from 'gowebsecure/lib/Api';
-import {APINode} from '../../../types/ApiTypes';

 interface Props {
    onHide: () => void;
--- a/src/elements/Popups/NewActorPopup/NewActorPopup.test.js
+++ b/src/elements/Popups/NewActorPopup/NewActorPopup.test.js
@ -3,7 +3,7 @@ import React from 'react';
 import {shallow} from 'enzyme';
 import '@testing-library/jest-dom';
 import NewActorPopup, {NewActorPopupContent} from './NewActorPopup';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../../utils/Api';

 describe('<NewActorPopup/>', function () {
    it('renders without crashing ', function () {
--- a/src/elements/Popups/NewActorPopup/NewActorPopup.tsx
+++ b/src/elements/Popups/NewActorPopup/NewActorPopup.tsx
@ -1,9 +1,8 @@
 import React from 'react';
 import PopupBase from '../PopupBase';
 import style from './NewActorPopup.module.css';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../../utils/Api';
 import {GeneralSuccess} from '../../../types/GeneralTypes';
-import {APINode} from '../../../types/ApiTypes';

 interface NewActorPopupProps {
    onHide: () => void;
--- a/src/elements/Popups/NewTagPopup/NewTagPopup.tsx
+++ b/src/elements/Popups/NewTagPopup/NewTagPopup.tsx
@ -1,9 +1,8 @@
 import React from 'react';
 import PopupBase from '../PopupBase';
 import style from './NewTagPopup.module.css';
+import {APINode, callAPI} from '../../../utils/Api';
 import {GeneralSuccess} from '../../../types/GeneralTypes';
-import {callAPI} from 'gowebsecure';
-import {APINode} from '../../../types/ApiTypes';

 interface props {
    onHide: () => void;
--- a/src/elements/VideoContainer/VideoContainer.tsx
+++ b/src/elements/VideoContainer/VideoContainer.tsx
@ -1,8 +1,8 @@
 import React from 'react';
 import Preview from '../Preview/Preview';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import DynamicContentContainer from '../DynamicContentContainer/DynamicContentContainer';
-import {callAPIPlain} from 'gowebsecure';
+import {APINode, callAPIPlain} from '../../utils/Api';

 interface Props {
    data: VideoTypes.VideoUnloadedType[];
--- a/src/pages/ActorOverviewPage/ActorOverviewPage.tsx
+++ b/src/pages/ActorOverviewPage/ActorOverviewPage.tsx
@ -1,5 +1,5 @@
 import React from 'react';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {ActorType} from '../../types/VideoTypes';
 import ActorTile from '../../elements/ActorTile/ActorTile';
 import PageTitle from '../../elements/PageTitle/PageTitle';
@ -8,7 +8,6 @@ import SideBar from '../../elements/SideBar/SideBar';
 import {Button} from '../../elements/GPElements/Button';
 import NewActorPopup from '../../elements/Popups/NewActorPopup/NewActorPopup';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
-import {APINode} from '../../types/ApiTypes';

 interface Props {}

--- a/src/pages/ActorPage/ActorPage.tsx
+++ b/src/pages/ActorPage/ActorPage.tsx
@ -5,12 +5,12 @@ import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faUser} from '@fortawesome/free-solid-svg-icons';
 import style from './ActorPage.module.css';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {ActorType} from '../../types/VideoTypes';
 import {Link, withRouter} from 'react-router-dom';
 import {RouteComponentProps} from 'react-router';
 import {Button} from '../../elements/GPElements/Button';
-import {ActorTypes, APINode, VideoTypes} from '../../types/ApiTypes';
+import {ActorTypes, VideoTypes} from '../../types/ApiTypes';

 interface state {
    data: VideoTypes.VideoUnloadedType[];
@ -72,10 +72,6 @@ export class ActorPage extends React.Component<Props, state> {
                    data: result.Videos ? result.Videos : [],
                    actor: result.Info
                });
-            },
-            (_) => {
-                // if there is an load error redirect to home page
-                this.props.history.push('/');
            }
        );
    }
--- a/src/pages/AuthenticationPage/AuthenticationPage.tsx
+++ b/src/pages/AuthenticationPage/AuthenticationPage.tsx
@ -2,7 +2,7 @@ import React from 'react';
 import {Button} from '../../elements/GPElements/Button';
 import style from './AuthenticationPage.module.css';
 import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
-import {token} from 'gowebsecure';
+import {token} from '../../utils/TokenHandler';
 import {faTimes} from '@fortawesome/free-solid-svg-icons';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';

@ -90,8 +90,7 @@ class AuthenticationPage extends React.Component<Props, state> {
                }
            },
            true,
-            this.state.pwdText,
-            'openmediacenter'
+            this.state.pwdText
        );
    }

--- a/src/pages/CategoryPage/CategoryView.test.js
+++ b/src/pages/CategoryPage/CategoryView.test.js
@ -4,9 +4,7 @@ import {CategoryView} from './CategoryView';

 describe('<CategoryView/>', function () {
    function instance() {
-        const inst = shallow(<CategoryView match={{params: {id: 10}}} history={{push: jest.fn()}}/>);
-        inst.setState({loaded: true});
-        return inst;
+        return shallow(<CategoryView match={{params: {id: 10}}} history={{push: jest.fn()}}/>);
    }

    it('renders without crashing ', function () {
--- a/src/pages/CategoryPage/CategoryView.tsx
+++ b/src/pages/CategoryPage/CategoryView.tsx
@ -1,23 +1,21 @@
 import {RouteComponentProps} from 'react-router';
 import React from 'react';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {withRouter} from 'react-router-dom';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 import Tag from '../../elements/Tag/Tag';
 import {DefaultTags, GeneralSuccess} from '../../types/GeneralTypes';
 import {Button} from '../../elements/GPElements/Button';
 import SubmitPopup from '../../elements/Popups/SubmitPopup/SubmitPopup';
-import {Spinner} from 'react-bootstrap';

 interface CategoryViewProps extends RouteComponentProps<{id: string}> {}

 interface CategoryViewState {
    loaded: boolean;
    submitForceDelete: boolean;
-    TagName: string;
 }

 /**
@ -31,8 +29,7 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie

        this.state = {
            loaded: false,
-            submitForceDelete: false,
-            TagName: ''
+            submitForceDelete: false
        };
    }

@ -53,13 +50,9 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
    }

    render(): JSX.Element {
-        if (!this.state.loaded) {
-            return <Spinner animation='border' />;
-        }
-
        return (
            <>
-                <PageTitle title={this.state.TagName} subtitle={this.videodata.length + ' Videos'} />
+                <PageTitle title='Categories' subtitle={this.videodata.length + ' Videos'} />

                <SideBar>
                    <SideBarTitle>Default Tags:</SideBarTitle>
@ -112,18 +105,10 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
     * @param id tagid
     */
    private fetchVideoData(id: number): void {
-        callAPI(
-            APINode.Video,
-            {action: 'getMovies', Tag: id},
-            (result: {Videos: VideoTypes.VideoUnloadedType[]; TagName: string}) => {
-                this.videodata = result.Videos;
-                this.setState({loaded: true, TagName: result.TagName});
-            },
-            (_) => {
-                // if there is an load error redirect to home page
-                this.props.history.push('/');
-            }
-        );
+        callAPI<VideoTypes.VideoUnloadedType[]>(APINode.Video, {action: 'getMovies', Tag: id}, (result) => {
+            this.videodata = result;
+            this.setState({loaded: true});
+        });
    }

    /**
--- a/src/pages/CategoryPage/TagView.tsx
+++ b/src/pages/CategoryPage/TagView.tsx
@ -2,14 +2,13 @@ import {TagType} from '../../types/VideoTypes';
 import React from 'react';
 import {Link} from 'react-router-dom';
 import {TagPreview} from '../../elements/Preview/Preview';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 import Tag from '../../elements/Tag/Tag';
 import {DefaultTags} from '../../types/GeneralTypes';
 import NewTagPopup from '../../elements/Popups/NewTagPopup/NewTagPopup';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
-import {APINode} from '../../types/ApiTypes';

 interface TagViewState {
    loadedtags: TagType[];
--- a/src/pages/HomePage/HomePage.module.css
+++ b/src/pages/HomePage/HomePage.module.css
@ -7,61 +7,3 @@
    float: right;
    margin-top: 25px;
 }
-
-.sortbyLabel {
-    color: grey;
-    margin-right: 5px;
-    margin-left: 25px;
-}
-
-/* Style The Dropdown Button */
-.dropbtn {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: row;
-    height: 100%;
-    cursor: pointer;
-    color: white;
-    text-align: center;
-}
-
-/* The container <div> - needed to position the dropdown content */
-.dropdown {
-    position: relative;
-    display: inline-block;
-}
-
-/* Dropdown Content (Hidden by Default) */
-.dropdownContent {
-    display: none;
-    position: absolute;
-    background-color: #f9f9f9;
-    min-width: 160px;
-    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-    z-index: 1;
-}
-
-/* Links inside the dropdown */
-.dropdownContent span {
-    color: black;
-    padding: 12px 16px;
-    text-decoration: none;
-    display: block;
-    cursor: pointer;
-}
-
-/* Change color of dropdown links on hover */
-.dropdownContent span:hover {
-    background-color: #f1f1f1;
-}
-
-/* Show the dropdown menu on hover */
-.dropdown:hover .dropdownContent {
-    display: block;
-}
-
-/* Change the background color of the dropdown button when the dropdown content is shown */
-.dropdown:hover .dropbtn {
-    background-color: #3574fe;
-}
--- a/src/pages/HomePage/HomePage.test.js
+++ b/src/pages/HomePage/HomePage.test.js
@ -1,10 +1,8 @@
 import {shallow} from 'enzyme';
 import React from 'react';
-import {HomePage, SortBy} from './HomePage';
+import {HomePage} from './HomePage';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 import {SearchHandling} from './SearchHandling';
-import exp from "constants";
-import {DefaultTags} from "../../types/GeneralTypes";

 describe('<HomePage/>', function () {
    it('renders without crashing ', function () {
@ -25,6 +23,23 @@ describe('<HomePage/>', function () {
        expect(wrapper.find('PageTitle').props().subtitle).toBe('testsubtitle - 42');
    });

+    it('test search field', done => {
+        global.fetch = global.prepareFetchApi([{}, {}]);
+
+        const wrapper = shallow(<HomePage/>);
+
+        wrapper.find('[data-testid="searchtextfield"]').simulate('change', {target: {value: 'testvalue'}});
+        wrapper.find('[data-testid="searchbtnsubmit"]').simulate('click');
+
+        process.nextTick(() => {
+            // state to be set correctly with response
+            expect(wrapper.state().selectionnr).toBe(2);
+
+            global.fetch.mockClear();
+            done();
+        });
+    });
+
    it('test form submit', () => {
        const func = jest.fn();
        const wrapper = shallow(<HomePage/>);
@ -57,7 +72,7 @@ describe('<HomePage/>', function () {
    });

    it('test tag click', done => {
-        global.fetch = prepareFetchApi({Videos: ['test1', 'test2'], TagName: 'all'});
+        global.fetch = prepareFetchApi(['test1', 'test2']);

        const wrapper = shallow(<HomePage/>);

@ -85,20 +100,6 @@ describe('<HomePage/>', function () {

        testBtn(tags.first());
    });
-
-    it('test sortby type change', function () {
-        const wrapper = shallow(<HomePage/>);
-
-        // expect those default values
-        expect(wrapper.state().sortby).toBe('Date Added');
-        expect(wrapper.instance().sortState).toBe(SortBy.date);
-        expect(wrapper.instance().tagState).toBe(DefaultTags.all);
-
-        wrapper.instance().onDropDownItemClick(SortBy.name, 'namesort');
-
-        expect(wrapper.state().sortby).toBe('namesort');
-        expect(wrapper.instance().sortState).toBe(SortBy.name);
-    });
 });

 describe('<SearchHandling/>', () => {
--- a/src/pages/HomePage/HomePage.tsx
+++ b/src/pages/HomePage/HomePage.tsx
@ -5,32 +5,20 @@ import VideoContainer from '../../elements/VideoContainer/VideoContainer';

 import style from './HomePage.module.css';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
+import {APINode, callAPI} from '../../utils/Api';
 import {Route, Switch, withRouter} from 'react-router-dom';
 import {RouteComponentProps} from 'react-router';
 import SearchHandling from './SearchHandling';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import {DefaultTags} from '../../types/GeneralTypes';
-import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
-import {faSortDown} from '@fortawesome/free-solid-svg-icons';
-import {TagType} from '../../types/VideoTypes';
-import {APILoader} from 'gowebsecure-react';
-
-// eslint-disable-next-line no-shadow
-export enum SortBy {
-    date,
-    likes,
-    random,
-    name,
-    length
-}

 interface Props extends RouteComponentProps {}

 interface state {
+    sideinfo: VideoTypes.startDataType;
    subtitle: string;
-    sortby: string;
-    sortState: SortBy;
-    tagState: TagType;
+    data: VideoTypes.VideoUnloadedType[];
+    selectionnr: number;
 }

 /**
@ -40,140 +28,141 @@ export class HomePage extends React.Component<Props, state> {
    /** keyword variable needed temporary store search keyword */
    keyword = '';

-    state = {
-        subtitle: 'All Videos',
-        sortby: 'Date Added',
-        sortState: SortBy.date,
-        tagState: DefaultTags.all
-    };
+    constructor(props: Props) {
+        super(props);

-    render(): JSX.Element {
-        return (
-            <Switch>
-                <Route path='/search/:name'>
-                    <SearchHandling />
-                </Route>
-                <Route path='/'>
-                    <APILoader
-                        render={(data: {Videos: VideoTypes.VideoUnloadedType[]; TagName: string}): JSX.Element => (
-                            <>
-                                <PageTitle title='Home Page' subtitle={this.state.subtitle + ' - ' + data.Videos.length}>
-                                    <form
-                                        className={'form-inline ' + style.searchform}
-                                        onSubmit={(e): void => {
-                                            e.preventDefault();
-                                            this.props.history.push('/search/' + this.keyword);
-                                        }}>
-                                        <input
-                                            data-testid='searchtextfield'
-                                            className='form-control mr-sm-2'
-                                            type='text'
-                                            placeholder='Search'
-                                            onChange={(e): void => {
-                                                this.keyword = e.target.value;
-                                            }}
-                                        />
-                                        <button data-testid='searchbtnsubmit' className='btn btn-success' type='submit'>
-                                            Search
-                                        </button>
-                                    </form>
-                                </PageTitle>
-                                <SideBar>
-                                    <APILoader
-                                        render={(sidebardata: VideoTypes.startDataType): JSX.Element => (
-                                            <>
-                                                <SideBarTitle>Infos:</SideBarTitle>
-                                                <Line />
-                                                <SideBarItem>
-                                                    <b>{sidebardata.VideoNr}</b> Videos Total!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.FullHdNr}</b> FULL-HD Videos!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.HDNr}</b> HD Videos!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.SDNr}</b> SD Videos!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.DifferentTags}</b> different Tags!
-                                                </SideBarItem>
-                                                <Line />
-                                                <SideBarTitle>Default Tags:</SideBarTitle>
-                                                <Tag
-                                                    tagInfo={{TagName: 'All', TagId: DefaultTags.all.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({tagState: DefaultTags.all, subtitle: 'All Videos'});
-                                                    }}
-                                                />
-                                                <Tag
-                                                    tagInfo={{TagName: 'Full Hd', TagId: DefaultTags.fullhd.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({tagState: DefaultTags.fullhd, subtitle: 'Full Hd Videos'});
-                                                    }}
-                                                />
-                                                <Tag
-                                                    tagInfo={{TagName: 'Low Quality', TagId: DefaultTags.lowq.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({
-                                                            tagState: DefaultTags.lowq,
-                                                            subtitle: 'Low Quality Videos'
-                                                        });
-                                                    }}
-                                                />
-                                                <Tag
-                                                    tagInfo={{TagName: 'HD', TagId: DefaultTags.hd.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({tagState: DefaultTags.hd, subtitle: 'HD Videos'});
-                                                    }}
-                                                />
-                                            </>
-                                        )}
-                                        node={APINode.Video}
-                                        action='getStartData'
-                                    />
-                                </SideBar>
-                                <div>
-                                    <span className={style.sortbyLabel}>Sort By: </span>
-                                    <div className={style.dropdown}>
-                                        <span className={style.dropbtn}>
-                                            <span>{this.state.sortby}</span>
-                                            <FontAwesomeIcon style={{marginLeft: 3, paddingBottom: 3}} icon={faSortDown} size='1x' />
-                                        </span>
-                                        <div className={style.dropdownContent}>
-                                            <span onClick={(): void => this.onDropDownItemClick(SortBy.date, 'Date Added')}>
-                                                Date Added
-                                            </span>
-                                            <span onClick={(): void => this.onDropDownItemClick(SortBy.likes, 'Most likes')}>
-                                                Most likes
-                                            </span>
-                                            <span onClick={(): void => this.onDropDownItemClick(SortBy.random, 'Random')}>Random</span>
-                                            <span onClick={(): void => this.onDropDownItemClick(SortBy.name, 'Name')}>Name</span>
-                                            <span onClick={(): void => this.onDropDownItemClick(SortBy.length, 'Length')}>Length</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <VideoContainer data={data.Videos} />
-                                <div className={style.rightinfo} />
-                            </>
-                        )}
-                        node={APINode.Video}
-                        action='getMovies'
-                        params={{Tag: this.state.tagState.TagId, Sort: this.state.sortState}}
-                    />
-                </Route>
-            </Switch>
-        );
+        this.state = {
+            sideinfo: {
+                VideoNr: 0,
+                FullHdNr: 0,
+                HDNr: 0,
+                SDNr: 0,
+                DifferentTags: 0,
+                Tagged: 0
+            },
+            subtitle: 'All Videos',
+            data: [],
+            selectionnr: 0
+        };
+    }
+
+    componentDidMount(): void {
+        // initial get of all videos
+        this.fetchVideoData(DefaultTags.all.TagId);
+        this.fetchStartData();
    }

    /**
-     * click handler for sortby dropdown item click
-     * @param type type of sort action
-     * @param name new header title
+     * fetch available videos for specified tag
+     * this function clears all preview elements an reloads gravity with tag
+     *
+     * @param tag tag to fetch videos
     */
-    onDropDownItemClick(type: SortBy, name: string): void {
-        this.setState({sortby: name, sortState: type});
+    fetchVideoData(tag: number): void {
+        callAPI(APINode.Video, {action: 'getMovies', Tag: tag}, (result: VideoTypes.VideoUnloadedType[]) => {
+            this.setState({
+                data: []
+            });
+            this.setState({
+                data: result,
+                selectionnr: result.length
+            });
+        });
+    }
+
+    /**
+     * fetch the necessary data for left info box
+     */
+    fetchStartData(): void {
+        callAPI(APINode.Video, {action: 'getStartData'}, (result: VideoTypes.startDataType) => {
+            this.setState({sideinfo: result});
+        });
+    }
+
+    render(): JSX.Element {
+        return (
+            <>
+                <Switch>
+                    <Route path='/search/:name'>
+                        <SearchHandling />
+                    </Route>
+                    <Route path='/'>
+                        <PageTitle title='Home Page' subtitle={this.state.subtitle + ' - ' + this.state.selectionnr}>
+                            <form
+                                className={'form-inline ' + style.searchform}
+                                onSubmit={(e): void => {
+                                    e.preventDefault();
+                                    this.props.history.push('/search/' + this.keyword);
+                                }}>
+                                <input
+                                    data-testid='searchtextfield'
+                                    className='form-control mr-sm-2'
+                                    type='text'
+                                    placeholder='Search'
+                                    onChange={(e): void => {
+                                        this.keyword = e.target.value;
+                                    }}
+                                />
+                                <button data-testid='searchbtnsubmit' className='btn btn-success' type='submit'>
+                                    Search
+                                </button>
+                            </form>
+                        </PageTitle>
+                        <SideBar>
+                            <SideBarTitle>Infos:</SideBarTitle>
+                            <Line />
+                            <SideBarItem>
+                                <b>{this.state.sideinfo.VideoNr}</b> Videos Total!
+                            </SideBarItem>
+                            <SideBarItem>
+                                <b>{this.state.sideinfo.FullHdNr}</b> FULL-HD Videos!
+                            </SideBarItem>
+                            <SideBarItem>
+                                <b>{this.state.sideinfo.HDNr}</b> HD Videos!
+                            </SideBarItem>
+                            <SideBarItem>
+                                <b>{this.state.sideinfo.SDNr}</b> SD Videos!
+                            </SideBarItem>
+                            <SideBarItem>
+                                <b>{this.state.sideinfo.DifferentTags}</b> different Tags!
+                            </SideBarItem>
+                            <Line />
+                            <SideBarTitle>Default Tags:</SideBarTitle>
+                            <Tag
+                                tagInfo={{TagName: 'All', TagId: DefaultTags.all.TagId}}
+                                onclick={(): void => {
+                                    this.fetchVideoData(DefaultTags.all.TagId);
+                                    this.setState({subtitle: 'All Videos'});
+                                }}
+                            />
+                            <Tag
+                                tagInfo={{TagName: 'Full Hd', TagId: DefaultTags.fullhd.TagId}}
+                                onclick={(): void => {
+                                    this.fetchVideoData(DefaultTags.fullhd.TagId);
+                                    this.setState({subtitle: 'Full Hd Videos'});
+                                }}
+                            />
+                            <Tag
+                                tagInfo={{TagName: 'Low Quality', TagId: DefaultTags.lowq.TagId}}
+                                onclick={(): void => {
+                                    this.fetchVideoData(DefaultTags.lowq.TagId);
+                                    this.setState({subtitle: 'Low Quality Videos'});
+                                }}
+                            />
+                            <Tag
+                                tagInfo={{TagName: 'HD', TagId: DefaultTags.hd.TagId}}
+                                onclick={(): void => {
+                                    this.fetchVideoData(DefaultTags.hd.TagId);
+                                    this.setState({subtitle: 'HD Videos'});
+                                }}
+                            />
+                        </SideBar>
+                        <VideoContainer data={this.state.data} />
+                        <div className={style.rightinfo} />
+                    </Route>
+                </Switch>
+            </>
+        );
    }
 }

--- a/src/pages/HomePage/SearchHandling.tsx
+++ b/src/pages/HomePage/SearchHandling.tsx
@ -1,11 +1,11 @@
 import {RouteComponentProps} from 'react-router';
 import React from 'react';
 import {withRouter} from 'react-router-dom';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 import PageTitle from '../../elements/PageTitle/PageTitle';
 import SideBar from '../../elements/SideBar/SideBar';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';

 interface params {
    name: string;
--- a/src/pages/Player/Player.test.js
+++ b/src/pages/Player/Player.test.js
@ -1,7 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import {Player} from './Player';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../utils/Api';

 describe('<Player/>', function () {

--- a/src/pages/Player/Player.tsx
+++ b/src/pages/Player/Player.tsx
@ -13,14 +13,15 @@ import {faPlusCircle} from '@fortawesome/free-solid-svg-icons';
 import AddActorPopup from '../../elements/Popups/AddActorPopup/AddActorPopup';
 import ActorTile from '../../elements/ActorTile/ActorTile';
 import {withRouter} from 'react-router-dom';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {RouteComponentProps} from 'react-router';
 import {DefaultPlyrOptions, GeneralSuccess} from '../../types/GeneralTypes';
 import {ActorType, TagType} from '../../types/VideoTypes';
 import PlyrJS from 'plyr';
 import {Button} from '../../elements/GPElements/Button';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import GlobalInfos from '../../utils/GlobalInfos';
+import KeyComponent from '../../utils/KeyComponent';

 interface Props extends RouteComponentProps<{id: string}> {}

@ -42,7 +43,7 @@ interface mystate {
 * Player page loads when a video is selected to play and handles the video view
 * and actions such as tag adding and liking
 */
-export class Player extends React.Component<Props, mystate> {
+export class Player extends KeyComponent<Props, mystate> {
    constructor(props: Props) {
        super(props);

@ -62,7 +63,19 @@ export class Player extends React.Component<Props, mystate> {
        this.quickAddTag = this.quickAddTag.bind(this);
    }

+    keyHandler(key: string): void {
+        switch (key) {
+            case 't':
+                this.setState({popupvisible: true});
+                break;
+            case 'a':
+                this.setState({actorpopupvisible: true});
+                break;
+        }
+    }
+
    componentDidMount(): void {
+        super.componentDidMount();
        // initial fetch of current movie data
        this.fetchMovieData();
    }
@ -286,10 +299,6 @@ export class Player extends React.Component<Props, mystate> {
                    suggesttag: result.SuggestedTag,
                    actors: result.Actors
                });
-            },
-            (_) => {
-                // if there is an load error redirect to home page
-                this.props.history.push('/');
            }
        );
    }
--- a/src/pages/RandomPage/RandomPage.test.js
+++ b/src/pages/RandomPage/RandomPage.test.js
@ -1,7 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import RandomPage from './RandomPage';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../utils/Api';

 describe('<RandomPage/>', function () {
    it('renders without crashing ', function () {
--- a/src/pages/RandomPage/RandomPage.tsx
+++ b/src/pages/RandomPage/RandomPage.tsx
@ -4,10 +4,15 @@ import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 import Tag from '../../elements/Tag/Tag';
 import PageTitle from '../../elements/PageTitle/PageTitle';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
+import {APINode, callAPI} from '../../utils/Api';
 import {TagType} from '../../types/VideoTypes';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
-import KeyComponent from '../../elements/KeyComponent';
-import {APILoader} from 'gowebsecure-react';
+import {VideoTypes} from '../../types/ApiTypes';
+import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
+
+interface state {
+    videos: VideoTypes.VideoUnloadedType[];
+    tags: TagType[];
+}

 interface GetRandomMoviesType {
    Videos: VideoTypes.VideoUnloadedType[];
@ -17,43 +22,88 @@ interface GetRandomMoviesType {
 /**
 * Randompage shuffles random viedeopreviews and provides a shuffle btn
 */
-class RandomPage extends React.Component {
+class RandomPage extends React.Component<{}, state> {
    readonly LoadNR = 3;

+    constructor(props: {}) {
+        super(props);
+
+        this.state = {
+            videos: [],
+            tags: []
+        };
+
+        this.keypress = this.keypress.bind(this);
+    }
+
+    componentDidMount(): void {
+        addKeyHandler(this.keypress);
+
+        this.loadShuffledvideos(this.LoadNR);
+    }
+
+    componentWillUnmount(): void {
+        removeKeyHandler(this.keypress);
+    }
+
    render(): JSX.Element {
        return (
            <div>
-                <PageTitle title='Random Videos' subtitle={this.LoadNR + 'pcs'} />
-                <APILoader
-                    render={(data: GetRandomMoviesType, actions): JSX.Element => (
-                        <KeyComponent listenKey='s' onKey={actions.refresh}>
-                            <SideBar>
-                                <SideBarTitle>Visible Tags:</SideBarTitle>
-                                {data.Tags.map((m) => (
-                                    <Tag key={m.TagId} tagInfo={m} />
-                                ))}
-                            </SideBar>
+                <PageTitle title='Random Videos' subtitle='4pc' />

-                            {data.Videos.length !== 0 ? (
-                                <VideoContainer data={data.Videos}>
-                                    <div className={style.Shufflebutton}>
-                                        <button onClick={actions.refresh} className={style.btnshuffle}>
-                                            Shuffle
-                                        </button>
-                                    </div>
-                                </VideoContainer>
-                            ) : (
-                                <div>No Data found!</div>
-                            )}
-                        </KeyComponent>
-                    )}
-                    node={APINode.Video}
-                    action='getRandomMovies'
-                    params={{Number: this.LoadNR}}
-                />
+                <SideBar>
+                    <SideBarTitle>Visible Tags:</SideBarTitle>
+                    {this.state.tags.map((m) => (
+                        <Tag key={m.TagId} tagInfo={m} />
+                    ))}
+                </SideBar>
+
+                {this.state.videos.length !== 0 ? (
+                    <VideoContainer data={this.state.videos}>
+                        <div className={style.Shufflebutton}>
+                            <button onClick={(): void => this.shuffleclick()} className={style.btnshuffle}>
+                                Shuffle
+                            </button>
+                        </div>
+                    </VideoContainer>
+                ) : (
+                    <div>No Data found!</div>
+                )}
            </div>
        );
    }
+
+    /**
+     * click handler for shuffle btn
+     */
+    shuffleclick(): void {
+        this.loadShuffledvideos(this.LoadNR);
+    }
+
+    /**
+     * load random videos from backend
+     * @param nr number of videos to load
+     */
+    loadShuffledvideos(nr: number): void {
+        callAPI<GetRandomMoviesType>(APINode.Video, {action: 'getRandomMovies', Number: nr}, (result) => {
+            this.setState({videos: []}); // needed to trigger rerender of main videoview
+            this.setState({
+                videos: result.Videos,
+                tags: result.Tags
+            });
+        });
+    }
+
+    /**
+     * key event handling
+     * @param event keyevent
+     */
+    private keypress(event: KeyboardEvent): void {
+        // bind s to shuffle
+        if (event.key === 's') {
+            this.loadShuffledvideos(4);
+        }
+    }
 }

 export default RandomPage;
--- a/src/pages/SettingsPage/GeneralSettings.tsx
+++ b/src/pages/SettingsPage/GeneralSettings.tsx
@ -6,13 +6,12 @@ import InfoHeaderItem from '../../elements/InfoHeaderItem/InfoHeaderItem';
 import {faArchive, faBalanceScaleLeft, faRulerVertical} from '@fortawesome/free-solid-svg-icons';
 import {faAddressCard} from '@fortawesome/free-regular-svg-icons';
 import {version} from '../../../package.json';
-import {callAPI} from 'gowebsecure';
-import {APINode, SettingsTypes} from '../../types/ApiTypes';
+import {APINode, callAPI} from '../../utils/Api';
+import {SettingsTypes} from '../../types/ApiTypes';
 import {GeneralSuccess} from '../../types/GeneralTypes';

 interface state {
-    generalSettings: SettingsTypes.SettingsType;
-    sizes: SettingsTypes.SizesType;
+    generalSettings: SettingsTypes.loadGeneralSettingsType;
 }

 interface Props {}
@ -28,18 +27,16 @@ class GeneralSettings extends React.Component<Props, state> {
        this.state = {
            generalSettings: {
                DarkMode: true,
+                DBSize: 0,
+                DifferentTags: 0,
                EpisodePath: '',
                MediacenterName: '',
                Password: '',
                PasswordEnabled: false,
-                TMDBGrabbing: false,
-                VideoPath: ''
-            },
-            sizes: {
-                DBSize: 0,
-                DifferentTags: 0,
                TagsAdded: 0,
-                VideoNr: 0
+                TMDBGrabbing: false,
+                VideoNr: 0,
+                VideoPath: ''
            }
        };
    }
@ -55,25 +52,25 @@ class GeneralSettings extends React.Component<Props, state> {
                <div className={style.infoheader}>
                    <InfoHeaderItem
                        backColor='lightblue'
-                        text={this.state.sizes.VideoNr}
+                        text={this.state.generalSettings.VideoNr}
                        subtext='Videos in Gravity'
                        icon={faArchive}
                    />
                    <InfoHeaderItem
                        backColor='yellow'
-                        text={this.state.sizes.DBSize + ' MB'}
+                        text={this.state.generalSettings.DBSize + ' MB'}
                        subtext='Database size'
                        icon={faRulerVertical}
                    />
                    <InfoHeaderItem
                        backColor='green'
-                        text={this.state.sizes.DifferentTags}
+                        text={this.state.generalSettings.DifferentTags}
                        subtext='different Tags'
                        icon={faAddressCard}
                    />
                    <InfoHeaderItem
                        backColor='orange'
-                        text={this.state.sizes.TagsAdded}
+                        text={this.state.generalSettings.TagsAdded}
                        subtext='tags added'
                        icon={faBalanceScaleLeft}
                    />
@ -213,16 +210,8 @@ class GeneralSettings extends React.Component<Props, state> {
     * inital load of already specified settings from backend
     */
    loadSettings(): void {
-        interface SettingsResponseType {
-            Settings: SettingsTypes.SettingsType;
-            Sizes: SettingsTypes.SizesType;
-        }
-
-        callAPI(APINode.Settings, {action: 'loadGeneralSettings'}, (result: SettingsResponseType) => {
-            this.setState({
-                generalSettings: result.Settings,
-                sizes: result.Sizes
-            });
+        callAPI(APINode.Settings, {action: 'loadGeneralSettings'}, (result: SettingsTypes.loadGeneralSettingsType) => {
+            this.setState({generalSettings: result});
        });
    }

@ -236,12 +225,11 @@ class GeneralSettings extends React.Component<Props, state> {
        }
        settings.DarkMode = GlobalInfos.isDarkTheme();

-        console.log(settings);
        callAPI(
            APINode.Settings,
            {
                action: 'saveGeneralSettings',
-                ...settings
+                Settings: settings
            },
            (result: GeneralSuccess) => {
                if (result.result) {
--- a/src/pages/SettingsPage/MovieSettings.test.js
+++ b/src/pages/SettingsPage/MovieSettings.test.js
@ -1,7 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import MovieSettings from './MovieSettings';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../utils/Api';

 describe('<MovieSettings/>', function () {
    it('renders without crashing ', function () {
--- a/src/pages/SettingsPage/MovieSettings.tsx
+++ b/src/pages/SettingsPage/MovieSettings.tsx
@ -1,8 +1,7 @@
 import React from 'react';
 import style from './MovieSettings.module.css';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {GeneralSuccess} from '../../types/GeneralTypes';
-import {APINode} from '../../types/ApiTypes';

 interface state {
    text: string[];
--- a/src/pages/SettingsPage/SettingsPage.tsx
+++ b/src/pages/SettingsPage/SettingsPage.tsx
@ -22,11 +22,9 @@ class SettingsPage extends React.Component {
                    <NavLink to='/settings/movies'>
                        <div className={style.SettingSidebarElement}>Movies</div>
                    </NavLink>
-                    {GlobalInfos.isTVShowEnabled() ? (
-                        <NavLink to='/settings/tv'>
-                            <div className={style.SettingSidebarElement}>TV Shows</div>
-                        </NavLink>
-                    ) : null}
+                    <NavLink to='/settings/tv'>
+                        <div className={style.SettingSidebarElement}>TV Shows</div>
+                    </NavLink>
                </div>
                <div className={style.SettingsContent}>
                    <Switch>
@ -36,11 +34,9 @@ class SettingsPage extends React.Component {
                        <Route path='/settings/movies'>
                            <MovieSettings />
                        </Route>
-                        {GlobalInfos.isTVShowEnabled() ? (
-                            <Route path='/settings/tv'>
-                                <span />
-                            </Route>
-                        ) : null}
+                        <Route path='/settings/tv'>
+                            <span />
+                        </Route>
                        <Route path='/settings'>
                            <Redirect to='/settings/general' />
                        </Route>
--- a/src/pages/TVShowPage/EpisodePage.tsx
+++ b/src/pages/TVShowPage/EpisodePage.tsx
@ -1,7 +1,7 @@
 import * as React from 'react';
 import {RouteComponentProps} from 'react-router';
 import {withRouter} from 'react-router-dom';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {Link} from 'react-router-dom';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
 import tileStyle from './EpisodeTile.module.css';
@ -10,7 +10,6 @@ import {faPlay} from '@fortawesome/free-solid-svg-icons';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import SideBar, {SideBarItem, SideBarTitle} from '../../elements/SideBar/SideBar';
-import {APINode} from '../../types/ApiTypes';

 interface Props extends RouteComponentProps<{id: string}> {}

--- a/src/pages/TVShowPage/TVPlayer.tsx
+++ b/src/pages/TVShowPage/TVPlayer.tsx
@ -6,10 +6,9 @@ import style from '../Player/Player.module.css';
 import {Plyr} from 'plyr-react';
 import plyrstyle from 'plyr-react/dist/plyr.css';
 import {DefaultPlyrOptions} from '../../types/GeneralTypes';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import GlobalInfos from '../../utils/GlobalInfos';
 import PlyrJS from 'plyr';
-import {APINode} from '../../types/ApiTypes';

 interface Props extends RouteComponentProps<{id: string}> {}

@ -47,10 +46,6 @@ export class TVPlayer extends React.Component<Props, State> {
                console.log(data);
                this.data = data;
                this.setState({loaded: true});
-            },
-            (_) => {
-                // if there is an load error redirect to home page
-                this.props.history.push('/');
            }
        );
    }
--- a/src/pages/TVShowPage/TVShowPage.tsx
+++ b/src/pages/TVShowPage/TVShowPage.tsx
@ -1,7 +1,7 @@
 import React from 'react';
 import Preview from '../../elements/Preview/Preview';
-import {callAPI, callAPIPlain} from 'gowebsecure';
-import {APINode, TVShow} from '../../types/ApiTypes';
+import {APINode, callAPI, callAPIPlain} from '../../utils/Api';
+import {TVShow} from '../../types/ApiTypes';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
 import {Route, Switch, useRouteMatch} from 'react-router-dom';
 import EpisodePage from './EpisodePage';
--- a/src/setupTests.js
+++ b/src/setupTests.js
@ -6,8 +6,8 @@ import '@testing-library/jest-dom/extend-expect';

 import {configure} from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
-import {CookieTokenStore} from "gowebsecure";
-import {token} from "gowebsecure";
+import {CookieTokenStore} from "./utils/TokenStore/CookieTokenStore";
+import {token} from "./utils/TokenHandler";

 configure({adapter: new Adapter()});

@ -36,7 +36,7 @@ global.prepareFailingFetchApi = () => {
 };

 global.callAPIMock = (resonse) => {
-    const helpers = require('gowebsecure');
+    const helpers = require('./utils/Api');
    helpers.callAPI = jest.fn().mockImplementation((_, __, func1) => {func1(resonse);});
    helpers.callApiUnsafe = jest.fn().mockImplementation((_, __, func1) => {func1(resonse);});
 };
--- a/src/types/ApiTypes.ts
+++ b/src/types/ApiTypes.ts
@ -1,14 +1,5 @@
 import {ActorType, TagType} from './VideoTypes';

-// eslint-disable-next-line no-shadow
-export enum APINode {
-    Settings = 'settings',
-    Tags = 'tags',
-    Actor = 'actor',
-    Video = 'video',
-    TVShow = 'tvshow'
-}
-
 export namespace VideoTypes {
    export interface loadVideoType {
        MovieUrl: string;
@ -45,10 +36,9 @@ export namespace SettingsTypes {
        MediacenterName: string;
        VideoPath: string;
        TVShowPath: string;
-        TVShowEnabled: boolean;
    }

-    export interface SettingsType {
+    export interface loadGeneralSettingsType {
        VideoPath: string;
        EpisodePath: string;
        MediacenterName: string;
@ -56,9 +46,7 @@ export namespace SettingsTypes {
        PasswordEnabled: boolean;
        TMDBGrabbing: boolean;
        DarkMode: boolean;
-    }

-    export interface SizesType {
        VideoNr: number;
        DBSize: number;
        DifferentTags: number;
--- a/src/utils/Api.ts
+++ b/src/utils/Api.ts
@ -0,0 +1,121 @@
+import GlobalInfos from './GlobalInfos';
+import {token} from './TokenHandler';
+
+const APIPREFIX: string = '/api/';
+
+/**
+ * interface how an api request should look like
+ */
+interface ApiBaseRequest {
+    action: string | number;
+
+    [_: string]: string | number | boolean | object;
+}
+
+/**
+ * A backend api call
+ * @param apinode which api backend handler to call
+ * @param fd the object to send to backend
+ * @param callback the callback with json reply from backend
+ * @param errorcallback a optional callback if an error occured
+ */
+export function callAPI<T>(
+    apinode: APINode,
+    fd: ApiBaseRequest,
+    callback: (_: T) => void,
+    errorcallback: (_: string) => void = (_: string): void => {}
+): void {
+    token.checkAPITokenValid((mytoken) => {
+        fetch(APIPREFIX + apinode, {
+            method: 'POST',
+            body: JSON.stringify(fd),
+            headers: new Headers({
+                'Content-Type': 'application/json',
+                Authorization: 'Bearer ' + mytoken
+            })
+        })
+            .then((response) => {
+                if (response.status === 200) {
+                    // success
+                    response.json().then((result: T) => {
+                        callback(result);
+                    });
+                } else if (response.status === 400) {
+                    // Bad Request --> invalid token
+                    console.log('loading Password page.');
+                    // load password page
+                    if (GlobalInfos.loadPasswordPage) {
+                        GlobalInfos.loadPasswordPage(() => {
+                            callAPI(apinode, fd, callback, errorcallback);
+                        });
+                    }
+                } else {
+                    console.log('Error: ' + response.statusText);
+                }
+            })
+            .catch((reason) => errorcallback(reason));
+    });
+}
+
+/**
+ * make a public unsafe api call (without token) -- use as rare as possible only for initialization (eg. check if pwd is neccessary)
+ * @param apinode
+ * @param fd
+ * @param callback
+ * @param errorcallback
+ */
+export function callApiUnsafe<T>(
+    apinode: APINode,
+    fd: ApiBaseRequest,
+    callback: (_: T) => void,
+    errorcallback?: (_: string) => void
+): void {
+    fetch(APIPREFIX + apinode, {method: 'POST', body: JSON.stringify(fd)})
+        .then((response) => {
+            if (response.status !== 200) {
+                console.log('Error: ' + response.statusText);
+                // todo place error popup here
+            } else {
+                response.json().then((result: T) => {
+                    callback(result);
+                });
+            }
+        })
+        .catch((reason) => (errorcallback ? errorcallback(reason) : {}));
+}
+
+/**
+ * A backend api call
+ * @param apinode which api backend handler to call
+ * @param fd the object to send to backend
+ * @param callback the callback with PLAIN text reply from backend
+ */
+export function callAPIPlain(apinode: APINode, fd: ApiBaseRequest, callback: (_: string) => void): void {
+    token.checkAPITokenValid((mytoken) => {
+        fetch(APIPREFIX + apinode, {
+            method: 'POST',
+            body: JSON.stringify(fd),
+            headers: new Headers({
+                'Content-Type': 'application/json',
+                Authorization: 'Bearer ' + mytoken
+            })
+        }).then((response) =>
+            response.text().then((result) => {
+                callback(result);
+            })
+        );
+    });
+}
+
+/**
+ * API nodes definitions
+ */
+
+// eslint-disable-next-line no-shadow
+export enum APINode {
+    Settings = 'settings',
+    Tags = 'tags',
+    Actor = 'actor',
+    Video = 'video',
+    TVShow = 'tvshow'
+}
--- a/src/utils/GlobalInfos.ts
+++ b/src/utils/GlobalInfos.ts
@ -9,7 +9,6 @@ class StaticInfos {
    private darktheme: boolean = true;
    private videopath: string = '';
    private tvshowpath: string = '';
-    private TVShowsEnabled: boolean = false;

    /**
     * check if the current theme is the dark theme
@ -72,14 +71,6 @@ class StaticInfos {
     * load the Password page manually
     */
    loadPasswordPage: ((callback?: () => void) => void) | undefined = undefined;
-
-    setTVShowsEnabled(TVShowEnabled: boolean): void {
-        this.TVShowsEnabled = TVShowEnabled;
-    }
-
-    isTVShowEnabled(): boolean {
-        return this.TVShowsEnabled;
-    }
 }

 export default new StaticInfos();
--- a/src/utils/KeyComponent.ts
+++ b/src/utils/KeyComponent.ts
@ -0,0 +1,25 @@
+import * as React from 'react';
+
+abstract class KeyComponent<P = {}, S = {}> extends React.Component<P, S> {
+    constructor(props: P) {
+        super(props);
+
+        this.handler = this.handler.bind(this);
+    }
+
+    componentDidMount(): void {
+        document.addEventListener('keyup', this.handler);
+    }
+
+    componentWillUnmount(): void {
+        document.removeEventListener('keyup', this.handler);
+    }
+
+    private handler(e: KeyboardEvent): void {
+        this.keyHandler(e.key);
+    }
+
+    abstract keyHandler(key: string): void;
+}
+
+export default KeyComponent;
--- a/src/utils/TokenHandler.ts
+++ b/src/utils/TokenHandler.ts
@ -0,0 +1,135 @@
+import {TokenStore} from './TokenStore/TokenStore';
+
+export namespace token {
+    // store api token - empty if not set
+    let apiToken = '';
+
+    // a callback que to be called after api token refresh
+    let callQue: ((error: string) => void)[] = [];
+    // flag to check wheter a api refresh is currently pending
+    let refreshInProcess = false;
+    // store the expire seconds of token
+    let expireSeconds = -1;
+
+    let tokenStore: TokenStore;
+    let APiHost: string = '/';
+
+    export function init(ts: TokenStore, apiHost?: string): void {
+        tokenStore = ts;
+        if (apiHost) {
+            APiHost = apiHost;
+        }
+    }
+
+    /**
+     * refresh the api token or use that one in cookie if still valid
+     * @param callback to be called after successful refresh
+     * @param password
+     * @param force
+     */
+    export function refreshAPIToken(callback: (error: string) => void, force?: boolean, password?: string): void {
+        callQue.push(callback);
+
+        // check if already is a token refresh is in process
+        if (refreshInProcess) {
+            // if yes return
+            return;
+        } else {
+            // if not set flat
+            refreshInProcess = true;
+        }
+
+        if (apiTokenValid() && !force) {
+            console.log('token still valid...');
+            callFuncQue('');
+            return;
+        }
+
+        const formData = new FormData();
+        formData.append('grant_type', 'client_credentials');
+        formData.append('client_id', 'openmediacenter');
+        formData.append('client_secret', password ? password : 'openmediacenter');
+        formData.append('scope', 'all');
+
+        interface APIToken {
+            error?: string;
+            // eslint-disable-next-line camelcase
+            access_token: string; // no camel case allowed because of backendlib
+            // eslint-disable-next-line camelcase
+            expires_in: number; // no camel case allowed because of backendlib
+            scope: string;
+            // eslint-disable-next-line camelcase
+            token_type: string; // no camel case allowed because of backendlib
+        }
+
+        console.log(APiHost);
+
+        fetch(APiHost + 'token', {method: 'POST', body: formData})
+            .then((response) =>
+                response.json().then((result: APIToken) => {
+                    if (result.error) {
+                        callFuncQue(result.error);
+                        return;
+                    }
+                    // set api token
+                    apiToken = result.access_token;
+                    // set expire time
+                    expireSeconds = new Date().getTime() / 1000 + result.expires_in;
+                    // setTokenCookie(apiToken, expireSeconds);
+                    tokenStore.setToken({accessToken: apiToken, expireTime: expireSeconds, tokenType: '', scope: ''});
+                    // call all handlers and release flag
+                    callFuncQue('');
+                })
+            )
+            .catch((e) => {
+                callback(e);
+            });
+    }
+
+    export function apiTokenValid(): boolean {
+        // check if a cookie with token is available
+        // const token = getTokenCookie();
+        const tmptoken = tokenStore.loadToken();
+        if (tmptoken !== null) {
+            // check if token is at least valid for the next minute
+            if (tmptoken.expireTime > new Date().getTime() / 1000 + 60) {
+                apiToken = tmptoken.accessToken;
+                expireSeconds = tmptoken.expireTime;
+
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * call all qued callbacks
+     */
+    function callFuncQue(error: string): void {
+        // call all pending handlers
+        callQue.map((func) => {
+            return func(error);
+        });
+        // reset pending que
+        callQue = [];
+        // release flag to be able to start new refresh
+        refreshInProcess = false;
+    }
+
+    /**
+     * check if api token is valid -- if not request new one
+     * when finished call callback
+     * @param callback function to be called afterwards
+     */
+    export function checkAPITokenValid(callback: (mytoken: string) => void): void {
+        // check if token is valid and set
+        if (apiToken === '' || expireSeconds <= new Date().getTime() / 1000) {
+            console.log('token not valid...');
+            refreshAPIToken(() => {
+                callback(apiToken);
+            });
+        } else {
+            callback(apiToken);
+        }
+    }
+}
--- a/src/utils/TokenStore/CookieTokenStore.ts
+++ b/src/utils/TokenStore/CookieTokenStore.ts
@ -0,0 +1,48 @@
+import {Token, TokenStore} from './TokenStore';
+
+export class CookieTokenStore extends TokenStore {
+    loadToken(): Token | null {
+        const token = this.decodeCookie('token');
+        const expireInString = this.decodeCookie('token_expire');
+        const expireIn = parseInt(expireInString, 10);
+
+        if (expireIn !== 0 && token !== '') {
+            return {accessToken: token, expireTime: expireIn, scope: '', tokenType: ''};
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * set the cookie for the currently gotten token
+     * @param token the token to set
+     */
+    setToken(token: Token): void {
+        let d = new Date();
+        d.setTime(token.expireTime * 1000);
+        console.log('token set' + d.toUTCString());
+        let expires = 'expires=' + d.toUTCString();
+        document.cookie = 'token=' + token.accessToken + ';' + expires + ';path=/';
+        document.cookie = 'token_expire=' + token.expireTime + ';' + expires + ';path=/';
+    }
+
+    /**
+     * decode a simple cookie with key specified
+     * @param key cookie key
+     */
+    decodeCookie(key: string): string {
+        let name = key + '=';
+        let decodedCookie = decodeURIComponent(document.cookie);
+        let ca = decodedCookie.split(';');
+        for (let i = 0; i < ca.length; i++) {
+            let c = ca[i];
+            while (c.charAt(0) === ' ') {
+                c = c.substring(1);
+            }
+            if (c.indexOf(name) === 0) {
+                return c.substring(name.length, c.length);
+            }
+        }
+        return '';
+    }
+}
--- a/src/utils/TokenStore/TokenStore.ts
+++ b/src/utils/TokenStore/TokenStore.ts
@ -0,0 +1,11 @@
+export interface Token {
+    accessToken: string;
+    expireTime: number; // second time when token will be invalidated
+    scope: string;
+    tokenType: string;
+}
+
+export abstract class TokenStore {
+    abstract loadToken(): Token | null;
+    abstract setToken(token: Token): void;
+}
--- a/yarn.lock
+++ b/yarn.lock