Merge pull request #446 from Moonlight-Panel/v2.1_TwClassExport

ChiaraBm · web-flow · commit e3f007b568cd · 2025-07-17T21:47:26.000+02:00
Fixed oauth2 controller. Improved tw export. Fixed gh action
diff --git a/.github/workflows/publish-dev-packages.yml b/.github/workflows/publish-dev-packages.yml
@@ -6,14 +6,14 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-scrips:
+  build-scripts:
     runs-on: debian-12
 
     steps:
       - name: Clean up Environment
         run: |
-            rm -rf ./*
-            rm -rf ./.??*
+          rm -rf ./*
+          rm -rf ./.??*
 
       - uses: actions/checkout@v3
 
@@ -25,31 +25,28 @@ jobs:
 
   build-moonlight:
     runs-on: debian-12
-    needs: build-scrips
+    needs: build-scripts
 
     steps:
       - name: Clean up Environment
         run: |
-            rm -rf ./*
-            rm -rf ./.??*
-          
+          rm -rf ./*
+          rm -rf ./.??*
+
       - name: Remove nuget source
         continue-on-error: true
         run: dotnet nuget remove source moonlight-github
 
       - uses: actions/checkout@v3
 
-      - name: Add nuget source
-        run: dotnet nuget add source -n moonlight-github "https://nuget.pkg.github.com/Moonlight-Panel/index.json" -u Moonlight-Panel -p ${{secrets.GH_PACKAGES_READWRITE}} --store-password-in-clear-text
-
-      - name: Setup Environment
-        run: dotnet tool install dotnet-moonlight -g
-
       - name: Build and Pack Moonlight
         run: |
-            mkdir ./packs
-            export PATH="$PATH:~/.dotnet/tools"
-            dotnet moonlight pack . ./packs
+          mkdir ./packs
+          dotnet restore
+          dotnet build
+          dotnet pack -o ./packs -c Debug Moonlight.ApiServer
+          dotnet pack -o ./packs -c Debug Moonlight.Client
+          dotnet pack -o ./packs -c Debug Moonlight.Shared
 
       - name: Publish to Github
         run: dotnet nuget push "./packs/*.nupkg" --skip-duplicate --api-key ${{secrets.GH_PACKAGES_READWRITE}} --source https://nuget.pkg.github.com/Moonlight-Panel/index.json
diff --git a/Moonlight.ApiServer/Http/Controllers/OAuth2/OAuth2Controller.cs b/Moonlight.ApiServer/Http/Controllers/OAuth2/OAuth2Controller.cs
@@ -66,8 +66,6 @@ public async Task Authorize(
                 parameters.Add("RedirectUri", redirectUri);
                 parameters.Add("ResponseType", responseType);
             });
-
-            await Response.WriteAsync(html);
         }
         else
         {
@@ -77,12 +75,10 @@ public async Task Authorize(
                 parameters.Add("RedirectUri", redirectUri);
                 parameters.Add("ResponseType", responseType);
             });
-
-            await Response.WriteAsync(html);
         }
         
         await Results
-            .Text(html, "text/html")
+            .Text(html, "text/html", Encoding.UTF8)
             .ExecuteAsync(HttpContext);
     }
 
@@ -158,7 +154,7 @@ public async Task AuthorizePost(
             }
 
             await Results
-                .Text(html, "text/html")
+                .Text(html, "text/html", Encoding.UTF8)
                 .ExecuteAsync(HttpContext);
         }
     }
diff --git a/Moonlight.Client.Runtime/Moonlight.Client.Runtime.csproj b/Moonlight.Client.Runtime/Moonlight.Client.Runtime.csproj
@@ -19,52 +19,4 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" PrivateAssets="all"/>
     </ItemGroup>
 
-    <ItemGroup>
-      <None Update="Styles\exports.css">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Include="Styles\package-lock.json">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Include="Styles\package.json">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\preTailwind.css">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\resolveNuget.js">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\style.css">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\mappings\mooncore.map">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="wwwroot\css\" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <_ContentIncludedByDefault Remove="wwwroot\js\moonCore.js" />
-      <_ContentIncludedByDefault Remove="wwwroot\js\moonlight.js" />
-      <_ContentIncludedByDefault Remove="wwwroot\svg\logo.svg" />
-    </ItemGroup>
-
 </Project>
diff --git a/Moonlight.Client.Runtime/Styles/styles.css b/Moonlight.Client.Runtime/Styles/styles.css
@@ -29,7 +29,7 @@
 @source "../../Moonlight.Client/**/*.cs";
 @source "../../Moonlight.Client/**/*.html";
 @source "../../Moonlight.Client/**/*.razor";
-@source "../../Moonlight.Client/Styles/mappings/*.map";
+@source "../../Moonlight.Client/Styles/**/*.map";
 
 @source "../../Moonlight.ApiServer/**/*.razor";
 
diff --git a/Moonlight.Client/Moonlight.Client.csproj b/Moonlight.Client/Moonlight.Client.csproj
@@ -46,7 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Styles/*" Pack="true" PackagePath="Styles/Moonlight.Client/" />
+    <None Include="Styles/mappings/*.map" Pack="true" PackagePath="Styles/" />
     <None Include="Moonlight.Client.targets" Pack="true" PackagePath="build/Moonlight.Client.targets" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,6 @@ public async Task Authorize(`
`66`	`66`	`parameters.Add("RedirectUri", redirectUri);`
`67`	`67`	`parameters.Add("ResponseType", responseType);`
`68`	`68`	`});`
`69`		`-`
`70`		`- await Response.WriteAsync(html);`
`71`	`69`	`}`
`72`	`70`	`else`
`73`	`71`	`{`
`@@ -77,12 +75,10 @@ public async Task Authorize(`
`77`	`75`	`parameters.Add("RedirectUri", redirectUri);`
`78`	`76`	`parameters.Add("ResponseType", responseType);`
`79`	`77`	`});`
`80`		`-`
`81`		`- await Response.WriteAsync(html);`
`82`	`78`	`}`
`83`	`79`
`84`	`80`	`await Results`
`85`		`- .Text(html, "text/html")`
	`81`	`+ .Text(html, "text/html", Encoding.UTF8)`
`86`	`82`	`.ExecuteAsync(HttpContext);`
`87`	`83`	`}`
`88`	`84`
`@@ -158,7 +154,7 @@ public async Task AuthorizePost(`
`158`	`154`	`}`
`159`	`155`
`160`	`156`	`await Results`
`161`		`- .Text(html, "text/html")`
	`157`	`+ .Text(html, "text/html", Encoding.UTF8)`
`162`	`158`	`.ExecuteAsync(HttpContext);`
`163`	`159`	`}`
`164`	`160`	`}`