From 42a665fb0d4117d5a176001b78209ab7863b5fee Mon Sep 17 00:00:00 2001
From: Roderick van Domburg <roderick@vandomburg.net>
Date: Thu, 25 Aug 2022 21:01:39 +0200
Subject: [PATCH] Revert most of cdf84925ad0bf3b872a13922a0e9ee9523e17f26

---
 core/src/config.rs   | 2 +-
 core/src/spclient.rs | 3 +--
 core/src/token.rs    | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/config.rs b/core/src/config.rs
index a873670e..7c5f75a1 100644
--- a/core/src/config.rs
+++ b/core/src/config.rs
@@ -2,7 +2,7 @@ use std::{fmt, path::PathBuf, str::FromStr};
 
 use url::Url;
 
-pub const KEYMASTER_CLIENT_ID: &str = "65b708073fc0480ea92a077233ca87bd";
+const KEYMASTER_CLIENT_ID: &str = "65b708073fc0480ea92a077233ca87bd";
 
 #[derive(Clone, Debug)]
 pub struct SessionConfig {
diff --git a/core/src/spclient.rs b/core/src/spclient.rs
index 1c8ea916..2d567f81 100644
--- a/core/src/spclient.rs
+++ b/core/src/spclient.rs
@@ -19,7 +19,6 @@ use thiserror::Error;
 use crate::{
     apresolve::SocketAddress,
     cdn_url::CdnUrl,
-    config::KEYMASTER_CLIENT_ID,
     error::ErrorKind,
     protocol::{
         canvaz::EntityCanvazRequest,
@@ -120,7 +119,7 @@ impl SpClient {
         message.set_request_type(ClientTokenRequestType::REQUEST_CLIENT_DATA_REQUEST);
 
         let client_data = message.mut_client_data();
-        client_data.set_client_id(KEYMASTER_CLIENT_ID.to_string());
+        client_data.set_client_id(self.session().client_id());
         client_data.set_client_version(version::SEMVER.to_string());
 
         let connectivity_data = client_data.mut_connectivity_sdk_data();
diff --git a/core/src/token.rs b/core/src/token.rs
index af253ddc..bea37074 100644
--- a/core/src/token.rs
+++ b/core/src/token.rs
@@ -13,7 +13,7 @@ use std::time::{Duration, Instant};
 use serde::Deserialize;
 use thiserror::Error;
 
-use crate::{config::KEYMASTER_CLIENT_ID, Error};
+use crate::Error;
 
 component! {
     TokenProvider : TokenProviderInner {
@@ -65,7 +65,7 @@ impl TokenProvider {
 
     // scopes must be comma-separated
     pub async fn get_token(&self, scopes: &str) -> Result<Token, Error> {
-        let client_id = KEYMASTER_CLIENT_ID;
+        let client_id = self.session().client_id();
         if client_id.is_empty() {
             return Err(Error::invalid_argument("Client ID cannot be empty"));
         }