Release/1.0.0 rc4 (#15)

* Handle invalid login URL error.
* Update auth process to use correct production auth url.
* Update import wizard to create/destroy video capture source.

Author: FiniteSingularity

buildspec.json

@@ -42,7 +42,7 @@
     "versionMinor": 0,
     "versionPatch": 0,
     "buildNumber": 123,
-    "releaseType": "rc3",
+    "releaseType": "rc4",
     "author": "Elgato",
     "website": "https://elgato.com",
     "email": "support@elgato.com",

src/api.cpp

@@ -34,8 +34,9 @@ std::mutex MarketplaceApi::_mtx;
 
 MarketplaceApi::MarketplaceApi()
 	: _gatewayUrl(DEFAULT_GATEWAY_URL),
-	  _apiUrl(DEFAULT_API_URL),
-	  _storeUrl(DEFAULT_STORE_URL)
+	  _authUrl(DEFAULT_AUTH_URL),
+	  _storeUrl(DEFAULT_STORE_URL),
+	  _loggedIn(false)
 {
 	std::string dataPath = obs_get_module_data_path(obs_current_module());
 	dataPath += "/" + std::string(API_URLS_FILE);
@@ -44,7 +45,7 @@ MarketplaceApi::MarketplaceApi()
 		try {
 			json data = json::parse(f);
 			_gatewayUrl = data.at("gateway_url");
-			_apiUrl = data.at("api_url");
+			_authUrl = data.at("auth_url");
 			_storeUrl = data.at("store_url");
 			obs_log(LOG_INFO, "Url file loaded.");
 		} catch (...) {
@@ -55,7 +56,7 @@ MarketplaceApi::MarketplaceApi()
 		obs_log(LOG_INFO, "No url file found.");
 	}
 	obs_log(LOG_INFO, "Gateway Url: %s", _gatewayUrl.c_str());
-	obs_log(LOG_INFO, "API Url: %s", _apiUrl.c_str());
+	obs_log(LOG_INFO, "Auth Url: %s", _authUrl.c_str());
 	obs_log(LOG_INFO, "Store Url: %s", _storeUrl.c_str());
 }
 

src/api.hpp

@@ -22,8 +22,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <nlohmann/json.hpp>
 
 #define DEFAULT_GATEWAY_URL "https://mp-gateway.elgato.com"
-#define DEFAULT_API_URL "https://mp.elgato.com"
 #define DEFAULT_STORE_URL "https://marketplace.elgato.com"
+#define DEFAULT_AUTH_URL "https://account.elgato.com"
 #define API_URLS_FILE "api-urls.json"
 
 namespace elgatocloud {
@@ -37,8 +37,8 @@ class MarketplaceApi {
 public:
 	static MarketplaceApi *getInstance();
 	inline std::string gatewayUrl() const { return _gatewayUrl; }
-	inline std::string apiUrl() const { return _apiUrl; }
 	inline std::string storeUrl() const { return _storeUrl; }
+	inline std::string authUrl() const { return _authUrl; }
 	inline std::string firstName() const { return _firstName; }
 	inline std::string lastName() const { return _lastName; }
 	inline std::string avatarColor() const { return _avatarColor; }
@@ -50,8 +50,8 @@ class MarketplaceApi {
 	MarketplaceApi(const MarketplaceApi &cpy) = delete;
 
 	std::string _gatewayUrl;
-	std::string _apiUrl;
 	std::string _storeUrl;
+	std::string _authUrl;
 	bool _loggedIn;
 	std::string _firstName;
 	std::string _lastName;

src/elgato-cloud-config.cpp

@@ -241,7 +241,7 @@ DefaultAVWidget::~DefaultAVWidget()
 	}
 	if (_videoCaptureSource) {
 		obs_source_release(_videoCaptureSource);
-		obs_source_remove(_videoCaptureSource);
+		//obs_source_remove(_videoCaptureSource);
 	}
 	_levelsWidget = nullptr;
 }

src/elgato-cloud-data.cpp

@@ -114,13 +114,27 @@ void ElgatoCloud::_TokenRefresh(bool loadData, bool loadUserDetails)
 	encodeddata += "grant_type=refresh_token";
 	encodeddata += "&refresh_token=" + _refreshToken;
 	encodeddata += "&client_id=elgatolink";
-	std::string url = api->gatewayUrl();
+	std::string url = api->authUrl();
 	url += "/auth/realms/mp/protocol/openid-connect/token?";
 	url += encodeddata;
 	obs_log(LOG_INFO, "Token Refresh Called");
 	auto response = fetch_string_from_post(url, encodeddata);
-	auto responseJson = nlohmann::json::parse(response);
-	_ProcessLogin(responseJson, loadData);
+	try {
+		auto responseJson = nlohmann::json::parse(response);
+		_ProcessLogin(responseJson, loadData);
+	} catch (...) {
+		loggedIn = false;
+		loading = false;
+		authorizing = false;
+		loginError = true;
+		if (mainWindowOpen && window) {
+			QMetaObject::invokeMethod(
+				QCoreApplication::instance()->thread(),
+				[this]() {
+					window->setLoggedIn();
+				});
+		}
+	}
 }
 
 void ElgatoCloud::_Listen()
@@ -174,7 +188,7 @@ void ElgatoCloud::_Listen()
 				encodeddata += "&client_id=elgatolink";
 
 				auto api = MarketplaceApi::getInstance();
-				std::string url = api->gatewayUrl();
+				std::string url = api->authUrl();
 
 				url += "/auth/realms/mp/protocol/openid-connect/token?";
 				url += encodeddata;
@@ -247,7 +261,7 @@ void ElgatoCloud::StartLogin()
 
 	auto api = MarketplaceApi::getInstance();
 	std::string url =
-		api->gatewayUrl() +
+		api->authUrl() +
 		"/auth/realms/mp/protocol/openid-connect/auth?response_type=code&client_id=elgatolink&redirect_uri=https%3A%2F%2Foauth2-redirect.elgato.com%2Felgatolink%2Fauth&code_challenge=" +
 		stringhash + "&code_challenge_method=S256";
 

src/elgato-widgets.cpp

@@ -39,13 +39,15 @@ VideoCaptureSourceSelector::VideoCaptureSourceSelector(QWidget *parent,
 						       obs_data_t *videoData)
 	: QWidget(parent),
 	  _sourceName(sourceName),
-	  _noneSelected(true)
+	  _noneSelected(true),
+	  _deactivated(false)
 {
 	std::string imageBaseDir =
 		obs_get_module_data_path(obs_current_module());
 	imageBaseDir += "/images/";
 
 	setFixedWidth(258);
+	_loading = true;
 
 	auto layout = new QVBoxLayout(this);
 	layout->setContentsMargins(0, 0, 0, 16);
@@ -90,22 +92,17 @@ VideoCaptureSourceSelector::VideoCaptureSourceSelector(QWidget *parent,
 
 	connect(_videoSources, &QComboBox::currentIndexChanged, this,
 		[this](int index) {
+			_loading = true;
 			if (index > 0) {
 				auto vSettings = obs_data_create();
 				std::string id = _videoSourceIds[index];
 				obs_data_set_string(vSettings,
-						    "video_device_id",
-						    id.c_str());
-				obs_source_reset_settings(_videoCaptureSource,
-							  vSettings);
+					"video_device_id",
+					id.c_str());
+				_changeSource(vSettings);
 				obs_data_release(vSettings);
-				this->_noneSelected = false;
-				this->_videoPreview->show();
-				this->_blank->hide();
 			} else {
-				this->_noneSelected = true;
-				this->_videoPreview->hide();
-				this->_blank->show();
+				_changeSource(nullptr);
 			}
 		});
 }
@@ -163,11 +160,44 @@ void VideoCaptureSourceSelector::_setupTempSource(obs_data_t *videoData)
 	//obs_data_release(videoSettings);
 }
 
+void VideoCaptureSourceSelector::_changeSource(obs_data_t *vSettings)
+{
+	if (vSettings != nullptr) {
+		blog(LOG_INFO, "_changeSource called.");
+		if (_videoCaptureSource) {
+			obs_source_t* tmp = _videoCaptureSource;
+			_videoCaptureSource = nullptr;
+			obs_source_release(tmp);
+		}
+
+		const char* videoSourceId = "dshow_input";
+		const char* vId = obs_get_latest_input_type_id(videoSourceId);
+		_videoCaptureSource = obs_source_create_private(
+			vId, "elgato-cloud-video-config", vSettings);
+
+		this->_noneSelected = false;
+		this->_videoPreview->show();
+		this->_blank->hide();
+	} else {
+		this->_noneSelected = true;
+		this->_videoPreview->hide();
+		this->_blank->show();
+		if (_videoCaptureSource) {
+			obs_source_t* tmp = _videoCaptureSource;
+			_videoCaptureSource = nullptr;
+			obs_source_release(tmp);
+		}
+	}
+
+}
+
 void VideoCaptureSourceSelector::DrawVideoPreview(void *data, uint32_t cx,
 						  uint32_t cy)
 {
 	auto config = static_cast<VideoCaptureSourceSelector *>(data);
-
+	if (config->_loading) {
+		config->_loading = false;
+	}
 	if (!config->_videoCaptureSource)
 		return;
 

src/elgato-widgets.hpp

@@ -52,7 +52,10 @@ class VideoCaptureSourceSelector : public QWidget {
 	std::vector<std::string> _videoSourceIds;
 	std::string _sourceName;
 	void _setupTempSource(obs_data_t *videoData);
+	void _changeSource(obs_data_t* vSettings);
 	bool _noneSelected;
+	bool _loading;
+	bool _deactivated;
 };
 
 class ProgressSpinner : public QWidget {

src/setup-wizard.cpp

@@ -902,6 +902,7 @@ void StreamPackageSetupWizard::_buildSetupUI(
 	connect(aSetup, &AudioSetup::proceedPressed, this,
 		[this](std::string settings) {
 			_setup.audioSettings = settings;
+			// Nuke the video preview window
 			install();
 		});
 	connect(aSetup, &AudioSetup::backPressed, this,