fix: updated PlatformMap.json file with more platforms and fixed SNES extensions

* Improve metadata first load performance (#46)

* fix: reduces the number of full metadata calls - speeding up imports #45

* chore(deps): update EmulatorJS

* fix: added visual feed back

.devcontainer/.env

@@ -1,4 +0,0 @@
-DATABASE_HOST=mariadb
-DATABASE_USER=root
-DATABASE_PASSWORD=gaseous
-DATABASE_DB=gaseous

.devcontainer/Dockerfile

@@ -1,6 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm
-
-RUN apt-get update && apt-get install -y p7zip-full
-RUN mkdir -p /workspace/gaseous-server/wwwroot/emulators/EmulatorJS
-RUN wget https://cdn.emulatorjs.org/releases/4.0.11.7z
-RUN 7z x -y -o/workspace/gaseous-server/wwwroot/emulators/EmulatorJS 4.0.11.7z

.devcontainer/devcontainer.json

@@ -1,46 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
-{
-	"name": "C# (.NET)",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	//"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm",
-	"dockerComposeFile": "docker-compose.yml",
-	"service": "development",
-	"workspaceFolder": "/workspace",
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [5198],
-	"portsAttributes": {
-			"5198": {
-				"protocol": "http"
-			}
-	},
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "dotnet restore",
-
-	// Configure tool-specific properties.
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"cweijan.vscode-mysql-client2",
-				"ms-dotnettools.csdevkit",
-				"ms-dotnettools.csharp",
-				"ms-dotnettools.vscode-dotnet-runtime",
-				"ecmel.vscode-html-css",
-				"github.vscode-github-actions",
-				"GitHub.vscode-pull-request-github",
-				"AndersEAndersen.html-class-suggestions",
-				"george-alisson.html-preview-vscode",
-				"ms-dotnettools.vscodeintellicode-csharp",
-				"Zignd.html-css-class-completion"
-			]
-		}
-	}
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}

.devcontainer/docker-compose.yml

@@ -1,23 +0,0 @@
-services:
-  development:
-    build: 
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - ..:/workspace
-    stdin_open: true
-    environment:
-      - TZ=Australia/Sydney
-      - dbhost=${DATABASE_HOST}
-      - dbuser=${DATABASE_USER}
-      - dbpass=${DATABASE_PASSWORD}
-      - igdbclientid=<clientid>
-      - igdbclientsecret=<clientsecret>
-  mariadb:
-    hostname: mariadb
-    image: mariadb:latest
-    environment:
-      - MARIADB_ROOT_PASSWORD=${DATABASE_PASSWORD}
-      - MARIADB_DATABASE=${DATABASE_DB}
-      - MARIADB_USER=${DATABASE_USER}
-      - MARIADB_PASSWORD=${DATABASE_PASSWORD}

.github/dependabot.yml

@@ -9,7 +9,9 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-  - package-ecosystem: "devcontainers"
+  - package-ecosystem: "gitsubmodule"
     directory: "/"
+    allow:
+      - dependency-name: "gaseous-server/wwwroot/emulators/EmulatorJS"
     schedule:
-      interval: "weekly"
+      interval: "weekly"

.github/release.yml

@@ -1,19 +0,0 @@
-changelog:
-  categories:
-    - title: What's New
-      labels:
-        - '*'
-      exclude:
-        labels:
-          - note
-          - bug
-          - dependencies
-    - title: Notes
-      labels:
-        - note
-    - title: Bug Fixes
-      labels:
-        - bug
-    - title: Dependencies
-      labels:
-        - dependencies

.github/workflows/BuildDockerOnTag-Prerelease.yml

@@ -1,62 +0,0 @@
-name: Build Pre-release Docker Image
-
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+-preview.[0-9]'
-      - 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
-      - name: Install dotnet tool
-        run: dotnet tool install -g dotnetCampus.TagToVersion
-      - name: Set tag to version  
-        run: dotnet TagToVersion -t ${{ github.ref }}
-      - name: Sign in to Nuget
-        run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Login to GitHub Package Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push standard image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./build/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            gaseousgames/gaseousserver:${{ github.ref_name}}
-            ghcr.io/gaseous-project/gaseousserver:${{ github.ref_name}}
-      - name: Build and push image with embedded mariadb
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./build/Dockerfile-EmbeddedDB
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            gaseousgames/gaseousserver:${{ github.ref_name}}-embeddeddb
-            ghcr.io/gaseous-project/gaseousserver:${{ github.ref_name}}-embeddeddb

.github/workflows/BuildDockerOnTag-Release.yml

@@ -1,63 +0,0 @@
-name: Build Release Docker Image
-
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
-      - name: Install dotnet tool
-        run: dotnet tool install -g dotnetCampus.TagToVersion
-      - name: Set tag to version  
-        run: dotnet TagToVersion -t ${{ github.ref }}
-      - name: Sign in to Nuget
-        run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Login to GitHub Package Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push standard image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./build/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            gaseousgames/gaseousserver:latest
-            gaseousgames/gaseousserver:${{ github.ref_name}}
-            ghcr.io/gaseous-project/gaseousserver:latest
-            ghcr.io/gaseous-project/gaseousserver:${{ github.ref_name}}
-      - name: Build and push image with embedded mariadb
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./build/Dockerfile-EmbeddedDB
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            gaseousgames/gaseousserver:${{ github.ref_name}}-embeddeddb
-            ghcr.io/gaseous-project/gaseousserver:${{ github.ref_name}}-embeddeddb

.github/workflows/BuildDockerOnTag.yml

@@ -0,0 +1,36 @@
+name: Build Docker Image on New Tag
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64 #,linux/arm64
+          push: true
+          tags: gaseousgames/gaseousserver:latest,gaseousgames/gaseousserver:${{ github.ref_name}}

.github/workflows/BuildOnTestBranch.yml

@@ -1,36 +0,0 @@
-name: Build test branch
-
-on:
-  push:
-    branches: [test]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-      - name: Install dotnet tool
-        run: dotnet tool install -g dotnetCampus.TagToVersion
-      - name: Set tag to version  
-        run: dotnet TagToVersion -t 0.0.1
-      - name: Sign in to Nuget
-        run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: gaseousgames/test:latest

.github/workflows/codeql.yml

@@ -1,85 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "main", "branch-v*.*.*" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
-  schedule:
-    - cron: '21 11 * * 2'
-
-jobs:
-  analyze:
-    name: Analyze
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners
-    # Consider using larger runners for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'csharp', 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
-        # Use only 'java' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      
-    - name: Sign in to Nuget
-      run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-        
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/dotnet.yml

@@ -1,24 +0,0 @@
-name: .NET
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 8.0.x
-      - name: Sign in to Nuget
-        run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-      - name: Restore dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --no-restore

.gitignore

@@ -1,407 +1,405 @@
-# globs
+# globs
-Makefile.in
+Makefile.in
-*.userprefs
+*.userprefs
-*.usertasks
+*.usertasks
-config.make
+config.make
-config.status
+config.status
-aclocal.m4
+aclocal.m4
-install-sh
+install-sh
-autom4te.cache/
+autom4te.cache/
-*.tar.gz
+*.tar.gz
-tarballs/
+tarballs/
-test-results/
+test-results/
-
+
-# Mac bundle stuff
+# Mac bundle stuff
-*.dmg
+*.dmg
-*.app
+*.app
-
+
-# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
+# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
-# General
+# General
-.DS_Store
+.DS_Store
-.AppleDouble
+.AppleDouble
-.LSOverride
+.LSOverride
-
+
-# Icon must end with two \r
+# Icon must end with two \r
-Icon
+Icon
-
+
-
+
-# Thumbnails
+# Thumbnails
-._*
+._*
-
+
-# Files that might appear in the root of a volume
+# Files that might appear in the root of a volume
-.DocumentRevisions-V100
+.DocumentRevisions-V100
-.fseventsd
+.fseventsd
-.Spotlight-V100
+.Spotlight-V100
-.TemporaryItems
+.TemporaryItems
-.Trashes
+.Trashes
-.VolumeIcon.icns
+.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
+.com.apple.timemachine.donotpresent
-
+
-# Directories potentially created on remote AFP share
+# Directories potentially created on remote AFP share
-.AppleDB
+.AppleDB
-.AppleDesktop
+.AppleDesktop
-Network Trash Folder
+Network Trash Folder
-Temporary Items
+Temporary Items
-.apdisk
+.apdisk
-
+
-# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
+# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
-# Windows thumbnail cache files
+# Windows thumbnail cache files
-Thumbs.db
+Thumbs.db
-ehthumbs.db
+ehthumbs.db
-ehthumbs_vista.db
+ehthumbs_vista.db
-
+
-# Dump file
+# Dump file
-*.stackdump
+*.stackdump
-
+
-# Folder config file
+# Folder config file
-[Dd]esktop.ini
+[Dd]esktop.ini
-
+
-# Recycle Bin used on file shares
+# Recycle Bin used on file shares
-$RECYCLE.BIN/
+$RECYCLE.BIN/
-
+
-# Windows Installer files
+# Windows Installer files
-*.cab
+*.cab
-*.msi
+*.msi
-*.msix
+*.msix
-*.msm
+*.msm
-*.msp
+*.msp
-
+
-# Windows shortcuts
+# Windows shortcuts
-*.lnk
+*.lnk
-
+
-# content below from: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+# content below from: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-## Ignore Visual Studio temporary files, build results, and
+## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
+## files generated by popular Visual Studio add-ons.
-##
+##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
+
-# User-specific files
+# User-specific files
-*.suo
+*.suo
-*.user
+*.user
-*.userosscache
+*.userosscache
-*.sln.docstates
+*.sln.docstates
-
+
-# User-specific files (MonoDevelop/Xamarin Studio)
+# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
+*.userprefs
-
+
-# Build results
+# Build results
-[Dd]ebug/
+[Dd]ebug/
-[Dd]ebugPublic/
+[Dd]ebugPublic/
-[Rr]elease/
+[Rr]elease/
-[Rr]eleases/
+[Rr]eleases/
-x64/
+x64/
-x86/
+x86/
-bld/
+bld/
-[Bb]in/
+[Bb]in/
-[Oo]bj/
+[Oo]bj/
-[Ll]og/
+[Ll]og/
-
+
-# Visual Studio 2015/2017 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
-.vs/
+.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
+# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
+#wwwroot/
-
+
-# Visual Studio 2017 auto generated files
+# Visual Studio 2017 auto generated files
-Generated\ Files/
+Generated\ Files/
-
+
-# MSTest test Results
+# MSTest test Results
-[Tt]est[Rr]esult*/
+[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
+[Bb]uild[Ll]og.*
-
+
-# NUNIT
+# NUNIT
-*.VisualState.xml
+*.VisualState.xml
-TestResult.xml
+TestResult.xml
-
+
-# Build Results of an ATL Project
+# Build Results of an ATL Project
-[Dd]ebugPS/
+[Dd]ebugPS/
-[Rr]eleasePS/
+[Rr]eleasePS/
-dlldata.c
+dlldata.c
-
+
-# Benchmark Results
+# Benchmark Results
-BenchmarkDotNet.Artifacts/
+BenchmarkDotNet.Artifacts/
-
+
-# .NET Core
+# .NET Core
-project.lock.json
+project.lock.json
-project.fragment.lock.json
+project.fragment.lock.json
-artifacts/
+artifacts/
-
+
-# StyleCop
+# StyleCop
-StyleCopReport.xml
+StyleCopReport.xml
-
+
-# Files built by Visual Studio
+# Files built by Visual Studio
-*_i.c
+*_i.c
-*_p.c
+*_p.c
-*_h.h
+*_h.h
-*.ilk
+*.ilk
-*.meta
+*.meta
-*.obj
+*.obj
-*.iobj
+*.iobj
-*.pch
+*.pch
-*.pdb
+*.pdb
-*.ipdb
+*.ipdb
-*.pgc
+*.pgc
-*.pgd
+*.pgd
-*.rsp
+*.rsp
-*.sbr
+*.sbr
-*.tlb
+*.tlb
-*.tli
+*.tli
-*.tlh
+*.tlh
-*.tmp
+*.tmp
-*.tmp_proj
+*.tmp_proj
-*_wpftmp.csproj
+*_wpftmp.csproj
-*.log
+*.log
-*.vspscc
+*.vspscc
-*.vssscc
+*.vssscc
-.builds
+.builds
-*.pidb
+*.pidb
-*.svclog
+*.svclog
-*.scc
+*.scc
-
+
-# Chutzpah Test files
+# Chutzpah Test files
-_Chutzpah*
+_Chutzpah*
-
+
-# Visual C++ cache files
+# Visual C++ cache files
-ipch/
+ipch/
-*.aps
+*.aps
-*.ncb
+*.ncb
-*.opendb
+*.opendb
-*.opensdf
+*.opensdf
-*.sdf
+*.sdf
-*.cachefile
+*.cachefile
-*.VC.db
+*.VC.db
-*.VC.VC.opendb
+*.VC.VC.opendb
-
+
-# Visual Studio profiler
+# Visual Studio profiler
-*.psess
+*.psess
-*.vsp
+*.vsp
-*.vspx
+*.vspx
-*.sap
+*.sap
-
+
-# Visual Studio Trace Files
+# Visual Studio Trace Files
-*.e2e
+*.e2e
-
+
-# TFS 2012 Local Workspace
+# TFS 2012 Local Workspace
-$tf/
+$tf/
-
+
-# Guidance Automation Toolkit
+# Guidance Automation Toolkit
-*.gpState
+*.gpState
-
+
-# ReSharper is a .NET coding add-in
+# ReSharper is a .NET coding add-in
-_ReSharper*/
+_ReSharper*/
-*.[Rr]e[Ss]harper
+*.[Rr]e[Ss]harper
-*.DotSettings.user
+*.DotSettings.user
-
+
-# JustCode is a .NET coding add-in
+# JustCode is a .NET coding add-in
-.JustCode
+.JustCode
-
+
-# TeamCity is a build add-in
+# TeamCity is a build add-in
-_TeamCity*
+_TeamCity*
-
+
-# DotCover is a Code Coverage Tool
+# DotCover is a Code Coverage Tool
-*.dotCover
+*.dotCover
-
+
-# AxoCover is a Code Coverage Tool
+# AxoCover is a Code Coverage Tool
-.axoCover/*
+.axoCover/*
-!.axoCover/settings.json
+!.axoCover/settings.json
-
+
-# Visual Studio code coverage results
+# Visual Studio code coverage results
-*.coverage
+*.coverage
-*.coveragexml
+*.coveragexml
-
+
-# NCrunch
+# NCrunch
-_NCrunch_*
+_NCrunch_*
-.*crunch*.local.xml
+.*crunch*.local.xml
-nCrunchTemp_*
+nCrunchTemp_*
-
+
-# MightyMoose
+# MightyMoose
-*.mm.*
+*.mm.*
-AutoTest.Net/
+AutoTest.Net/
-
+
-# Web workbench (sass)
+# Web workbench (sass)
-.sass-cache/
+.sass-cache/
-
+
-# Installshield output folder
+# Installshield output folder
-[Ee]xpress/
+[Ee]xpress/
-
+
-# DocProject is a documentation generator add-in
+# DocProject is a documentation generator add-in
-DocProject/buildhelp/
+DocProject/buildhelp/
-DocProject/Help/*.HxT
+DocProject/Help/*.HxT
-DocProject/Help/*.HxC
+DocProject/Help/*.HxC
-DocProject/Help/*.hhc
+DocProject/Help/*.hhc
-DocProject/Help/*.hhk
+DocProject/Help/*.hhk
-DocProject/Help/*.hhp
+DocProject/Help/*.hhp
-DocProject/Help/Html2
+DocProject/Help/Html2
-DocProject/Help/html
+DocProject/Help/html
-
+
-# Click-Once directory
+# Click-Once directory
-publish/
+publish/
-
+
-# Publish Web Output
+# Publish Web Output
-*.[Pp]ublish.xml
+*.[Pp]ublish.xml
-*.azurePubxml
+*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
+# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
+# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+*.pubxml
-*.publishproj
+*.publishproj
-
+
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
+# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
+# in these scripts will be unencrypted
-PublishScripts/
+PublishScripts/
-
+
-# NuGet Packages
+# NuGet Packages
-*.nupkg
+*.nupkg
-# The packages folder can be ignored because of Package Restore
+# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
+**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
+# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
+!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
+# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
+#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
+# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
+*.nuget.props
-*.nuget.targets
+*.nuget.targets
-
+
-# Microsoft Azure Build Output
+# Microsoft Azure Build Output
-csx/
+csx/
-*.build.csdef
+*.build.csdef
-
+
-# Microsoft Azure Emulator
+# Microsoft Azure Emulator
-ecf/
+ecf/
-rcf/
+rcf/
-
+
-# Windows Store app package directories and files
+# Windows Store app package directories and files
-AppPackages/
+AppPackages/
-BundleArtifacts/
+BundleArtifacts/
-Package.StoreAssociation.xml
+Package.StoreAssociation.xml
-_pkginfo.txt
+_pkginfo.txt
-*.appx
+*.appx
-
+
-# Visual Studio cache files
+# Visual Studio cache files
-# files ending in .cache can be ignored
+# files ending in .cache can be ignored
-*.[Cc]ache
+*.[Cc]ache
-# but keep track of directories ending in .cache
+# but keep track of directories ending in .cache
-!*.[Cc]ache/
+!*.[Cc]ache/
-
+
-# Others
+# Others
-ClientBin/
+ClientBin/
-~$*
+~$*
-*~
+*~
-*.dbmdl
+*.dbmdl
-*.dbproj.schemaview
+*.dbproj.schemaview
-*.jfm
+*.jfm
-*.pfx
+*.pfx
-*.publishsettings
+*.publishsettings
-orleans.codegen.cs
+orleans.codegen.cs
-
+
-# Including strong name files can present a security risk
+# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
+#*.snk
-
+
-# Since there are multiple workflows, uncomment next line to ignore bower_components
+# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
+#bower_components/
-
+
-# RIA/Silverlight projects
+# RIA/Silverlight projects
-Generated_Code/
+Generated_Code/
-
+
-# Backup & report files from converting an old project file
+# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
+# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
+# because we have git ;-)
-_UpgradeReport_Files/
+_UpgradeReport_Files/
-Backup*/
+Backup*/
-UpgradeLog*.XML
+UpgradeLog*.XML
-UpgradeLog*.htm
+UpgradeLog*.htm
-ServiceFabricBackup/
+ServiceFabricBackup/
-*.rptproj.bak
+*.rptproj.bak
-
+
-# SQL Server files
+# SQL Server files
-*.mdf
+*.mdf
-*.ldf
+*.ldf
-*.ndf
+*.ndf
-
+
-# Business Intelligence projects
+# Business Intelligence projects
-*.rdl.data
+*.rdl.data
-*.bim.layout
+*.bim.layout
-*.bim_*.settings
+*.bim_*.settings
-*.rptproj.rsuser
+*.rptproj.rsuser
-
+
-# Microsoft Fakes
+# Microsoft Fakes
-FakesAssemblies/
+FakesAssemblies/
-
+
-# GhostDoc plugin setting file
+# GhostDoc plugin setting file
-*.GhostDoc.xml
+*.GhostDoc.xml
-
+
-# Node.js Tools for Visual Studio
+# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
+.ntvs_analysis.dat
-node_modules/
+node_modules/
-
+
-# Visual Studio 6 build log
+# Visual Studio 6 build log
-*.plg
+*.plg
-
+
-# Visual Studio 6 workspace options file
+# Visual Studio 6 workspace options file
-*.opt
+*.opt
-
+
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
+*.vbw
-
+
-# Visual Studio LightSwitch build output
+# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
+**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
+**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
+**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
+**/*.Server/ModelManifest.xml
-_Pvt_Extensions
+_Pvt_Extensions
-
+
-# Paket dependency manager
+# Paket dependency manager
-.paket/paket.exe
+.paket/paket.exe
-paket-files/
+paket-files/
-
+
-# FAKE - F# Make
+# FAKE - F# Make
-.fake/
+.fake/
-
+
-# JetBrains Rider
+# JetBrains Rider
-.idea/
+.idea/
-*.sln.iml
+*.sln.iml
-
+
-# CodeRush personal settings
+# CodeRush personal settings
-.cr/personal
+.cr/personal
-
+
-# Python Tools for Visual Studio (PTVS)
+# Python Tools for Visual Studio (PTVS)
-__pycache__/
+__pycache__/
-*.pyc
+*.pyc
-
+
-# Cake - Uncomment if you are using it
+# Cake - Uncomment if you are using it
-# tools/**
+# tools/**
-# !tools/packages.config
+# !tools/packages.config
-
+
-# Tabs Studio
+# Tabs Studio
-*.tss
+*.tss
-
+
-# Telerik's JustMock configuration file
+# Telerik's JustMock configuration file
-*.jmconfig
+*.jmconfig
-
+
-# BizTalk build output
+# BizTalk build output
-*.btp.cs
+*.btp.cs
-*.btm.cs
+*.btm.cs
-*.odx.cs
+*.odx.cs
-*.xsd.cs
+*.xsd.cs
-
+
-# OpenCover UI analysis results
+# OpenCover UI analysis results
-OpenCover/
+OpenCover/
-
+
-# Azure Stream Analytics local run output
+# Azure Stream Analytics local run output
-ASALocalRun/
+ASALocalRun/
-
+
-# MSBuild Binary and Structured Log
+# MSBuild Binary and Structured Log
-*.binlog
+*.binlog
-
+
-# NVidia Nsight GPU debugger configuration file
+# NVidia Nsight GPU debugger configuration file
-*.nvuser
+*.nvuser
-
+
-# MFractors (Xamarin productivity tool) working folder
+# MFractors (Xamarin productivity tool) working folder
-.mfractor/
+.mfractor/
-
+
-# Local History for Visual Studio
+# Local History for Visual Studio
-.localhistory/
+.localhistory/
-gaseous-server/.DS_Store
-gaseous-server/wwwroot/emulators/EmulatorJS

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gaseous-server/wwwroot/emulators/EmulatorJS"]
+	path = gaseous-server/wwwroot/emulators/EmulatorJS
+	url = https://github.com/EmulatorJS/EmulatorJS.git

.vscode/launch.json

@@ -10,14 +10,14 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/gaseous-server/bin/Debug/net8.0/gaseous-server.dll",
+            "program": "${workspaceFolder}/gaseous-server/bin/Debug/net7.0/gaseous-server.dll",
             "args": [],
             "cwd": "${workspaceFolder}/gaseous-server",
             "stopAtEntry": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(http?://\\S+)"
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-michael.green@mrgtech.net.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

Directory.Build.props

@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="build\Version.props" />
-</Project>

Dockerfile

@@ -0,0 +1,16 @@
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
+WORKDIR /App
+EXPOSE 80
+
+# Copy everything
+COPY . ./
+# Restore as distinct layers
+RUN dotnet restore "gaseous-server/gaseous-server.csproj"
+# Build and publish a release
+RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained false -c Release -o out
+
+# Build runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
+WORKDIR /App
+COPY --from=build-env /App/out .
+ENTRYPOINT ["dotnet", "gaseous-server.dll"]

Gaseous.sln

@@ -3,7 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 25.0.1704.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gaseous-server", "gaseous-server\gaseous-server.csproj", "{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-identifier-testapp", "gaseous-identifier\gaseous-identifier-testapp.csproj", "{F5C42134-5372-430A-A9AE-1871981850DB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-signature-parser", "gaseous-signature-parser\gaseous-signature-parser.csproj", "{DAEBBB82-5051-43FD-A406-F9D64A38F468}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-romsignatureobject", "gaseous-romsignatureobject\gaseous-romsignatureobject.csproj", "{9DCD243D-37CE-4562-8411-B5242B687D4F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-signature-ingestor", "gaseous-signature-ingestor\gaseous-signature-ingestor.csproj", "{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-tools", "gaseous-tools\gaseous-tools.csproj", "{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-server", "gaseous-server\gaseous-server.csproj", "{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{17FA6F12-8532-420C-9489-CB8FDE42137C}"
 	ProjectSection(SolutionItems) = preProject
@@ -27,14 +37,34 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Release|Any CPU.ActiveCfg = Release|Any CPU

README.MD

@@ -1,53 +1,109 @@
-[![.NET](https://github.com/gaseous-project/gaseous-server/actions/workflows/dotnet.yml/badge.svg)](https://github.com/gaseous-project/gaseous-server/actions/workflows/dotnet.yml) [![CodeQL](https://github.com/gaseous-project/gaseous-server/actions/workflows/codeql.yml/badge.svg)](https://github.com/gaseous-project/gaseous-server/actions/workflows/codeql.yml) [![Build Release Docker Image](https://github.com/gaseous-project/gaseous-server/actions/workflows/BuildDockerOnTag-Release.yml/badge.svg)](https://github.com/gaseous-project/gaseous-server/actions/workflows/BuildDockerOnTag-Release.yml)
 # Gaseous Server
 
-This is the server for the Gaseous system. It offers ROM and title management, as well as some basic in browser emulation of those ROMs.
+This is the server for the Gaseous system. All your games and metadata are stored within.
-
-## Warning
-
-Versions 1.6.1 and earlier are not suitable for being exposed to the internet, as:
-1. there is no authentication support, meaning anyone could trash your library
-2. the server has not been hardened for exposure to the internet - so there maybe unknown vulnerabilities
-
-If you expose one of these earlier versions of the server to the internet, **you do so at your own risk**.
-
-Version 1.7.0 and later contain user authentication, and can be exposed to the internet. However, it is recommended to no expose the server to the internet if you're not actively using it remotely, or if you have alternative means to access it remotely like a VPN.
-
-While we do our best to stay on top of server security, if you expose the server to the internet **you do so at your own risk**.
 
 ## Screenshots
 ![Library](./screenshots/Library.png)
 ![Game](./screenshots/Game.png)
-![Emulator](./screenshots/Emulator.png)
-
 
 ## Requirements
-* MariaDB 11.1.2 (preferred) or MySQL Server 8+
+* MySQL Server 8+
-  * These are the database versions Gaseous has been tested and developed against. Your mileage may vary with earlier versions.
-  * MariaDB is the preferred database server, while MySQL will continue to be supported for existing users (they should be interchangable).
-  * Note that due to the earlier database schema using MySQL specific features, moving to MariaDB from MySQL will require rebuilding your database from scratch. The "Library Scan" background task can be used to re-import all titles.
 * Internet Game Database API Key. See: https://api-docs.igdb.com/#account-creation
 
-If using the provided docker-compose.yml, MariaDB will be installed for you.
-
-## Friends of Gaseous
-* [EmulatorJS](https://github.com/EmulatorJS/EmulatorJS): A fantastic (and fast) Javascript based implementation of RetroArch, supporting a wide variety of platforms. Discord: https://discord.gg/6akryGkETU
-* [RomM](https://github.com/zurdi15/romm): Another self hosted ROM manager. Discord: https://discord.gg/P5HtHnhUDH
-
 ## Third Party Projects
 The following projects are used by Gaseous
-* [ASP.NET](https://dotnet.microsoft.com/en-us/apps/aspnet)
+* https://dotnet.microsoft.com/en-us/apps/aspnet
-* [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
+* https://github.com/JamesNK/Newtonsoft.Json
-* [MySQLConnector](https://mysqlconnector.net)
+* https://www.nuget.org/packages/MySql.Data/8.0.32.1
-* [IGDB-DOTNET](https://github.com/kamranayub/igdb-dotnet)
+* https://github.com/kamranayub/igdb-dotnet
-* [EmulatorJS](https://github.com/EmulatorJS/EmulatorJS)
+* https://github.com/EmulatorJS/EmulatorJS
 
-## Discord Server
+## Configuration File
-[![Join our Discord server!](https://invite.casperiv.dev/?inviteCode=Nhu7wpT3k4&format=svg)](https://discord.gg/Nhu7wpT3k4)
+When Gaseous-Server is started for the first time, it creates a configuration file at ~/.gaseous-server/config.json if it doesn't exist. Some values can be filled in using environment variables (such as in the case of using docker).
 
-# Installation
+### DatabaseConfiguration
-See https://github.com/gaseous-project/gaseous-server/wiki/Installation for installation instructions.
+| Attribute | Environment Variable |
+| --------- | -------------------- |
+| HostName  | dbhost               |
+| UserName  | dbuser               |
+| Password  | dbpass               |
 
-# Adding Content
+### IGDBConfiguration
-1. Import signatures: see https://github.com/gaseous-project/gaseous-server/wiki/Signatures
+| Attribute | Environment Variable |
-2. Add ROMs: see https://github.com/gaseous-project/gaseous-server/wiki/Adding-ROMs
+| --------- | -------------------- |
+| ClientId  | igdbclientid         |
+| Secret.   | igdbclientsecret     |
+
+### config.json
+```json
+{
+  "DatabaseConfiguration": {
+    "HostName": "localhost",
+    "UserName": "gaseous",
+    "Password": "gaseous",
+    "DatabaseName": "gaseous",
+    "Port": 3306
+  },
+  "IGDBConfiguration": {
+    "ClientId": "<clientid>",
+    "Secret": "<secret>"
+  },
+  "LoggingConfiguration": {
+    "DebugLogging": false,
+    "LogFormat": "text"
+  }
+}
+
+```
+
+## Deploy with Docker
+Dockerfile and docker-compose.yml files have been provided to make deployment of the server as easy as possible.
+1. Download the docker-compose.yml file
+2. Open the docker-compose.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
+3. Run the command "docker-compose up -d"
+4. Connect to the host on port 5198
+
+## Build and Deploy with Docker
+Dockerfile and docker-compose-build.yml files have been provided to make deployment of the server as easy as possible.
+1. Clone the repo with "git clone https://github.com/gaseous-project/gaseous-server.git"
+2. Change into the gaseous-server directory
+3. Open the docker-compose-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
+4. Run the command "docker-compose up --file docker-compose-build.yml -d"
+5. Connect to the host on port 5198
+
+## Adding Content
+While games can be added to the server without them, it is recommended adding some signature DAT files beforehand to allow for better matching of ROM to game.
+
+These signature DAT files contain a list of titles with hashes for many of the ROM images that have been found by the community.
+
+Currently only TOSEC is supported, though more will be added.
+
+### Adding signature DAT files
+1. Download the DAT files from the source website. For example; from https://www.tosecdev.org/downloads/category/56-2023-01-23
+2. Extract the archive
+3. Copy the DAT files to ~/.gaseous-server/Data/Signatures/TOSEC/
+
+### Adding game image files
+1. Ensure your game image file is unzipped, and clearly named. Attempting a search for the game name on https://www.igdb.com can help with file naming. If a hash search is unsuccessful, Gaseous will fall back to attempting to search by the file name.
+2. Copy the file to ~/.gaseous-server/Data/Import
+
+Image to game matching follows the following order of operations, stopping the process at the first match:
+### Get the file signature
+1. Attempt a hash search
+2. Attempt to search the signature database for a rom matching the file name - sometimes the hash can not be matched as a highscore table for example was saved to the image
+3. Attempt to parse the file name - clues such as the extension being used to define which platform the file belongs to are used to create a search criteria
+
+### Create a list of search candidates
+Before beginning, remove any version numbers.
+1. Add the full name of the image
+2. Add the name of the image with any " - " replaced by ": "
+3. Add the name of the image with text after a " - " removed
+4. Add the name of the image with text after a ": " removed
+
+### Search IGDB for a game match
+Loop through each of the search candidates searching using:
+1. "where" - exact match as the search candidate
+2. "wherefuzzy" - partial match using wildcards
+3. "search" - uses a more flexible search method
+
+Note: that if more than one result is found, the image will be set as "Unknown" as there is no way for Gaseous to know which title is the correct one.

build/Dockerfile

@@ -1,41 +0,0 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
-ARG TARGETARCH
-ARG BUILDPLATFORM
-WORKDIR /App
-EXPOSE 80
-
-RUN echo "Target: $TARGETARCH"
-RUN echo "Build: $BUILDPLATFORM"
-
-# Copy everything
-COPY .. ./
-# Restore as distinct layers
-RUN dotnet restore "gaseous-server/gaseous-server.csproj" -a $TARGETARCH
-# Build and publish a release
-RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained true -c Release -o out -a $TARGETARCH
-
-# disabled for 1.7.4 as the next version EmulatorJS is not yet available
-# # update apt-get
-# RUN apt-get update
-
-# # download and unzip EmulatorJS from CDN
-# RUN apt-get install -y p7zip-full
-# RUN mkdir -p out/wwwroot/emulators/EmulatorJS
-# RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z
-# RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z
-RUN wget --recursive --no-parent https://cdn.emulatorjs.org/latest/
-RUN mkdir -p out/wwwroot/emulators/EmulatorJS
-RUN cp -fr cdn.emulatorjs.org/latest/* out/wwwroot/emulators/EmulatorJS
-RUN rm -Rf cdn.emulatorjs.org
-
-# clean up apt-get
-RUN apt-get clean && rm -rf /var/lib/apt/lists
-
-# Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
-ENV INDOCKER=1
-WORKDIR /App
-COPY --from=build-env /App/out .
-
-# start gaseous-server
-ENTRYPOINT ["dotnet", "gaseous-server.dll"]

build/Dockerfile-EmbeddedDB

@@ -1,61 +0,0 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
-ARG TARGETARCH
-ARG BUILDPLATFORM
-WORKDIR /App
-EXPOSE 80
-
-RUN echo "Target: $TARGETARCH"
-RUN echo "Build: $BUILDPLATFORM"
-
-# Copy everything
-COPY .. ./
-# Restore as distinct layers
-RUN dotnet restore "gaseous-server/gaseous-server.csproj" -a $TARGETARCH
-# Build and publish a release
-RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained true -c Release -o out -a $TARGETARCH
-
-# disabled for 1.7.4 as the next version EmulatorJS is not yet available
-# # update apt-get
-# RUN apt-get update
-
-# # download and unzip EmulatorJS from CDN
-# RUN apt-get install -y p7zip-full
-# RUN mkdir -p out/wwwroot/emulators/EmulatorJS
-# RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z
-# RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z
-RUN wget --recursive --no-parent https://cdn.emulatorjs.org/latest/
-RUN mkdir -p out/wwwroot/emulators/EmulatorJS
-RUN cp -fr cdn.emulatorjs.org/latest/* out/wwwroot/emulators/EmulatorJS
-RUN rm -Rf cdn.emulatorjs.org
-
-# Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
-ENV INDOCKER=1
-WORKDIR /App
-COPY --from=build-env /App/out .
-
-# variables
-ENV dbhost=localhost
-ENV dbuser=root
-ENV dbpass=gaseous
-ENV MARIADB_ROOT_PASSWORD=$dbpass
-
-# install mariadb
-RUN DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && apt-get install -y mariadb-server
-RUN mkdir -p /run/mysqld
-COPY ../build/mariadb.sh /usr/sbin/start-mariadb.sh
-RUN chmod +x /usr/sbin/start-mariadb.sh
-
-# install supervisord
-RUN apt-get install -y supervisor
-COPY ../build/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# clean up apt-get
-RUN apt-get clean && rm -rf /var/lib/apt/lists
-
-# volumes
-VOLUME /root/.gaseous-server /var/lib/mysql
-
-# start services
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

build/Version.props

@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Version>1.5.0</Version>
-  </PropertyGroup>
-</Project>

build/mariadb.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Wait for the service to start
-while ! mysqladmin ping -h localhost --silent; do
-    sleep 1
-done
-
-# Set the root password
-mariadb -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$MARIADB_ROOT_PASSWORD';"

build/supervisord.conf

@@ -1,31 +0,0 @@
-[supervisord]
-user=root
-nodaemon=true
-logfile=/dev/null
-logfile_maxbytes=0
-pidfile=/var/run/supervisord.pid
-loglevel = INFO
-
-[program:mariadb]
-command=/usr/sbin/mariadbd --user=root
-autostart=true
-autorestart=true
-redirect_stderr=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-
-[program:mariadb-setup]
-command=bash -c "/usr/sbin/start-mariadb.sh"
-autostart=true
-autorestart=false
-redirect_stderr=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-
-[program:gaseous-server]
-command=dotnet /App/gaseous-server.dll
-autostart=true
-autorestart=true
-redirect_stderr=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0

docker-compose-build.yml

@@ -14,7 +14,6 @@ services:
     volumes:
       - gs:/root/.gaseous-server
     environment:
-      - TZ=Australia/Sydney
       - dbhost=gsdb
       - dbuser=root
       - dbpass=gaseous
@@ -22,16 +21,16 @@ services:
       - igdbclientsecret=<clientsecret>
   gsdb:
     container_name: gsdb
-    image: mariadb
+    image: mysql:8
     restart: unless-stopped
     networks:
       - gaseous
     volumes:
       - gsdb:/var/lib/mysql
     environment:
-      - MARIADB_ROOT_PASSWORD=gaseous
+      - MYSQL_ROOT_PASSWORD=gaseous
-      - MARIADB_USER=gaseous
+      - MYSQL_USER=gaseous
-      - MARIADB_PASSWORD=gaseous
+      - MYSQL_PASSWORD=gaseous
 networks:
   gaseous:
     driver: bridge

docker-compose.yml

@@ -13,7 +13,6 @@ services:
     volumes:
       - gs:/root/.gaseous-server
     environment:
-      - TZ=Australia/Sydney
       - dbhost=gsdb
       - dbuser=root
       - dbpass=gaseous
@@ -21,16 +20,16 @@ services:
       - igdbclientsecret=<clientsecret>
   gsdb:
     container_name: gsdb
-    image: mariadb
+    image: mysql:8
     restart: unless-stopped
     networks:
       - gaseous
     volumes:
       - gsdb:/var/lib/mysql
     environment:
-      - MARIADB_ROOT_PASSWORD=gaseous
+      - MYSQL_ROOT_PASSWORD=gaseous
-      - MARIADB_USER=gaseous
+      - MYSQL_USER=gaseous
-      - MARIADB_PASSWORD=gaseous
+      - MYSQL_PASSWORD=gaseous
 networks:
   gaseous:
     driver: bridge

gaseous-identifier/Program.cs

@@ -0,0 +1,183 @@
+// parse command line
+using System.Security.Cryptography;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using gaseous_romsignatureobject;
+using gaseous_signature_parser.parsers;
+
+string[] commandLineArgs = Environment.GetCommandLineArgs();
+
+string scanPath = "./";
+string tosecXML = "";
+
+string inArgument = "";
+foreach (string commandLineArg in commandLineArgs)
+{
+    if (commandLineArg != commandLineArgs[0])
+    {
+        if (inArgument == "")
+        {
+            switch (commandLineArg.ToLower())
+            {
+                case "-scanpath":
+                    inArgument = commandLineArg.ToLower();
+                    break;
+                case "-tosecpath":
+                    inArgument = commandLineArg.ToLower();
+                    break;
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            switch (inArgument)
+            {
+                case "-scanpath":
+                    scanPath = commandLineArg;
+                    break;
+                case "-tosecpath":
+                    tosecXML = commandLineArg;
+                    break;
+                default:
+                    break;
+            }
+            inArgument = "";
+        }
+    }
+}
+
+scanPath = Path.GetFullPath(scanPath);
+Console.WriteLine("ROM search path: " + scanPath);
+
+List<RomSignatureObject> romSignatures = new List<RomSignatureObject>();
+System.Collections.ArrayList availablePlatforms = new System.Collections.ArrayList();
+
+// load TOSEC XML files
+if (tosecXML != null && tosecXML.Length > 0)
+{
+    tosecXML = Path.GetFullPath(tosecXML);
+    Console.WriteLine("TOSEC is enabled");
+    Console.WriteLine("TOSEC XML search path: " + tosecXML);
+
+    string[] tosecPathContents = Directory.GetFiles(tosecXML);
+    int lastCLILineLength = 0;
+    for (UInt16 i = 0; i < tosecPathContents.Length; ++i)
+    {
+        string tosecXMLFile = tosecPathContents[i];
+
+        TosecParser tosecParser = new TosecParser();
+        RomSignatureObject tosecObject = tosecParser.Parse(tosecXMLFile);
+
+        string statusOutput = i + " / " + tosecPathContents.Length + " : " + Path.GetFileName(tosecXMLFile);
+        Console.Write("\r " + statusOutput.PadRight(lastCLILineLength, ' ') + "\r");
+        lastCLILineLength = statusOutput.Length;
+
+        foreach (RomSignatureObject.Game gameRom in tosecObject.Games)
+        {
+            if (!availablePlatforms.Contains(gameRom.System))
+            {
+                availablePlatforms.Add(gameRom.System);
+            }
+        }
+
+        romSignatures.Add(tosecObject);
+    }
+    Console.WriteLine("");
+} else
+{
+    Console.WriteLine("TOSEC is disabled.");
+}
+Console.WriteLine(romSignatures.Count + " TOSEC files loaded");
+
+// Summarise signatures
+if (availablePlatforms.Count > 0)
+{
+    availablePlatforms.Sort();
+    Console.WriteLine("Platforms loaded:");
+    foreach (string platform in availablePlatforms)
+    {
+        Console.WriteLine(" * " + platform);
+    }
+}
+
+Console.WriteLine("Examining files");
+string[] romPathContents = Directory.GetFiles(scanPath);
+foreach (string romFile in romPathContents)
+{
+    Console.WriteLine("Checking " + romFile);
+
+    var stream = File.OpenRead(romFile);
+
+    var md5 = MD5.Create();
+    byte[] md5HashByte = md5.ComputeHash(stream);
+    string md5Hash = BitConverter.ToString(md5HashByte).Replace("-", "").ToLowerInvariant();
+
+    var sha1 = SHA1.Create();
+    byte[] sha1HashByte = sha1.ComputeHash(stream);
+    string sha1Hash = BitConverter.ToString(sha1HashByte).Replace("-", "").ToLowerInvariant();
+
+    bool gameFound = false;
+    foreach (RomSignatureObject tosecList in romSignatures)
+    {
+        foreach (RomSignatureObject.Game gameObject in tosecList.Games)
+        {
+            foreach (RomSignatureObject.Game.Rom romObject in gameObject.Roms)
+            {
+                if (romObject.Md5 != null)
+                {
+                    if (md5Hash == romObject.Md5.ToLowerInvariant())
+                    {
+                        // match
+                        gameFound = true;
+                    }
+                }
+                if (romObject.Sha1 != null)
+                {
+                    if (md5Hash == romObject.Sha1.ToLowerInvariant())
+                    {
+                        // match
+                        gameFound = true;
+                    }
+                }
+                if (gameFound == true)
+                {
+                    Console.WriteLine(romObject.Name);
+
+                    RomSignatureObject.Game gameSignature = gameObject;
+                    gameSignature.Roms.Clear();
+                    gameSignature.Roms.Add(romObject);
+
+                    var jsonSerializerSettings = new JsonSerializerSettings();
+                    jsonSerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+                    jsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore;
+                    Console.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(gameSignature, Newtonsoft.Json.Formatting.Indented, jsonSerializerSettings));
+                    break;
+                }
+            }
+            if (gameFound == true) { break; }
+        }
+        if (gameFound == true) { break; }
+    }
+    if (gameFound == false)
+    {
+        Console.WriteLine("File not found in TOSEC library");
+    }
+}
+
+string SearchTitle = "California Games";
+foreach (RomSignatureObject romSignatureObject in romSignatures)
+{
+    foreach (RomSignatureObject.Game gameObject in romSignatureObject.Games)
+    {
+        if (gameObject.Name == SearchTitle)
+        {
+            var jsonSerializerSettings = new JsonSerializerSettings();
+            jsonSerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+            jsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore;
+            Console.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(gameObject, Newtonsoft.Json.Formatting.Indented, jsonSerializerSettings));
+        }
+    }
+}

gaseous-identifier/gaseous-identifier-testapp.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <RootNamespace>gaseous_identifier</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Newtonsoft.Json" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\gaseous-romsignatureobject\gaseous-romsignatureobject.csproj" />
+    <ProjectReference Include="..\gaseous-signature-parser\gaseous-signature-parser.csproj" />
+  </ItemGroup>
+</Project>

gaseous-romsignatureobject/RomSignatureObject.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+
+namespace gaseous_romsignatureobject
+{
+    /// <summary>
+    /// Object returned by all signature engines containing metadata about the ROM's in the data files
+    ///
+    /// This class was based on the TOSEC dataset, so may need to be expanded as new signature engines are added
+    /// </summary>
+	public class RomSignatureObject
+    {
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+        public string? Category { get; set; }
+        public string? Version { get; set; }
+        public string? Author { get; set; }
+        public string? Email { get; set; }
+        public string? Homepage { get; set; }
+        public Uri? Url { get; set; }
+        public string? SourceType { get; set; }
+        public string SourceMd5 { get; set; } = "";
+        public string SourceSHA1 { get; set; } = "";
+
+        public List<Game> Games { get; set; } = new List<Game>();
+
+        public class Game
+        {
+            public string? Name { get; set; }
+            public string? Description { get; set; }
+            public string? Year { get; set; }
+            public string? Publisher { get; set; }
+            public DemoTypes Demo { get; set; }
+            public string? System { get; set; }
+            public string? SystemVariant { get; set; }
+            public string? Video { get; set; }
+            public string? Country { get; set; }
+            public string? Language { get; set; }
+            public string? Copyright { get; set; }
+            public List<Rom> Roms { get; set; } = new List<Rom>();
+            public int RomCount
+            {
+                get
+                {
+                    return Roms.Count();
+                }
+            }
+
+            public enum DemoTypes
+            {
+                NotDemo = 0,
+                demo = 1,
+                demo_kiosk = 2,
+                demo_playable = 3,
+                demo_rolling = 4,
+                demo_slideshow = 5
+            }
+
+            public class Rom
+            {
+                public string? Name { get; set; }
+                public UInt64? Size { get; set; }
+                public string? Crc { get; set; }
+                public string? Md5 { get; set; }
+                public string? Sha1 { get; set; }
+
+                public string? DevelopmentStatus { get; set; }
+
+                public List<string> flags { get; set; } = new List<string>();
+
+                public RomTypes RomType { get; set; }
+                public string? RomTypeMedia { get; set; }
+                public string? MediaLabel { get; set; }
+
+                public SignatureSourceType SignatureSource { get; set; }
+
+                public enum SignatureSourceType
+                {
+                    None = 0,
+                    TOSEC = 1
+                }
+
+                public enum RomTypes
+                {
+                    /// <summary>
+                    /// Media type is unknown
+                    /// </summary>
+                    Unknown = 0,
+
+                    /// <summary>
+                    /// Optical media
+                    /// </summary>
+                    Disc = 1,
+
+                    /// <summary>
+                    /// Magnetic media
+                    /// </summary>
+                    Disk = 2,
+
+                    /// <summary>
+                    /// Individual files
+                    /// </summary>
+                    File = 3,
+
+                    /// <summary>
+                    /// Individual pars
+                    /// </summary>
+                    Part = 4,
+
+                    /// <summary>
+                    /// Tape base media
+                    /// </summary>
+                    Tape = 5,
+
+                    /// <summary>
+                    /// Side of the media
+                    /// </summary>
+                    Side = 6
+                }
+            }
+
+        }
+    }
+}
+

gaseous-romsignatureobject/gaseous-romsignatureobject.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <RootNamespace>gaseous_romsignatureobject</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+</Project>

gaseous-server/Classes/Auth/Classes/IdentityRole.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that implements the ASP.NET Identity
-    /// IRole interface 
-    /// </summary>
-    public class ApplicationRole : IdentityRole
-    {
-    }
-}

gaseous-server/Classes/Auth/Classes/IdentityUser.cs

@@ -1,17 +0,0 @@
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using System;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that implements the ASP.NET Identity
-    /// IUser interface 
-    /// </summary>
-    public class ApplicationUser : IdentityUser
-    {
-        public SecurityProfileViewModel SecurityProfile { get; set; }
-        public List<UserPreferenceViewModel> UserPreferences { get; set; }
-        public Guid Avatar { get; set; }
-    }
-}

gaseous-server/Classes/Auth/Classes/RoleStore.cs

@@ -1,171 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using MySqlConnector;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that implements the key ASP.NET Identity role store iterfaces
-    /// </summary>
-    public class RoleStore : IQueryableRoleStore<ApplicationRole>
-    {
-        private RoleTable roleTable;
-        public Database Database { get; private set; }
-
-        public IQueryable<ApplicationRole> Roles
-        {
-            get
-            {
-                List<ApplicationRole> roles = roleTable.GetRoles();
-                return roles.AsQueryable();
-            }
-        }
-
-        public RoleStore()
-        {
-            Database = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            roleTable = new RoleTable(Database);
-        }
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase as argument 
-        /// </summary>
-        /// <param name="database"></param>
-        public RoleStore(Database database)
-        {
-            Database = database;
-            roleTable = new RoleTable(database);
-        }
-
-        public Task<IdentityResult> CreateAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            roleTable.Insert(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<IdentityResult> DeleteAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            roleTable.Delete(role.Id);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<ApplicationRole> FindByIdAsync(string roleId, CancellationToken cancellationToken)
-        {
-            ApplicationRole result = roleTable.GetRoleById(roleId) as ApplicationRole;
-
-            return Task.FromResult<ApplicationRole>(result);
-        }
-
-        public Task<bool> RoleExistsAsync(string roleId, CancellationToken cancellationToken)
-        {
-            ApplicationRole? result = roleTable.GetRoleById(roleId) as ApplicationRole;
-
-            if (result == null)
-            {
-                return Task.FromResult<bool>(false);
-            }
-            else
-            {
-                return Task.FromResult<bool>(true);
-            }
-        }
-
-        public Task<ApplicationRole?> FindByNameAsync(string roleName, CancellationToken cancellationToken)
-        {
-            ApplicationRole? result = roleTable.GetRoleByName(roleName) as ApplicationRole;
-
-            return Task.FromResult<ApplicationRole?>(result);
-        }
-
-        public Task<IdentityResult> UpdateAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            roleTable.Update(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public void Dispose()
-        {
-            if (Database != null)
-            {
-                Database = null;
-            }
-        }
-
-        public Task<string> GetRoleIdAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role != null)
-            {
-                return Task.FromResult<string>(roleTable.GetRoleId(role.Name));
-            }
-
-            return Task.FromResult<string>(null);
-        }
-
-        public Task<string?> GetRoleNameAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role != null)
-            {
-                return Task.FromResult<string?>(roleTable.GetRoleName(role.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task SetRoleNameAsync(ApplicationRole role, string? roleName, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            role.Name = roleName;
-            roleTable.Update(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<string?> GetNormalizedRoleNameAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role != null)
-            {
-                return Task.FromResult<string?>(roleTable.GetRoleName(role.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task SetNormalizedRoleNameAsync(ApplicationRole role, string? normalizedName, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            role.Name = normalizedName;
-            roleTable.Update(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/RoleTable.cs

@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the Role table in the MySQL Database
-    /// </summary>
-    public class RoleTable 
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public RoleTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Deltes a role from the Roles table
-        /// </summary>
-        /// <param name="roleId">The role Id</param>
-        /// <returns></returns>
-        public int Delete(string roleId)
-        {
-            string commandText = "Delete from Roles where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", roleId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new Role in the Roles table
-        /// </summary>
-        /// <param name="roleName">The role's name</param>
-        /// <returns></returns>
-        public int Insert(ApplicationRole role)
-        {
-            string commandText = "Insert into Roles (Id, Name) values (@id, @name)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@name", role.Name);
-            parameters.Add("@id", role.Id);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Returns a role name given the roleId
-        /// </summary>
-        /// <param name="roleId">The role Id</param>
-        /// <returns>Role name</returns>
-        public string? GetRoleName(string roleId)
-        {
-            string commandText = "Select Name from Roles where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", roleId);
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-            
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns the role Id given a role name
-        /// </summary>
-        /// <param name="roleName">Role's name</param>
-        /// <returns>Role's Id</returns>
-        public string? GetRoleId(string roleName)
-        {
-            string? roleId = null;
-            string commandText = "Select Id from Roles where Name = @name";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@name", roleName } };
-
-            DataTable result = _database.ExecuteCMD(commandText, parameters);
-            if (result.Rows.Count > 0)
-            {
-                return Convert.ToString(result.Rows[0][0]);
-            }
-
-            return roleId;
-        }
-
-        /// <summary>
-        /// Gets the ApplicationRole given the role Id
-        /// </summary>
-        /// <param name="roleId"></param>
-        /// <returns></returns>
-        public ApplicationRole? GetRoleById(string roleId)
-        {
-            var roleName = GetRoleName(roleId);
-            ApplicationRole? role = null;
-
-            if(roleName != null)
-            {
-                role = new ApplicationRole();
-                role.Id = roleId;
-                role.Name = roleName;
-                role.NormalizedName = roleName.ToUpper();
-            }
-
-            return role;
-
-        }
-
-        /// <summary>
-        /// Gets the ApplicationRole given the role name
-        /// </summary>
-        /// <param name="roleName"></param>
-        /// <returns></returns>
-        public ApplicationRole? GetRoleByName(string roleName)
-        {
-            var roleId = GetRoleId(roleName);
-            ApplicationRole role = null;
-
-            if (roleId != null)
-            {
-                role = new ApplicationRole();
-                role.Id = roleId;
-                role.Name = roleName;
-                role.NormalizedName = roleName.ToUpper();
-            }
-
-            return role;
-        }
-
-        public int Update(ApplicationRole role)
-        {
-            string commandText = "Update Roles set Name = @name where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", role.Id);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        public List<ApplicationRole> GetRoles()
-        {
-            List<ApplicationRole> roles = new List<ApplicationRole>();
-
-            string commandText = "Select Name from Roles";
-
-            var rows = _database.ExecuteCMDDict(commandText);
-            foreach(Dictionary<string, object> row in rows)
-            {
-                ApplicationRole role = (ApplicationRole)Activator.CreateInstance(typeof(ApplicationRole));
-                role.Id = (string)row["Id"];
-                role.Name = (string)row["Name"];
-                role.NormalizedName = ((string)row["Name"]).ToUpper();
-                roles.Add(role);
-            }
-
-            return roles;
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserClaimsTable.cs

@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Security.Claims;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the UserClaims table in the MySQL Database
-    /// </summary>
-    public class UserClaimsTable
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserClaimsTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Returns a ClaimsIdentity instance given a userId
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public ClaimsIdentity FindByUserId(string userId)
-        {
-            ClaimsIdentity claims = new ClaimsIdentity();
-            string commandText = "Select * from UserClaims where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@UserId", userId } };
-
-            var rows = _database.ExecuteCMD(commandText, parameters).Rows;
-            foreach (DataRow row in rows)
-            {
-                Claim claim = new Claim((string)row["ClaimType"], (string)row["ClaimValue"]);
-                claims.AddClaim(claim);
-            }
-
-            return claims;
-        }
-
-        /// <summary>
-        /// Deletes all claims from a user given a userId
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public int Delete(string userId)
-        {
-            string commandText = "Delete from UserClaims where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new claim in UserClaims table
-        /// </summary>
-        /// <param name="userClaim">User's claim to be added</param>
-        /// <param name="userId">User's id</param>
-        /// <returns></returns>
-        public int Insert(Claim userClaim, string userId)
-        {
-            string commandText = "Insert into UserClaims (ClaimValue, ClaimType, UserId) values (@value, @type, @userId)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("value", userClaim.Value);
-            parameters.Add("type", userClaim.Type);
-            parameters.Add("userId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Deletes a claim from a user 
-        /// </summary>
-        /// <param name="user">The user to have a claim deleted</param>
-        /// <param name="claim">A claim to be deleted from user</param>
-        /// <returns></returns>
-        public int Delete(IdentityUser user, Claim claim)
-        {
-            string commandText = "Delete from UserClaims where UserId = @userId and @ClaimValue = @value and ClaimType = @type";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", user.Id);
-            parameters.Add("value", claim.Value);
-            parameters.Add("type", claim.Type);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserLoginsTable.cs

@@ -1,117 +0,0 @@
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using System.Collections.Generic;
-using System.Data;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the UserLogins table in the MySQL Database
-    /// </summary>
-    public class UserLoginsTable
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserLoginsTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Deletes a login from a user in the UserLogins table
-        /// </summary>
-        /// <param name="user">User to have login deleted</param>
-        /// <param name="login">Login to be deleted from user</param>
-        /// <returns></returns>
-        public int Delete(IdentityUser user, UserLoginInfo login)
-        {
-            string commandText = "Delete from UserLogins where UserId = @userId and LoginProvider = @loginProvider and ProviderKey = @providerKey";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("UserId", user.Id);
-            parameters.Add("loginProvider", login.LoginProvider);
-            parameters.Add("providerKey", login.ProviderKey);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Deletes all Logins from a user in the UserLogins table
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public int Delete(string userId)
-        {
-            string commandText = "Delete from UserLogins where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("UserId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new login in the UserLogins table
-        /// </summary>
-        /// <param name="user">User to have new login added</param>
-        /// <param name="login">Login to be added</param>
-        /// <returns></returns>
-        public int Insert(IdentityUser user, UserLoginInfo login)
-        {
-            string commandText = "Insert into UserLogins (LoginProvider, ProviderKey, UserId) values (@loginProvider, @providerKey, @userId)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("loginProvider", login.LoginProvider);
-            parameters.Add("providerKey", login.ProviderKey);
-            parameters.Add("userId", user.Id);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Return a userId given a user's login
-        /// </summary>
-        /// <param name="userLogin">The user's login info</param>
-        /// <returns></returns>
-        public string? FindUserIdByLogin(UserLoginInfo userLogin)
-        {
-            string commandText = "Select UserId from UserLogins where LoginProvider = @loginProvider and ProviderKey = @providerKey";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("loginProvider", userLogin.LoginProvider);
-            parameters.Add("providerKey", userLogin.ProviderKey);
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-            
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of user's logins
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public List<UserLoginInfo> FindByUserId(string userId)
-        {
-            List<UserLoginInfo> logins = new List<UserLoginInfo>();
-            string commandText = "Select * from UserLogins where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@userId", userId } };
-
-            var rows = _database.ExecuteCMD(commandText, parameters).Rows;
-            foreach (DataRow row in rows)
-            {
-                var login = new UserLoginInfo((string)row["LoginProvider"], (string)row["ProviderKey"], (string)row["LoginProvider"]);
-                logins.Add(login);
-            }
-
-            return logins;
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserRoleTable.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the UserRoles table in the MySQL Database
-    /// </summary>
-    public class UserRolesTable
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserRolesTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Returns a list of user's roles
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public List<string> FindByUserId(string userId)
-        {
-            List<string> roles = new List<string>();
-            string commandText = "Select Roles.Name from UserRoles, Roles where UserRoles.UserId = @userId and UserRoles.RoleId = Roles.Id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@userId", userId);
-
-            var rows = _database.ExecuteCMD(commandText, parameters).Rows;
-            foreach(DataRow row in rows)
-            {
-                roles.Add((string)row["Name"]);
-            }
-
-            return roles;
-        }
-
-        /// <summary>
-        /// Deletes all roles from a user in the UserRoles table
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public int Delete(string userId)
-        {
-            string commandText = "Delete from UserRoles where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("UserId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        public int DeleteUserFromRole(string userId, string roleId)
-        {
-            string commandText = "Delete from UserRoles where UserId = @userId and RoleId = @roleId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", userId);
-            parameters.Add("roleId", roleId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new role for a user in the UserRoles table
-        /// </summary>
-        /// <param name="user">The User</param>
-        /// <param name="roleId">The Role's id</param>
-        /// <returns></returns>
-        public int Insert(IdentityUser user, string roleId)
-        {
-            string commandText = "Insert into UserRoles (UserId, RoleId) values (@userId, @roleId)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", user.Id);
-            parameters.Add("roleId", roleId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserStore.cs

@@ -1,616 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using MySqlConnector;
-
-namespace Authentication
-{
-    public class UserStore : 
-        IUserStore<ApplicationUser>,
-        IUserRoleStore<ApplicationUser>,
-        IUserLoginStore<ApplicationUser>,
-        IUserClaimStore<ApplicationUser>,
-        IUserPasswordStore<ApplicationUser>,
-        IUserSecurityStampStore<ApplicationUser>,
-        IQueryableUserStore<ApplicationUser>,
-        IUserEmailStore<ApplicationUser>,
-        IUserPhoneNumberStore<ApplicationUser>,
-        IUserTwoFactorStore<ApplicationUser>,
-        IUserLockoutStore<ApplicationUser>
-    {
-        private Database database;
-
-        private UserTable<ApplicationUser> userTable;
-        private RoleTable roleTable;
-        private UserRolesTable userRolesTable;
-        private UserLoginsTable userLoginsTable;
-        private UserClaimsTable userClaimsTable;
-
-        public UserStore()
-        {
-            database = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            userTable = new UserTable<ApplicationUser>(database);
-            roleTable = new RoleTable(database);
-            userRolesTable = new UserRolesTable(database);
-            userLoginsTable = new UserLoginsTable(database);
-            userClaimsTable = new UserClaimsTable(database);
-        }
-
-        public UserStore(Database database)
-        {
-            this.database = database;
-            userTable = new UserTable<ApplicationUser>(database);
-            roleTable = new RoleTable(database);
-            userRolesTable = new UserRolesTable(database);
-            userLoginsTable = new UserLoginsTable(database);
-            userClaimsTable = new UserClaimsTable(database);
-        }
-
-        public IQueryable<ApplicationUser> Users
-        {
-            get
-            {
-                List<ApplicationUser> users = userTable.GetUsers();
-                return users.AsQueryable();
-            }
-        }
-
-        public Task AddClaimsAsync(ApplicationUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (claims == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            foreach (Claim claim in claims)
-            {
-                userClaimsTable.Insert(claim, user.Id);
-            }
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task AddLoginAsync(ApplicationUser user, UserLoginInfo login, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (login == null)
-            {
-                throw new ArgumentNullException("login");
-            }
-
-            userLoginsTable.Insert(user, login);
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task AddToRoleAsync(ApplicationUser user, string roleName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (string.IsNullOrEmpty(roleName))
-            {
-                throw new ArgumentException("Argument cannot be null or empty: roleName.");
-            }
-
-            string roleId = roleTable.GetRoleId(roleName);
-            if (!string.IsNullOrEmpty(roleId))
-            {
-                userRolesTable.Insert(user, roleId);
-            }
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task<IdentityResult> CreateAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            userTable.Insert(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<IdentityResult> DeleteAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                userTable.Delete(user);
-            }
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public void Dispose()
-        {
-            if (database != null)
-            {
-                database = null;
-            }
-        }
-
-        public Task<ApplicationUser?> FindByEmailAsync(string normalizedEmail, CancellationToken cancellationToken)
-        {
-            if (String.IsNullOrEmpty(normalizedEmail))
-            {
-                throw new ArgumentNullException("email");
-            }
-
-            ApplicationUser result = userTable.GetUserByEmail(normalizedEmail) as ApplicationUser;
-            if (result != null)
-            {
-                return Task.FromResult<ApplicationUser>(result);
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<ApplicationUser?> FindByIdAsync(string userId, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(userId))
-            {
-                throw new ArgumentException("Null or empty argument: userId");
-            }
-
-            ApplicationUser result = userTable.GetUserById(userId) as ApplicationUser;
-            if (result != null)
-            {
-                return Task.FromResult<ApplicationUser>(result);
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<ApplicationUser?> FindByLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
-        {
-            if (loginProvider == null || providerKey == null)
-            {
-                throw new ArgumentNullException("login");
-            }
-
-            UserLoginInfo login = new UserLoginInfo(loginProvider, providerKey, loginProvider);
-
-            var userId = userLoginsTable.FindUserIdByLogin(login);
-            if (userId != null)
-            {
-                ApplicationUser user = userTable.GetUserById(userId) as ApplicationUser;
-                if (user != null)
-                {
-                    return Task.FromResult<ApplicationUser>(user);
-                }
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<ApplicationUser?> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(normalizedUserName))
-            {
-                throw new ArgumentException("Null or empty argument: normalizedUserName");
-            }
-
-            List<ApplicationUser> result = userTable.GetUserByName(normalizedUserName) as List<ApplicationUser>;
-
-            // Should I throw if > 1 user?
-            if (result != null && result.Count == 1)
-            {
-                return Task.FromResult<ApplicationUser>(result[0]);
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<int> GetAccessFailedCountAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.AccessFailedCount);
-        }
-
-        public Task<IList<Claim>> GetClaimsAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            ClaimsIdentity identity = userClaimsTable.FindByUserId(user.Id);
-
-            return Task.FromResult<IList<Claim>>(identity.Claims.ToList());
-        }
-
-        public Task<string?> GetEmailAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.Email);
-        }
-
-        public Task<bool> GetEmailConfirmedAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.EmailConfirmed);
-        }
-
-        public Task<bool> GetLockoutEnabledAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.LockoutEnabled);
-        }
-
-        public Task<DateTimeOffset?> GetLockoutEndDateAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user.LockoutEnd.HasValue)
-            {
-                return Task.FromResult((DateTimeOffset?)user.LockoutEnd.Value);
-            }
-            else
-            {
-                return Task.FromResult((DateTimeOffset?)new DateTimeOffset());
-            }
-        }
-
-        public Task<IList<UserLoginInfo>> GetLoginsAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            List<UserLoginInfo> logins = userLoginsTable.FindByUserId(user.Id);
-            if (logins != null)
-            {
-                return Task.FromResult<IList<UserLoginInfo>>(logins);
-            }
-
-            return Task.FromResult<IList<UserLoginInfo>>(null);
-        }
-
-        public Task<string?> GetNormalizedEmailAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.NormalizedEmail);
-        }
-
-        public Task<string?> GetNormalizedUserNameAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                return Task.FromResult<string?>(userTable.GetUserName(user.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task<string?> GetPasswordHashAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                return Task.FromResult<string?>(userTable.GetPasswordHash(user.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task<string?> GetPhoneNumberAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.PhoneNumber);
-        }
-
-        public Task<bool> GetPhoneNumberConfirmedAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.PhoneNumberConfirmed);
-        }
-
-        public Task<IList<string>> GetRolesAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            List<string> roles = userRolesTable.FindByUserId(user.Id);
-            {
-                if (roles != null)
-                {
-                    return Task.FromResult<IList<string>>(roles);
-                }
-            }
-
-            return Task.FromResult<IList<string>>(null);
-        }
-
-        public Task<string?> GetSecurityStampAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.SecurityStamp);
-        }
-
-        public Task<bool> GetTwoFactorEnabledAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.TwoFactorEnabled);
-        }
-
-        public Task<string> GetUserIdAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                return Task.FromResult<string>(userTable.GetUserId(user.NormalizedUserName));
-            }
-
-            return Task.FromResult<string>(null);
-        }
-
-        public Task<string?> GetUserNameAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                //return Task.FromResult<string?>(userTable.GetUserName(user.Id));
-                return Task.FromResult(user.UserName);
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task<IList<ApplicationUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<IList<ApplicationUser>> GetUsersInRoleAsync(string roleName, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<bool> HasPasswordAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            var hasPassword = !string.IsNullOrEmpty(userTable.GetPasswordHash(user.Id));
-
-            return Task.FromResult<bool>(Boolean.Parse(hasPassword.ToString()));
-        }
-
-        public Task<int> IncrementAccessFailedCountAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            user.AccessFailedCount++;
-            userTable.Update(user);
-
-            return Task.FromResult(user.AccessFailedCount);
-        }
-
-        public Task<bool> IsInRoleAsync(ApplicationUser user, string roleName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (string.IsNullOrEmpty(roleName))
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            List<string> roles = userRolesTable.FindByUserId(user.Id);
-            {
-                if (roles != null)
-                {
-                    foreach (string role in roles)
-                    {
-                        if (role.ToUpper() == roleName.ToUpper())
-                        {
-                            return Task.FromResult<bool>(true);
-                        }
-                    }
-                }
-            }
-
-            return Task.FromResult<bool>(false);
-        }
-
-        public Task RemoveClaimsAsync(ApplicationUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (claims == null)
-            {
-                throw new ArgumentNullException("claim");
-            }
-
-            foreach (Claim claim in claims)
-            {
-                userClaimsTable.Delete(user, claim);
-            }
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task RemoveFromRoleAsync(ApplicationUser user, string roleName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (roleName == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            IdentityRole? role = roleTable.GetRoleByName(roleName);
-
-            if (role != null)
-            {
-                userRolesTable.DeleteUserFromRole(user.Id, role.Id);
-            }
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task RemoveLoginAsync(ApplicationUser user, string loginProvider, string providerKey, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (loginProvider == null || providerKey == null)
-            {
-                throw new ArgumentNullException("login");
-            }
-
-            UserLoginInfo login = new UserLoginInfo(loginProvider, providerKey, loginProvider);
-
-            userLoginsTable.Delete(user, login);
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task ReplaceClaimAsync(ApplicationUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (claim == null || newClaim == null)
-            {
-                throw new ArgumentNullException("claim");
-            }
-
-            userClaimsTable.Delete(user, claim);
-            userClaimsTable.Insert(newClaim, user.Id);
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task ResetAccessFailedCountAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            user.AccessFailedCount = 0;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetEmailAsync(ApplicationUser user, string? email, CancellationToken cancellationToken)
-        {
-            user.Email = email;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetEmailConfirmedAsync(ApplicationUser user, bool confirmed, CancellationToken cancellationToken)
-        {
-            user.EmailConfirmed = confirmed;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetLockoutEnabledAsync(ApplicationUser user, bool enabled, CancellationToken cancellationToken)
-        {
-            user.LockoutEnabled = enabled;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetLockoutEndDateAsync(ApplicationUser user, DateTimeOffset? lockoutEnd, CancellationToken cancellationToken)
-        {
-            user.LockoutEnd = lockoutEnd;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetNormalizedEmailAsync(ApplicationUser user, string? normalizedEmail, CancellationToken cancellationToken)
-        {
-            user.NormalizedEmail = normalizedEmail;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetNormalizedUserNameAsync(ApplicationUser user, string? normalizedName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            user.NormalizedUserName = normalizedName;
-            userTable.Update(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task SetPasswordHashAsync(ApplicationUser user, string? passwordHash, CancellationToken cancellationToken)
-        {
-            user.PasswordHash = passwordHash;
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task SetPhoneNumberAsync(ApplicationUser user, string? phoneNumber, CancellationToken cancellationToken)
-        {
-            user.PhoneNumber = phoneNumber;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetPhoneNumberConfirmedAsync(ApplicationUser user, bool confirmed, CancellationToken cancellationToken)
-        {
-            user.PhoneNumberConfirmed = confirmed;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetSecurityStampAsync(ApplicationUser user, string stamp, CancellationToken cancellationToken)
-        {
-            user.SecurityStamp = stamp;
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetTwoFactorEnabledAsync(ApplicationUser user, bool enabled, CancellationToken cancellationToken)
-        {
-            user.TwoFactorEnabled = enabled;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetUserNameAsync(ApplicationUser user, string? userName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            user.UserName = userName;
-            userTable.Update(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<IdentityResult> UpdateAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            userTable.Update(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserTable.cs

@@ -1,469 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the Users table in the MySQL Database
-    /// </summary>
-    public class UserTable<TUser>
-        where TUser :ApplicationUser
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Returns the user's name given a user id
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public string? GetUserName(string userId)
-        {
-            string commandText = "Select NormalizedUserName from Users where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@id", userId } };
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-            
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns a User ID given a user name
-        /// </summary>
-        /// <param name="userName">The user's name</param>
-        /// <returns></returns>
-        public string? GetUserId(string normalizedUserName)
-        {
-            string commandText = "Select Id from Users where NormalizedUserName = @name";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@name", normalizedUserName } };
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns an TUser given the user's id
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public TUser GetUserById(string userId)
-        {
-            TUser user = null;
-            string commandText = "Select * from Users LEFT JOIN (SELECT UserId, Id AS AvatarId FROM UserAvatars) UserAvatars ON Users.Id = UserAvatars.UserId where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@id", userId } };
-
-            var rows = _database.ExecuteCMDDict(commandText, parameters);
-            if (rows != null && rows.Count == 1)
-            {
-                Dictionary<string, object> row = rows[0];
-                user = (TUser)Activator.CreateInstance(typeof(TUser));
-                user.Id = (string)row["Id"];
-                user.UserName = (string?)row["UserName"];
-                user.PasswordHash = (string?)(string.IsNullOrEmpty((string?)row["PasswordHash"]) ? null : row["PasswordHash"]);
-                user.SecurityStamp = (string?)(string.IsNullOrEmpty((string?)row["SecurityStamp"]) ? null : row["SecurityStamp"]);
-                user.ConcurrencyStamp = (string?)(string.IsNullOrEmpty((string?)row["ConcurrencyStamp"]) ? null : row["ConcurrencyStamp"]);
-                user.Email = (string?)(string.IsNullOrEmpty((string?)row["Email"]) ? null : row["Email"]);
-                user.EmailConfirmed = row["EmailConfirmed"] == "1" ? true:false;
-                user.PhoneNumber = (string?)(string.IsNullOrEmpty((string?)row["PhoneNumber"]) ? null : row["PhoneNumber"]);
-                user.PhoneNumberConfirmed = row["PhoneNumberConfirmed"] == "1" ? true : false;
-                user.NormalizedEmail = (string?)(string.IsNullOrEmpty((string?)row["NormalizedEmail"]) ? null : row["NormalizedEmail"]);
-                user.NormalizedUserName = (string?)(string.IsNullOrEmpty((string?)row["NormalizedUserName"]) ? null : row["NormalizedUserName"]);
-                user.LockoutEnabled = row["LockoutEnabled"] == "1" ? true : false;
-                user.LockoutEnd = string.IsNullOrEmpty((string?)row["LockoutEnd"]) ? DateTime.Now : DateTime.Parse((string?)row["LockoutEnd"]);
-                user.AccessFailedCount = string.IsNullOrEmpty((string?)row["AccessFailedCount"]) ? 0 : int.Parse((string?)row["AccessFailedCount"]);
-                user.TwoFactorEnabled = row["TwoFactorEnabled"] == "1" ? true:false;
-                user.SecurityProfile = GetSecurityProfile(user);
-                user.UserPreferences = GetPreferences(user);
-                user.Avatar = string.IsNullOrEmpty((string?)row["AvatarId"]) ? Guid.Empty : Guid.Parse((string?)row["AvatarId"]);
-            }
-
-            return user;
-        }
-
-        /// <summary>
-        /// Returns a list of TUser instances given a user name
-        /// </summary>
-        /// <param name="normalizedUserName">User's name</param>
-        /// <returns></returns>
-        public List<TUser> GetUserByName(string normalizedUserName)
-        {
-            List<TUser> users = new List<TUser>();
-            string commandText = "Select * from Users LEFT JOIN (SELECT UserId, Id AS AvatarId FROM UserAvatars) UserAvatars ON Users.Id = UserAvatars.UserId where NormalizedEmail = @name";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@name", normalizedUserName } };
-
-            var rows = _database.ExecuteCMDDict(commandText, parameters);
-            foreach(Dictionary<string, object> row in rows)
-            {
-                TUser user = (TUser)Activator.CreateInstance(typeof(TUser));
-                user.Id = (string)row["Id"];
-                user.UserName = (string?)row["UserName"];
-                user.PasswordHash = (string?)(string.IsNullOrEmpty((string?)row["PasswordHash"]) ? null : row["PasswordHash"]);
-                user.SecurityStamp = (string?)(string.IsNullOrEmpty((string?)row["SecurityStamp"]) ? null : row["SecurityStamp"]);
-                user.ConcurrencyStamp = (string?)(string.IsNullOrEmpty((string?)row["ConcurrencyStamp"]) ? null : row["ConcurrencyStamp"]);
-                user.Email = (string?)(string.IsNullOrEmpty((string?)row["Email"]) ? null : row["Email"]);
-                user.EmailConfirmed = row["EmailConfirmed"] == "1" ? true:false;
-                user.PhoneNumber = (string?)(string.IsNullOrEmpty((string?)row["PhoneNumber"]) ? null : row["PhoneNumber"]);
-                user.PhoneNumberConfirmed = row["PhoneNumberConfirmed"] == "1" ? true : false;
-                user.NormalizedEmail = (string?)(string.IsNullOrEmpty((string?)row["NormalizedEmail"]) ? null : row["NormalizedEmail"]);
-                user.NormalizedUserName = (string?)(string.IsNullOrEmpty((string?)row["NormalizedUserName"]) ? null : row["NormalizedUserName"]);
-                user.LockoutEnabled = row["LockoutEnabled"] == "1" ? true : false;
-                user.LockoutEnd = string.IsNullOrEmpty((string?)row["LockoutEnd"]) ? DateTime.Now : DateTime.Parse((string?)row["LockoutEnd"]);
-                user.AccessFailedCount = string.IsNullOrEmpty((string?)row["AccessFailedCount"]) ? 0 : int.Parse((string?)row["AccessFailedCount"]);
-                user.TwoFactorEnabled = row["TwoFactorEnabled"] == "1" ? true:false;
-                user.SecurityProfile = GetSecurityProfile(user);
-                user.UserPreferences = GetPreferences(user);
-                user.Avatar = string.IsNullOrEmpty((string?)row["AvatarId"]) ? Guid.Empty : Guid.Parse((string?)row["AvatarId"]);
-                users.Add(user);
-            }
-
-            return users;
-        }
-
-        public List<TUser> GetUsers()
-        {
-            List<TUser> users = new List<TUser>();
-            string commandText = "Select * from Users LEFT JOIN (SELECT UserId, Id AS AvatarId FROM UserAvatars) UserAvatars ON Users.Id = UserAvatars.UserId order by NormalizedUserName";
-            
-            var rows = _database.ExecuteCMDDict(commandText);
-            foreach(Dictionary<string, object> row in rows)
-            {
-                TUser user = (TUser)Activator.CreateInstance(typeof(TUser));
-                user.Id = (string)row["Id"];
-                user.UserName = (string?)row["UserName"];
-                user.PasswordHash = (string?)(string.IsNullOrEmpty((string?)row["PasswordHash"]) ? null : row["PasswordHash"]);
-                user.SecurityStamp = (string?)(string.IsNullOrEmpty((string?)row["SecurityStamp"]) ? null : row["SecurityStamp"]);
-                user.ConcurrencyStamp = (string?)(string.IsNullOrEmpty((string?)row["ConcurrencyStamp"]) ? null : row["ConcurrencyStamp"]);
-                user.Email = (string?)(string.IsNullOrEmpty((string?)row["Email"]) ? null : row["Email"]);
-                user.EmailConfirmed = row["EmailConfirmed"] == "1" ? true:false;
-                user.PhoneNumber = (string?)(string.IsNullOrEmpty((string?)row["PhoneNumber"]) ? null : row["PhoneNumber"]);
-                user.PhoneNumberConfirmed = row["PhoneNumberConfirmed"] == "1" ? true : false;
-                user.NormalizedEmail = (string?)(string.IsNullOrEmpty((string?)row["NormalizedEmail"]) ? null : row["NormalizedEmail"]);
-                user.NormalizedUserName = (string?)(string.IsNullOrEmpty((string?)row["NormalizedUserName"]) ? null : row["NormalizedUserName"]);
-                user.LockoutEnabled = row["LockoutEnabled"] == "1" ? true : false;
-                user.LockoutEnd = string.IsNullOrEmpty((string?)row["LockoutEnd"]) ? DateTime.Now : DateTime.Parse((string?)row["LockoutEnd"]);
-                user.AccessFailedCount = string.IsNullOrEmpty((string?)row["AccessFailedCount"]) ? 0 : int.Parse((string?)row["AccessFailedCount"]);
-                user.TwoFactorEnabled = row["TwoFactorEnabled"] == "1" ? true:false;
-                user.SecurityProfile = GetSecurityProfile(user);
-                user.UserPreferences = GetPreferences(user);
-                user.Avatar = string.IsNullOrEmpty((string?)row["AvatarId"]) ? Guid.Empty : Guid.Parse((string?)row["AvatarId"]);
-                users.Add(user);
-            }
-
-            return users;
-        }
-
-        public TUser GetUserByEmail(string email)
-        {
-            List<TUser> users = GetUserByName(email);
-            if (users.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return users[0];
-            }
-        }
-
-        /// <summary>
-        /// Return the user's password hash
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public string GetPasswordHash(string userId)
-        {
-            string commandText = "Select PasswordHash from Users where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", userId);
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Sets the user's password hash
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="passwordHash"></param>
-        /// <returns></returns>
-        public int SetPasswordHash(string userId, string passwordHash)
-        {
-            string commandText = "Update Users set PasswordHash = @pwdHash where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@pwdHash", passwordHash);
-            parameters.Add("@id", userId);
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        /// <summary>
-        /// Returns the user's security stamp
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public string GetSecurityStamp(string userId)
-        {
-            string commandText = "Select SecurityStamp from Users where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@id", userId } };
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Inserts a new user in the Users table
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public int Insert(TUser user)
-        {
-            string commandText = @"Insert into Users (UserName, Id, PasswordHash, SecurityStamp, ConcurrencyStamp, Email, EmailConfirmed, PhoneNumber, PhoneNumberConfirmed, NormalizedEmail, NormalizedUserName, AccessFailedCount, LockoutEnabled, LockoutEnd, TwoFactorEnabled) values (@name, @id, @pwdHash, @SecStamp, @concurrencystamp, @email ,@emailconfirmed ,@phonenumber, @phonenumberconfirmed, @normalizedemail, @normalizedusername, @accesscount, @lockoutenabled, @lockoutenddate, @twofactorenabled);";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@name", user.UserName);
-            parameters.Add("@id", user.Id);
-            parameters.Add("@pwdHash", user.PasswordHash);
-            parameters.Add("@SecStamp", user.SecurityStamp);
-            parameters.Add("@concurrencystamp", user.ConcurrencyStamp);
-            parameters.Add("@email", user.Email);
-            parameters.Add("@emailconfirmed", user.EmailConfirmed);
-            parameters.Add("@phonenumber", user.PhoneNumber);
-            parameters.Add("@phonenumberconfirmed", user.PhoneNumberConfirmed);
-            parameters.Add("@normalizedemail", user.NormalizedEmail);
-            parameters.Add("@normalizedusername", user.NormalizedUserName);
-            parameters.Add("@accesscount", user.AccessFailedCount);
-            parameters.Add("@lockoutenabled", user.LockoutEnabled);
-            parameters.Add("@lockoutenddate", user.LockoutEnd);
-            parameters.Add("@twofactorenabled", user.TwoFactorEnabled);
-
-            // set default security profile
-            SetSecurityProfile(user, new SecurityProfileViewModel());
-
-            // set default preferences
-            SetPreferences(user, new List<UserPreferenceViewModel>());
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        /// <summary>
-        /// Deletes a user from the Users table
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        private int Delete(string userId)
-        {
-            string commandText = "Delete from Users where Id = @userId; Delete from User_Settings where Id = @userId; Delete from GameState where UserId = @userId;";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@userId", userId);
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        /// <summary>
-        /// Deletes a user from the Users table
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public int Delete(TUser user)
-        {
-            return Delete(user.Id);
-        }
-
-        /// <summary>
-        /// Updates a user in the Users table
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public int Update(TUser user)
-        {
-            string commandText = @"Update Users set UserName = @userName, PasswordHash = @pwdHash, SecurityStamp = @secStamp, ConcurrencyStamp = @concurrencystamp, Email = @email, EmailConfirmed = @emailconfirmed, PhoneNumber = @phonenumber, PhoneNumberConfirmed = @phonenumberconfirmed, NormalizedEmail = @normalizedemail, NormalizedUserName = @normalizedusername, AccessFailedCount = @accesscount, LockoutEnabled = @lockoutenabled, LockoutEnd = @lockoutenddate, TwoFactorEnabled=@twofactorenabled WHERE Id = @userId;";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@userId", user.Id);
-            parameters.Add("@userName", user.UserName);
-            parameters.Add("@pwdHash", user.PasswordHash);
-            parameters.Add("@SecStamp", user.SecurityStamp);
-            parameters.Add("@concurrencystamp", user.ConcurrencyStamp);
-            parameters.Add("@email", user.Email);
-            parameters.Add("@emailconfirmed", user.EmailConfirmed);
-            parameters.Add("@phonenumber", user.PhoneNumber);
-            parameters.Add("@phonenumberconfirmed", user.PhoneNumberConfirmed);
-            parameters.Add("@normalizedemail", user.NormalizedEmail);
-            parameters.Add("@normalizedusername", user.NormalizedUserName);
-            parameters.Add("@accesscount", user.AccessFailedCount);
-            parameters.Add("@lockoutenabled", user.LockoutEnabled);
-            parameters.Add("@lockoutenddate", user.LockoutEnd);
-            parameters.Add("@twofactorenabled", user.TwoFactorEnabled);
-
-            // set the security profile
-            SetSecurityProfile(user, user.SecurityProfile);
-
-            // set preferences
-            SetPreferences(user, user.UserPreferences);
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        private SecurityProfileViewModel GetSecurityProfile(TUser user)
-        {
-            string sql = "SELECT SecurityProfile FROM Users WHERE Id=@Id;";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("Id", user.Id);
-
-            List<Dictionary<string, object>> data = _database.ExecuteCMDDict(sql, dbDict);
-            if (data.Count == 0)
-            {
-                // no saved profile - return the default one
-                return new SecurityProfileViewModel();
-            }
-            else
-            {
-                string? securityProfileString = (string?)data[0]["SecurityProfile"];
-                if (securityProfileString != null && securityProfileString != "null")
-                {
-                    SecurityProfileViewModel securityProfile = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityProfileViewModel>(securityProfileString);
-                    return securityProfile;
-                }
-                else
-                {
-                    return new SecurityProfileViewModel();
-                }
-            }
-        }
-
-        private int SetSecurityProfile(TUser user, SecurityProfileViewModel securityProfile)
-        {
-            string commandText = "UPDATE Users SET SecurityProfile=@SecurityProfile WHERE Id=@Id;";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("Id", user.Id);
-            parameters.Add("SecurityProfile", Newtonsoft.Json.JsonConvert.SerializeObject(securityProfile));
-            
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        public List<UserPreferenceViewModel> GetPreferences(TUser user)
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT `Setting`, `Value` FROM User_Settings WHERE Id=@id;";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("id", user.Id);
-
-            DataTable data = db.ExecuteCMD(sql, dbDict);
-
-            List<UserPreferenceViewModel> userPrefs = new List<UserPreferenceViewModel>();
-            foreach (DataRow row in data.Rows)
-            {
-                UserPreferenceViewModel userPref = new UserPreferenceViewModel();
-                userPref.Setting = (string)row["Setting"];
-                userPref.Value = (string)row["Value"];
-                userPrefs.Add(userPref);
-            }
-
-            return userPrefs;
-        }
-
-        public int SetPreferences(TUser user, List<UserPreferenceViewModel> model)
-        {
-            if (model != null)
-            {
-                List<UserPreferenceViewModel> userPreferences = GetPreferences(user);
-
-                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                
-                foreach (UserPreferenceViewModel modelItem in model)
-                {
-                    bool prefItemFound = false;
-                    foreach (UserPreferenceViewModel existing in userPreferences)
-                    {
-                        if (existing.Setting.ToLower() == modelItem.Setting.ToLower())
-                        {
-                            prefItemFound = true;
-                            break;
-                        }
-                    }
-
-                    string sql = "INSERT INTO User_Settings (`Id`, `Setting`, `Value`) VALUES (@id, @setting, @value);";
-                    if (prefItemFound == true)
-                    {
-                        sql = "UPDATE User_Settings SET `Value`=@value WHERE `Id`=@id AND `Setting`=@setting";
-                    }
-                    Dictionary<string, object> dbDict = new Dictionary<string, object>();
-                    dbDict.Add("id", user.Id);
-                    dbDict.Add("setting", modelItem.Setting);
-                    dbDict.Add("value", modelItem.Value);
-                    db.ExecuteNonQuery(sql, dbDict);
-                }
-
-                return model.Count;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-
-        public Guid SetAvatar(TUser user, byte[] bytes)
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql;
-            Dictionary<string, object> dbDict = new Dictionary<string, object>
-            {
-                { "userid", user.Id }
-            };
-            
-            if (bytes.Length == 0)
-            {
-                sql = "DELETE FROM UserAvatars WHERE UserId = @userid";
-                db.ExecuteNonQuery(sql, dbDict);
-                return Guid.Empty;
-            }
-            else
-            {
-                sql = "DELETE FROM UserAvatars WHERE UserId = @userid; INSERT INTO UserAvatars (UserId, Id, Avatar) VALUES (@userid, @id, @avatar);";
-                dbDict.Add("id", Guid.NewGuid());
-                dbDict.Add("avatar", bytes);
-                db.ExecuteNonQuery(sql, dbDict);
-                return (Guid)dbDict["id"];
-            }
-        }
-    }
-}

gaseous-server/Classes/Auth/Models/AccountViewModels.cs

@@ -1,100 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication
-{
-    public class ExternalLoginConfirmationViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-    }
-
-    public class ManageUserViewModel
-    {
-        [Required]
-        [DataType(DataType.Password)]
-        [Display(Name = "Current password")]
-        public string OldPassword { get; set; }
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "New password")]
-        public string NewPassword { get; set; }
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm new password")]
-        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-    }
-
-    public class LoginViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-
-        [Required]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; }
-
-        [Display(Name = "Remember me?")]
-        public bool RememberMe { get; set; }
-    }
-
-    public class RegisterViewModel
-    {
-        [Required]
-        [DataType(DataType.Text)]
-        [Display(Name = "User name")]
-        public string UserName { get; set; }
-
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; }
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-    }
-
-    public class ResetPasswordViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; }
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-
-        public string Code { get; set; }
-    }
-
-    public class ForgotPasswordViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-    }
-}

gaseous-server/Classes/Auth/Models/AddPhoneNumberViewModel.cs

@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class AddPhoneNumberViewModel
-{
-    [Required]
-    [Phone]
-    [Display(Name = "Phone number")]
-    public string PhoneNumber { get; set; }
-}

gaseous-server/Classes/Auth/Models/ChangePasswordViewModel.cs

@@ -1,25 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class ChangePasswordViewModel
-{
-    [Required]
-    [DataType(DataType.Password)]
-    [Display(Name = "Current password")]
-    public string OldPassword { get; set; }
-
-    [Required]
-    [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 10)]
-    [DataType(DataType.Password)]
-    [Display(Name = "New password")]
-    public string NewPassword { get; set; }
-
-    [DataType(DataType.Password)]
-    [Display(Name = "Confirm new password")]
-    [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-    public string ConfirmPassword { get; set; }
-}

gaseous-server/Classes/Auth/Models/DisplayRecoveryCodesViewModel.cs

@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class DisplayRecoveryCodesViewModel
-{
-    [Required]
-    public IEnumerable<string> Codes { get; set; }
-
-}

gaseous-server/Classes/Auth/Models/IndexViewModel.cs

@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication;
-
-public class IndexViewModel
-{
-    public bool HasPassword { get; set; }
-
-    public IList<UserLoginInfo> Logins { get; set; }
-
-    public string PhoneNumber { get; set; }
-
-    public bool TwoFactor { get; set; }
-
-    public bool BrowserRemembered { get; set; }
-
-    public string AuthenticatorKey { get; set; }
-}

gaseous-server/Classes/Auth/Models/ManageLoginsViewModel.cs

@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication;
-
-public class ManageLoginsViewModel
-{
-    public IList<UserLoginInfo> CurrentLogins { get; set; }
-
-    public IList<AuthenticationScheme> OtherLogins { get; set; }
-}

gaseous-server/Classes/Auth/Models/ProfileViewModel.cs

@@ -1,48 +0,0 @@
-namespace Authentication
-{
-    public class ProfileBasicViewModel
-    {
-        public string UserId { get; set; }
-        public string UserName { get; set; }
-        public string EmailAddress { get; set; }
-        public List<String> Roles { get; set; }
-        public SecurityProfileViewModel SecurityProfile { get; set; }
-        public List<UserPreferenceViewModel> UserPreferences { get; set; }
-        public Guid Avatar { get; set; }
-        public string HighestRole {
-            get
-            {
-                string _highestRole = "";
-                foreach (string role in Roles)
-                {
-                    switch (role)
-                    {
-                        case "Admin":
-                            // there is no higher
-                            _highestRole = role;
-                            break;
-                        case "Gamer":
-                            // only one high is Admin, so check for that
-                            if (_highestRole != "Admin")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        case "Player":
-                            // make sure _highestRole isn't already set to Gamer or Admin
-                            if (_highestRole != "Admin" && _highestRole != "Gamer")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        default:
-                            _highestRole = "Player";
-                            break;
-                    }
-                }
-
-                return _highestRole;
-            }
-        }
-    }
-}

gaseous-server/Classes/Auth/Models/RemoveLoginViewModel.cs

@@ -1,10 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Authentication;
-
-public class RemoveLoginViewModel
-{
-    public string LoginProvider { get; set; }
-    public string ProviderKey { get; set; }
-}

gaseous-server/Classes/Auth/Models/SecurityProfileViewModel.cs

@@ -1,18 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication
-{
-    public class SecurityProfileViewModel
-    {
-        public AgeRestrictionItem AgeRestrictionPolicy { get; set; } = new AgeRestrictionItem{ 
-            MaximumAgeRestriction = gaseous_server.Classes.Metadata.AgeGroups.AgeRestrictionGroupings.Adult,
-            IncludeUnrated = true 
-        };
-
-        public class AgeRestrictionItem
-        {
-            public gaseous_server.Classes.Metadata.AgeGroups.AgeRestrictionGroupings MaximumAgeRestriction { get; set; }
-            public bool IncludeUnrated { get; set; }
-        }
-    }
-}

gaseous-server/Classes/Auth/Models/SendCodeViewModel.cs

@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Mvc.Rendering;
-
-namespace Authentication;
-
-public class SendCodeViewModel
-{
-    public string SelectedProvider { get; set; }
-
-    public ICollection<SelectListItem> Providers { get; set; }
-
-    public string ReturnUrl { get; set; }
-
-    public bool RememberMe { get; set; }
-}

gaseous-server/Classes/Auth/Models/SetPasswordViewModel.cs

@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class SetPasswordViewModel
-{
-    [Required]
-    [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-    [DataType(DataType.Password)]
-    [Display(Name = "New password")]
-    public string NewPassword { get; set; }
-
-    [DataType(DataType.Password)]
-    [Display(Name = "Confirm new password")]
-    [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-    public string ConfirmPassword { get; set; }
-}

gaseous-server/Classes/Auth/Models/UseRecoveryCodeViewModel.cs

@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class UseRecoveryCodeViewModel
-{
-    [Required]
-    public string Code { get; set; }
-
-    public string ReturnUrl { get; set; }
-}

gaseous-server/Classes/Auth/Models/UserPreferenceViewModels.cs

@@ -1,8 +0,0 @@
-namespace Authentication;
-
-public class UserPreferenceViewModel
-{
-    public string Setting { get; set; }
-
-    public string Value { get; set; }
-}

gaseous-server/Classes/Auth/Models/UserViewModel.cs

@@ -1,48 +0,0 @@
-namespace Authentication
-{
-    public class UserViewModel
-    {
-        public string Id { get; set; }
-        public string EmailAddress { get; set; }
-        public bool LockoutEnabled { get; set; }
-        public DateTimeOffset? LockoutEnd { get; set; }
-        public List<string> Roles { get; set; }
-        public SecurityProfileViewModel SecurityProfile { get; set; }
-        public Guid Avatar { get; set; }
-        public string HighestRole {
-            get
-            {
-                string _highestRole = "";
-                foreach (string role in Roles)
-                {
-                    switch (role)
-                    {
-                        case "Admin":
-                            // there is no higher
-                            _highestRole = role;
-                            break;
-                        case "Gamer":
-                            // only one high is Admin, so check for that
-                            if (_highestRole != "Admin")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        case "Player":
-                            // make sure _highestRole isn't already set to Gamer or Admin
-                            if (_highestRole != "Admin" && _highestRole != "Gamer")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        default:
-                            _highestRole = "Player";
-                            break;
-                    }
-                }
-
-                return _highestRole;
-            }
-        }
-    }
-}

gaseous-server/Classes/Auth/Models/VerifyAuthenticatorCodeViewModel.cs

@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class VerifyAuthenticatorCodeViewModel
-{
-    [Required]
-    public string Code { get; set; }
-
-    public string ReturnUrl { get; set; }
-
-    [Display(Name = "Remember this browser?")]
-    public bool RememberBrowser { get; set; }
-
-    [Display(Name = "Remember me?")]
-    public bool RememberMe { get; set; }
-}

gaseous-server/Classes/Auth/Models/VerifyCodeViewModel.cs

@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class VerifyCodeViewModel
-{
-    [Required]
-    public string Provider { get; set; }
-
-    [Required]
-    public string Code { get; set; }
-
-    public string ReturnUrl { get; set; }
-
-    [Display(Name = "Remember this browser?")]
-    public bool RememberBrowser { get; set; }
-
-    [Display(Name = "Remember me?")]
-    public bool RememberMe { get; set; }
-}

gaseous-server/Classes/Auth/Models/VerifyPhoneNumberViewModel.cs

@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class VerifyPhoneNumberViewModel
-{
-    [Required]
-    public string Code { get; set; }
-
-    [Required]
-    [Phone]
-    [Display(Name = "Phone number")]
-    public string PhoneNumber { get; set; }
-}