Change Project Name from Zatca.EGS to ZatcaEGS

mabaega · Sep 6, 2024 · 793cceb · 793cceb
1 parent 7195843
commit 793cceb
Show file tree

Hide file tree

Showing 65 changed files with 104 additions and 128 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Get Version
         id: get_version
         run: |
-          VERSION=$(grep -oP '(?<=<AssemblyVersion>).*(?=</AssemblyVersion>)' Zatca.EGS/Zatca.EGS.csproj)
+          VERSION=$(grep -oP '(?<=<AssemblyVersion>).*(?=</AssemblyVersion>)' ZatcaEGS/ZatcaEGS.csproj)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
       - name: Create Release
         id: create_release
@@ -62,18 +62,18 @@ jobs:
       - name: List Directory Contents
         run: ls -R
       - name: Restore dependencies
-        run: dotnet restore Zatca.EGS/Zatca.EGS.csproj
+        run: dotnet restore ZatcaEGS/ZatcaEGS.csproj
       - name: Build
-        run: dotnet build Zatca.EGS/Zatca.EGS.csproj --configuration Release --no-restore
+        run: dotnet build ZatcaEGS/ZatcaEGS.csproj --configuration Release --no-restore
       - name: Publish
-        run: dotnet publish Zatca.EGS/Zatca.EGS.csproj -c Release -o ./publish -r ${{ matrix.runtime }} --self-contained false
+        run: dotnet publish ZatcaEGS/ZatcaEGS.csproj -c Release -o ./publish -r ${{ matrix.runtime }} --self-contained false
       - name: Create macOS App Bundle
         if: matrix.os == 'macos-latest'
         run: |
           mkdir -p ZatcaEGS.app/Contents/{MacOS,Resources}
-          cp Zatca.EGS/wwwroot/images/apple-icon.icns ZatcaEGS.app/Contents/Resources/
+          cp ZatcaEGS/wwwroot/images/apple-icon.icns ZatcaEGS.app/Contents/Resources/
           echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n  <key>CFBundleExecutable</key>\n  <string>ZatcaEGS</string>\n  <key>CFBundleIconFile</key>\n  <string>apple-icon</string>\n</dict>\n</plist>" > ZatcaEGS.app/Contents/Info.plist
-          cp ./publish/Zatca.EGS ZatcaEGS.app/Contents/MacOS/ZatcaEGS
+          cp ./publish/ZatcaEGS ZatcaEGS.app/Contents/MacOS/ZatcaEGS
           chmod +x ZatcaEGS.app/Contents/MacOS/ZatcaEGS
       - name: Zip Release
         uses: thedoctor0/zip-release@master

diff --git a/Zatca.EGS/Zatca.EGS.csproj b/Zatca.EGS/Zatca.EGS.csproj
diff --git a/Zatca.eInvoice.Test/Program.cs b/Zatca.eInvoice.Test/Program.cs
@@ -12,8 +12,8 @@ public class ZatcaService
     private const string ComplianceCSIDUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/compliance";
     private const string ProductionCSIDUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/production/csids";
     private const string ComplianceCheckUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/compliance/invoices";
-    private const string ReportingUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/reporting/single";
-    private const string ClearanceUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/clearance/single";
+    //private const string ReportingUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/reporting/single";
+    //private const string ClearanceUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/clearance/single";
 
     private readonly HttpClient _httpClient;
 
@@ -102,7 +102,7 @@ public async Task<OnboardingResultDto> OnboardingDevice()
     }
 
 
-    public async Task<SignedInvoiceResult> CreateSignedInvoice(string CSIDBinaryToken, string EcSecp256k1Privkeypem)
+    public static async Task<SignedInvoiceResult> CreateInvoiceXml(string CSIDBinaryToken, string EcSecp256k1Privkeypem)
     {
         try
         {
@@ -406,17 +406,17 @@ public class SignedInvoiceResult
     public string RequestApi { get; set; }
 }
 
-public class ZatcaRequestApi
-{
-    [JsonProperty("uuid")]
-    public string Uuid { get; set; }
+//public class ZatcaRequestApi
+//{
+//    [JsonProperty("uuid")]
+//    public string Uuid { get; set; }
 
-    [JsonProperty("invoiceHash")]
-    public string InvoiceHash { get; set; }
+//    [JsonProperty("invoiceHash")]
+//    public string InvoiceHash { get; set; }
 
-    [JsonProperty("invoice")]
-    public string Invoice { get; set; }
-}
+//    [JsonProperty("invoice")]
+//    public string Invoice { get; set; }
+//}
 
 public class ServerResult
 {
@@ -547,8 +547,8 @@ static async Task Main(string[] args)
                 //Console.WriteLine($"PCSID Secret:\n{result.PCSIDSecret}  \n\n");
 
                 //// Step 2: Create Signed Invoice
-                ////var signedInvoiceResult = await zatcaService.CreateSignedInvoice(result.PCSIDBinaryToken, result.PrivateKey);
-                //var signedInvoiceResult = await zatcaService.CreateSignedInvoice(result.CCSIDBinaryToken, result.PrivateKey);
+                ////var signedInvoiceResult = await zatcaService.CreateInvoiceXml(result.PCSIDBinaryToken, result.PrivateKey);
+                //var signedInvoiceResult = await zatcaService.CreateInvoiceXml(result.CCSIDBinaryToken, result.PrivateKey);
 
                 //Console.WriteLine("Signed Invoice Result:\n\n");
                 ////Console.WriteLine($"Base64 Signed Invoice:\n{signedInvoiceResult.Base64SignedInvoice} \n");

diff --git a/ZatcaEGS.sln b/ZatcaEGS.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zatca.eInvoice", "Zatca.eIn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zatca.eInvoice.Test", "Zatca.eInvoice.Test\Zatca.eInvoice.Test.csproj", "{2D1BCAFB-BB8F-4D44-A8D5-0889153DC1E3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zatca.EGS", "Zatca.EGS\Zatca.EGS.csproj", "{89BD9AFD-AF48-4DA9-A7D6-25CE05A537A8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZatcaEGS", "ZatcaEGS\ZatcaEGS.csproj", "{89BD9AFD-AF48-4DA9-A7D6-25CE05A537A8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Zatca.EGS/.config/dotnet-tools.json → ZatcaEGS/.config/dotnet-tools.json b/Zatca.EGS/.config/dotnet-tools.json → ZatcaEGS/.config/dotnet-tools.json
diff --git a/...a.EGS/Controllers/DisclaimerController.cs → ZatcaEGS/Controllers/DisclaimerController.cs b/...a.EGS/Controllers/DisclaimerController.cs → ZatcaEGS/Controllers/DisclaimerController.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace Zatca.EGS.Controllers
+namespace ZatcaEGS.Controllers
 {
     public class DisclaimerController : Controller
     {

diff --git a/Zatca.EGS/Controllers/HomeController.cs → ZatcaEGS/Controllers/HomeController.cs b/Zatca.EGS/Controllers/HomeController.cs → ZatcaEGS/Controllers/HomeController.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
-using Zatca.EGS.Models;
+using ZatcaEGS.Models;
 
-namespace Zatca.EGS.Controllers
+namespace ZatcaEGS.Controllers
 {
     public class HomeController : Controller
     {

diff --git a/Zatca.EGS/Controllers/RelayController.cs → ZatcaEGS/Controllers/RelayController.cs b/Zatca.EGS/Controllers/RelayController.cs → ZatcaEGS/Controllers/RelayController.cs
@@ -3,12 +3,12 @@
 using System.Net.Http.Headers;
 using System.Text;
 using System.Xml.Serialization;
-using Zatca.EGS.Helpers;
-using Zatca.EGS.Models;
+using ZatcaEGS.Helpers;
+using ZatcaEGS.Models;
 using Zatca.eInvoice;
 using Zatca.eInvoice.Models;
 
-namespace Zatca.EGS.Controllers
+namespace ZatcaEGS.Controllers
 {
     [ApiController]
     public class RelayController : Controller

diff --git a/Zatca.EGS/Controllers/WizardController.cs → ZatcaEGS/Controllers/WizardController.cs b/Zatca.EGS/Controllers/WizardController.cs → ZatcaEGS/Controllers/WizardController.cs
@@ -5,13 +5,13 @@
 using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
-using Zatca.EGS.Helpers;
-using Zatca.EGS.Models;
+using ZatcaEGS.Helpers;
+using ZatcaEGS.Models;
 using Zatca.eInvoice;
 using Zatca.eInvoice.Helpers;
 using Zatca.eInvoice.Models;
 
-namespace Zatca.EGS.Controllers
+namespace ZatcaEGS.Controllers
 {
     public class WizardController : Controller
     {
@@ -140,7 +140,7 @@ public async Task<IActionResult> GenerateCustomFieldAsync([FromBody] AccessToken
                 string apiKey = token.ApiSecret;
 
                 // Load JSON data from resources
-                byte[] jsonDataBytes = Zatca.EGS.Properties.Resources.cfData;
+                byte[] jsonDataBytes = ZatcaEGS.Properties.Resources.cfData;
                 string jsonData = Encoding.UTF8.GetString(jsonDataBytes);
 
                 try

diff --git a/Zatca.EGS/CreateLinuxServices.sh → ZatcaEGS/CreateLinuxServices.sh b/Zatca.EGS/CreateLinuxServices.sh → ZatcaEGS/CreateLinuxServices.sh
@@ -13,18 +13,18 @@ check_dotnet() {
 
 # Fungsi untuk memberikan izin eksekusi
 set_permissions() {
-    chmod +x Zatca.EGS
+    chmod +x ZatcaEGS
     echo "Izin eksekusi diberikan ke ZatcaEGS"
 }
 
 # Fungsi untuk menjalankan aplikasi
 run_app() {
     if [ "$1" == "service" ]; then
         echo "Menjalankan ZatcaEGS sebagai layanan..."
-        sudo ./Zatca.EGS
+        sudo ./ZatcaEGS
     else
         echo "Menjalankan ZatcaEGS dalam mode interaktif..."
-        ./Zatca.EGS
+        ./ZatcaEGS
     fi
 }
 
@@ -37,7 +37,7 @@ Description=Zatca EGS Service
 After=network.target
 
 [Service]
-ExecStart=$(pwd)/Zatca.EGS
+ExecStart=$(pwd)/ZatcaEGS
 WorkingDirectory=$(pwd)
 User=$(whoami)
 Restart=always
@@ -49,7 +49,7 @@ EOL
     echo "Mengaktifkan dan memulai layanan ZatcaEGS..."
     sudo systemctl enable zatca-egs.service
     sudo systemctl start zatca-egs.service
-    echo "Layanan Zatca.EGS telah diaktifkan dan dijalankan."
+    echo "Layanan ZatcaEGS telah diaktifkan dan dijalankan."
 }
 
 # Main script

diff --git a/Zatca.EGS/CreateWindowsServices.bat → ZatcaEGS/CreateWindowsServices.bat b/Zatca.EGS/CreateWindowsServices.bat → ZatcaEGS/CreateWindowsServices.bat
@@ -3,7 +3,7 @@ setlocal
 
 REM Set the path to the executable and service name
 set "serviceName=ZatcaEGS"
-set "binPath=%~dp0Zatca.EGS.exe"
+set "binPath=%~dp0ZatcaEGS.exe"
 
 REM Check if the service already exists
 sc query %serviceName% >nul 2>&1

diff --git a/Zatca.EGS/Extensions/DisclaimerMiddleware.cs → ZatcaEGS/Extensions/DisclaimerMiddleware.cs b/Zatca.EGS/Extensions/DisclaimerMiddleware.cs → ZatcaEGS/Extensions/DisclaimerMiddleware.cs
@@ -1,4 +1,4 @@
-//namespace Zatca.EGS.Extensions
+//namespace ZatcaEGS.Extensions
 //{
 //    public class DisclaimerMiddleware
 //    {
@@ -24,7 +24,7 @@
 //    }
 //}
 
-namespace Zatca.EGS.Extensions
+namespace ZatcaEGS.Extensions
 {
     public class DisclaimerMiddleware
     {

diff --git a/Zatca.EGS/Helpers/ComplianceTest.cs → ZatcaEGS/Helpers/ComplianceTest.cs b/Zatca.EGS/Helpers/ComplianceTest.cs → ZatcaEGS/Helpers/ComplianceTest.cs
@@ -1,10 +1,10 @@
 using System.Text;
-using Zatca.EGS.Models;
+using ZatcaEGS.Models;
 using Zatca.eInvoice;
 using Zatca.eInvoice.Helpers;
 using Zatca.eInvoice.Models;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public class ComplianceTest
     {

diff --git a/Zatca.EGS/Helpers/DocumentFormatter.cs → ZatcaEGS/Helpers/DocumentFormatter.cs b/Zatca.EGS/Helpers/DocumentFormatter.cs → ZatcaEGS/Helpers/DocumentFormatter.cs
@@ -5,7 +5,7 @@
 using System.Xml;
 using System.Xml.Linq;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public static class DocumentFormatter
     {

diff --git a/Zatca.EGS/Helpers/GuidValidationAttribute.cs → ZatcaEGS/Helpers/GuidValidationAttribute.cs b/Zatca.EGS/Helpers/GuidValidationAttribute.cs → ZatcaEGS/Helpers/GuidValidationAttribute.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public class GuidValidationAttribute : ValidationAttribute
     {

diff --git a/Zatca.EGS/Helpers/JsonParser.cs → ZatcaEGS/Helpers/JsonParser.cs b/Zatca.EGS/Helpers/JsonParser.cs → ZatcaEGS/Helpers/JsonParser.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json.Linq;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public class JsonParser
     {

diff --git a/Zatca.EGS/Helpers/ObjectCompressor.cs → ZatcaEGS/Helpers/ObjectCompressor.cs b/Zatca.EGS/Helpers/ObjectCompressor.cs → ZatcaEGS/Helpers/ObjectCompressor.cs
@@ -2,7 +2,7 @@
 using System.IO.Compression;
 using System.Text;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public static class ObjectCompressor
     {

diff --git a/Zatca.EGS/Helpers/QrCodeDecoder.cs → ZatcaEGS/Helpers/QrCodeDecoder.cs b/Zatca.EGS/Helpers/QrCodeDecoder.cs → ZatcaEGS/Helpers/QrCodeDecoder.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public class QrCodeDecoder
     {

diff --git a/Zatca.EGS/Helpers/RellayToInvoiceMapper.cs → ZatcaEGS/Helpers/RellayToInvoiceMapper.cs b/Zatca.EGS/Helpers/RellayToInvoiceMapper.cs → ZatcaEGS/Helpers/RellayToInvoiceMapper.cs
@@ -1,10 +1,10 @@
 using Microsoft.VisualBasic;
-using Zatca.EGS.Models;
+using ZatcaEGS.Models;
 using Zatca.eInvoice.Helpers;
 using Zatca.eInvoice.Models;
-using static Zatca.EGS.Helpers.VATInfoHelper;
+using static ZatcaEGS.Helpers.VATInfoHelper;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public class RelayToInvoiceMapper
     {

diff --git a/Zatca.EGS/Helpers/UrlHelper.cs → ZatcaEGS/Helpers/UrlHelper.cs b/Zatca.EGS/Helpers/UrlHelper.cs → ZatcaEGS/Helpers/UrlHelper.cs
@@ -1,7 +1,7 @@
 
-using Zatca.EGS.Models;
+using ZatcaEGS.Models;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public static class UrlHelper
     {

diff --git a/Zatca.EGS/Helpers/VATInfoHelper.cs → ZatcaEGS/Helpers/VATInfoHelper.cs b/Zatca.EGS/Helpers/VATInfoHelper.cs → ZatcaEGS/Helpers/VATInfoHelper.cs
@@ -1,5 +1,5 @@
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public class VATInfo
     {

diff --git a/Zatca.EGS/Helpers/VersionHelper.cs → ZatcaEGS/Helpers/VersionHelper.cs b/Zatca.EGS/Helpers/VersionHelper.cs → ZatcaEGS/Helpers/VersionHelper.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Reflection;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public static class VersionHelper
     {

diff --git a/Zatca.EGS/Helpers/ZatcaReference.cs → ZatcaEGS/Helpers/ZatcaReference.cs b/Zatca.EGS/Helpers/ZatcaReference.cs → ZatcaEGS/Helpers/ZatcaReference.cs
@@ -2,9 +2,9 @@
 using Newtonsoft.Json.Linq;
 using System.Net.Http.Headers;
 using System.Text;
-using Zatca.EGS.Models;
+using ZatcaEGS.Models;
 
-namespace Zatca.EGS.Helpers
+namespace ZatcaEGS.Helpers
 {
     public class ZatcaReference
     {