From f362427e7b26e955f2d369a5be5b529054c29992 Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Fri, 17 Jul 2020 08:32:23 +0000
Subject: [PATCH] built-in ClientID / ClientSecret take precedence

---
 cmd/telebit/telebit.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/cmd/telebit/telebit.go b/cmd/telebit/telebit.go
index 90d15b4..b4f9b87 100644
--- a/cmd/telebit/telebit.go
+++ b/cmd/telebit/telebit.go
@@ -157,15 +157,35 @@ func main() {
 	// Baked-in takes precedence
 	if 0 == len(ClientID) {
 		ClientID = *appID
+	} else if 0 != len(*appID) {
+		if ClientID != *appID {
+			fmt.Fprintf(os.Stderr, "invalid --app-id\n")
+			os.Exit(1)
+		}
 	}
 	if 0 == len(ClientID) {
 		ClientID = os.Getenv("APP_ID")
+	} else if 0 != len(os.Getenv("APP_ID")) {
+		if ClientID != os.Getenv("APP_ID") {
+			fmt.Fprintf(os.Stderr, "invalid APP_ID\n")
+			os.Exit(1)
+		}
 	}
 	if 0 == len(ClientSecret) {
 		ClientSecret = *secret
+	} else if 0 != len(*secret) {
+		if ClientSecret != *secret {
+			fmt.Fprintf(os.Stderr, "invalid --secret\n")
+			os.Exit(1)
+		}
 	}
 	if 0 == len(ClientSecret) {
 		ClientSecret = os.Getenv("SECRET")
+	} else if 0 != len(os.Getenv("SECRET")) {
+		if ClientSecret != os.Getenv("SECRET") {
+			fmt.Fprintf(os.Stderr, "invalid SECRET\n")
+			os.Exit(1)
+		}
 	}
 	ppid, err := machineid.ProtectedID(fmt.Sprintf("%s|%s", ClientID, ClientSecret))
 	if nil != err {