From 2e95e610a3b675eed0b8800b175c45bcba295a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Janou=C5=A1ek?= <janousek.jiri@gmail.com>
Date: Sun, 24 Oct 2021 12:12:40 +0200
Subject: [PATCH] Embed client secret

---
 src/nuvolakit-runner/MasterController.vala    |  2 +-
 src/nuvolakit-runner/secret.vapi              |  4 ----
 src/nuvolakit-runner/system/StartupCheck.vala |  2 +-
 src/nuvolakit-runner/tiliado/TiliadoApi2.vala |  2 ++
 wscript                                       | 12 ------------
 5 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 src/nuvolakit-runner/secret.vapi

diff --git a/src/nuvolakit-runner/MasterController.vala b/src/nuvolakit-runner/MasterController.vala
index 7a951d85..dab46c12 100644
--- a/src/nuvolakit-runner/MasterController.vala
+++ b/src/nuvolakit-runner/MasterController.vala
@@ -320,7 +320,7 @@ public class MasterController : Drtgtk.Application {
 
     private void init_tiliado_account() {
         var gumroad = new TiliadoGumroad(
-            config, Drt.String.unmask(TILIADO_OAUTH2_CLIENT_SECRET.data));
+            config, TILIADO_OAUTH2_CLIENT_SECRET);
         paywall = new TiliadoPaywall(this, gumroad);
         paywall.refresh_data.begin((o, res) => {paywall.refresh_data.end(res);});
     }
diff --git a/src/nuvolakit-runner/secret.vapi b/src/nuvolakit-runner/secret.vapi
deleted file mode 100644
index a08376b9..00000000
--- a/src/nuvolakit-runner/secret.vapi
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Nuvola {
-[CCode (cheader_filename = "secret.h", cname = "NUVOLA_TILIADO_OAUTH2_CLIENT_SECRET")]
-string TILIADO_OAUTH2_CLIENT_SECRET;
-}
diff --git a/src/nuvolakit-runner/system/StartupCheck.vala b/src/nuvolakit-runner/system/StartupCheck.vala
index 4dfa4442..25fcfa85 100644
--- a/src/nuvolakit-runner/system/StartupCheck.vala
+++ b/src/nuvolakit-runner/system/StartupCheck.vala
@@ -79,7 +79,7 @@ public class StartupCheck : GLib.Object {
         if (model.get_overall_status() != StartupStatus.ERROR) {
             connect_master_service();
             var gumroad = new TiliadoGumroad(
-                master.config ?? app.config, Drt.String.unmask(TILIADO_OAUTH2_CLIENT_SECRET.data)
+                master.config ?? app.config, TILIADO_OAUTH2_CLIENT_SECRET
             );
             paywall = new TiliadoPaywall(app, gumroad);
 
diff --git a/src/nuvolakit-runner/tiliado/TiliadoApi2.vala b/src/nuvolakit-runner/tiliado/TiliadoApi2.vala
index 334afc8c..7de7b9b7 100644
--- a/src/nuvolakit-runner/tiliado/TiliadoApi2.vala
+++ b/src/nuvolakit-runner/tiliado/TiliadoApi2.vala
@@ -24,6 +24,8 @@
 
 namespace Nuvola {
 
+public const string TILIADO_OAUTH2_CLIENT_SECRET = "R8YvORjche0jZvntny9644rqIaqGOmuR0NYDSnh7R36SbFcyvtNTV2tVpkv5XSkY5a1UFyNRtJ4AaijWxkpOx006fVQeQMEU4VcVc2SYq88VOxmV0Y3Dw3NqkUcnpwKN";
+
 public enum TiliadoMembership {
     NONE = 0,
     BASIC = 1,
diff --git a/wscript b/wscript
index d41d772f..670da017 100644
--- a/wscript
+++ b/wscript
@@ -517,18 +517,6 @@ def configure(ctx):
     for url in ("report_bug", "request_feature", "ask_question"):
         ctx.define("NUVOLA_%s_URL" % url.upper(), branding.get(url + "_url", "").strip())
 
-    with open("build/secret.h", "wb") as f:
-        client_secret = tiliado_api.get("client_secret", "")
-        if client_secret:
-            secret = b"{"
-            for i in mask(client_secret):
-                secret += str(i).encode("ascii") + b", "
-            secret += b"0}"
-        else:
-            secret = b'""'
-        f.write(
-            b'#pragma once\nstatic const char NUVOLA_TILIADO_OAUTH2_CLIENT_SECRET[] = '    + secret + b';')
-
 
 def build(ctx):
     def valalint(source_dir=None, **kwargs):