0.9.9.12

0.9.9.12

QobuzDownloaderX/App.config

@@ -100,6 +100,15 @@
             <setting name="audioType" serializeAs="String">
                 <value>.flac</value>
             </setting>
+            <setting name="savedUserID" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="savedUserAuthToken" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="savedAltLoginValue" serializeAs="String">
+                <value>0</value>
+            </setting>
         </QobuzDownloaderX.Properties.Settings>
     </userSettings>
 </configuration>

QobuzDownloaderX/Form1.cs

@@ -65,7 +65,17 @@ namespace QobuzDownloaderX
             // Welcome the user after successful login.
             output.Invoke(new Action(() => output.Text = String.Empty));
             output.Invoke(new Action(() => output.AppendText("Welcome " + displayName + "!\r\n")));
-            output.Invoke(new Action(() => output.AppendText("Qobuz Account Type - " + accountType + "\r\n\r\n")));
+
+            // Show account type if user logged in normally.
+            if (accountType == null | accountType == "")
+            {
+                output.Invoke(new Action(() => output.AppendText("\r\n"))); 
+            }
+            else
+            {
+                output.Invoke(new Action(() => output.AppendText("Qobuz Account Type - " + accountType + "\r\n\r\n")));
+            }
+            
             output.Invoke(new Action(() => output.AppendText("Your user_auth_token has been set for this session!")));
 
             // Get and display version number.
@@ -354,6 +364,7 @@ namespace QobuzDownloaderX
             flacMidCheckbox.Invoke(new Action(() => flacMidCheckbox.Visible = false));
             flacHighCheckbox.Invoke(new Action(() => flacHighCheckbox.Visible = false));
             downloadButton.Invoke(new Action(() => downloadButton.Enabled = false));
+
             // Check if there's no selected path.
             if (folderBrowserDialog.SelectedPath == null | folderBrowserDialog.SelectedPath == "")
             {

QobuzDownloaderX/LoginForm-v2.Designer.cs

@@ -32,18 +32,23 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.disableLogin = new System.Windows.Forms.CheckBox();
             this.verNumLabel2 = new System.Windows.Forms.Label();
+            this.md5Button = new System.Windows.Forms.Button();
             this.exitLabel = new System.Windows.Forms.Label();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.userAuthTokenTextbox = new System.Windows.Forms.TextBox();
             this.loginButton = new System.Windows.Forms.Button();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel4 = new System.Windows.Forms.Panel();
             this.emailTextbox = new System.Windows.Forms.TextBox();
             this.passwordTextbox = new System.Windows.Forms.TextBox();
-            this.md5Button = new System.Windows.Forms.Button();
             this.loginText = new System.Windows.Forms.Label();
             this.getSecretBG = new System.ComponentModel.BackgroundWorker();
             this.loginBG = new System.ComponentModel.BackgroundWorker();
             this.visableCheckbox = new System.Windows.Forms.CheckBox();
+            this.altLoginLabel = new System.Windows.Forms.Label();
+            this.altLoginTutLabel = new System.Windows.Forms.Label();
+            this.userIdTextbox = new System.Windows.Forms.TextBox();
+            this.altLoginBG = new System.ComponentModel.BackgroundWorker();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
@@ -88,6 +93,23 @@
             this.verNumLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.verNumLabel2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.verNumLabel2_MouseMove);
             // 
+            // md5Button
+            // 
+            this.md5Button.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(112)))), ((int)(((byte)(239)))));
+            this.md5Button.Enabled = false;
+            this.md5Button.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+            this.md5Button.FlatAppearance.BorderSize = 2;
+            this.md5Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.md5Button.ForeColor = System.Drawing.Color.White;
+            this.md5Button.Location = new System.Drawing.Point(227, 122);
+            this.md5Button.Name = "md5Button";
+            this.md5Button.Size = new System.Drawing.Size(43, 27);
+            this.md5Button.TabIndex = 9;
+            this.md5Button.Text = "MD5";
+            this.md5Button.UseVisualStyleBackColor = false;
+            this.md5Button.Visible = false;
+            this.md5Button.Click += new System.EventHandler(this.md5Button_Click);
+            // 
             // exitLabel
             // 
             this.exitLabel.AutoSize = true;
@@ -114,6 +136,22 @@
             this.pictureBox1.TabStop = false;
             this.pictureBox1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseMove);
             // 
+            // userAuthTokenTextbox
+            // 
+            this.userAuthTokenTextbox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+            this.userAuthTokenTextbox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.userAuthTokenTextbox.Font = new System.Drawing.Font("Trebuchet MS", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.userAuthTokenTextbox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(92)))), ((int)(((byte)(102)))));
+            this.userAuthTokenTextbox.Location = new System.Drawing.Point(12, 255);
+            this.userAuthTokenTextbox.Multiline = true;
+            this.userAuthTokenTextbox.Name = "userAuthTokenTextbox";
+            this.userAuthTokenTextbox.Size = new System.Drawing.Size(237, 23);
+            this.userAuthTokenTextbox.TabIndex = 35;
+            this.userAuthTokenTextbox.Text = "user_auth_token";
+            this.userAuthTokenTextbox.Visible = false;
+            this.userAuthTokenTextbox.Click += new System.EventHandler(this.userAuthTokenTextbox_Click);
+            this.userAuthTokenTextbox.Leave += new System.EventHandler(this.userAuthTokenTextbox_Leave);
+            // 
             // loginButton
             // 
             this.loginButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(112)))), ((int)(((byte)(239)))));
@@ -136,7 +174,6 @@
             this.panel3.Name = "panel3";
             this.panel3.Size = new System.Drawing.Size(258, 1);
             this.panel3.TabIndex = 2;
-            this.panel3.Click += new System.EventHandler(this.panel3_Click);
             // 
             // panel4
             // 
@@ -145,7 +182,6 @@
             this.panel4.Name = "panel4";
             this.panel4.Size = new System.Drawing.Size(258, 1);
             this.panel4.TabIndex = 2;
-            this.panel4.Click += new System.EventHandler(this.panel4_Click);
             // 
             // emailTextbox
             // 
@@ -171,34 +207,17 @@
             this.passwordTextbox.Location = new System.Drawing.Point(12, 255);
             this.passwordTextbox.Multiline = true;
             this.passwordTextbox.Name = "passwordTextbox";
-            this.passwordTextbox.Size = new System.Drawing.Size(209, 23);
+            this.passwordTextbox.Size = new System.Drawing.Size(237, 23);
             this.passwordTextbox.TabIndex = 8;
             this.passwordTextbox.Text = "Password";
             this.passwordTextbox.Click += new System.EventHandler(this.passwordTextbox_Click);
             this.passwordTextbox.Leave += new System.EventHandler(this.passwordTextbox_Leave);
             // 
-            // md5Button
-            // 
-            this.md5Button.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(112)))), ((int)(((byte)(239)))));
-            this.md5Button.Enabled = false;
-            this.md5Button.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
-            this.md5Button.FlatAppearance.BorderSize = 2;
-            this.md5Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.md5Button.ForeColor = System.Drawing.Color.White;
-            this.md5Button.Location = new System.Drawing.Point(227, 122);
-            this.md5Button.Name = "md5Button";
-            this.md5Button.Size = new System.Drawing.Size(43, 27);
-            this.md5Button.TabIndex = 9;
-            this.md5Button.Text = "MD5";
-            this.md5Button.UseVisualStyleBackColor = false;
-            this.md5Button.Visible = false;
-            this.md5Button.Click += new System.EventHandler(this.md5Button_Click);
-            // 
             // loginText
             // 
             this.loginText.Font = new System.Drawing.Font("Trebuchet MS", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.loginText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(92)))), ((int)(((byte)(102)))));
-            this.loginText.Location = new System.Drawing.Point(12, 333);
+            this.loginText.Location = new System.Drawing.Point(12, 349);
             this.loginText.Name = "loginText";
             this.loginText.Size = new System.Drawing.Size(258, 23);
             this.loginText.TabIndex = 30;
@@ -223,12 +242,58 @@
             this.visableCheckbox.UseVisualStyleBackColor = true;
             this.visableCheckbox.CheckedChanged += new System.EventHandler(this.visableCheckbox_CheckedChanged);
             // 
+            // altLoginLabel
+            // 
+            this.altLoginLabel.Font = new System.Drawing.Font("Trebuchet MS", 8.25F);
+            this.altLoginLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(92)))), ((int)(((byte)(102)))));
+            this.altLoginLabel.Location = new System.Drawing.Point(12, 326);
+            this.altLoginLabel.Name = "altLoginLabel";
+            this.altLoginLabel.Size = new System.Drawing.Size(258, 20);
+            this.altLoginLabel.TabIndex = 32;
+            this.altLoginLabel.Text = "Can\'t login? Click here";
+            this.altLoginLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.altLoginLabel.Click += new System.EventHandler(this.altLoginLabel_Click);
+            // 
+            // altLoginTutLabel
+            // 
+            this.altLoginTutLabel.AutoSize = true;
+            this.altLoginTutLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(92)))), ((int)(((byte)(102)))));
+            this.altLoginTutLabel.Location = new System.Drawing.Point(77, 180);
+            this.altLoginTutLabel.Name = "altLoginTutLabel";
+            this.altLoginTutLabel.Size = new System.Drawing.Size(128, 13);
+            this.altLoginTutLabel.TabIndex = 33;
+            this.altLoginTutLabel.Text = "Click Here for Instructions";
+            this.altLoginTutLabel.Visible = false;
+            this.altLoginTutLabel.Click += new System.EventHandler(this.altLoginTutLabel_Click);
+            // 
+            // userIdTextbox
+            // 
+            this.userIdTextbox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+            this.userIdTextbox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.userIdTextbox.Font = new System.Drawing.Font("Trebuchet MS", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.userIdTextbox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(92)))), ((int)(((byte)(102)))));
+            this.userIdTextbox.Location = new System.Drawing.Point(12, 199);
+            this.userIdTextbox.Multiline = true;
+            this.userIdTextbox.Name = "userIdTextbox";
+            this.userIdTextbox.Size = new System.Drawing.Size(258, 23);
+            this.userIdTextbox.TabIndex = 9;
+            this.userIdTextbox.Text = "user_id";
+            this.userIdTextbox.Visible = false;
+            this.userIdTextbox.Click += new System.EventHandler(this.userIdTextbox_Click);
+            this.userIdTextbox.Leave += new System.EventHandler(this.userIdTextbox_Leave);
+            // 
+            // altLoginBG
+            // 
+            this.altLoginBG.DoWork += new System.ComponentModel.DoWorkEventHandler(this.altLoginBG_DoWork);
+            // 
             // LoginFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
-            this.ClientSize = new System.Drawing.Size(282, 377);
+            this.ClientSize = new System.Drawing.Size(282, 392);
+            this.Controls.Add(this.altLoginTutLabel);
+            this.Controls.Add(this.altLoginLabel);
             this.Controls.Add(this.visableCheckbox);
             this.Controls.Add(this.loginText);
             this.Controls.Add(this.panel4);
@@ -237,6 +302,8 @@
             this.Controls.Add(this.emailTextbox);
             this.Controls.Add(this.loginButton);
             this.Controls.Add(this.panel1);
+            this.Controls.Add(this.userIdTextbox);
+            this.Controls.Add(this.userAuthTokenTextbox);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "LoginFrm";
@@ -267,5 +334,10 @@
         private System.Windows.Forms.Label verNumLabel2;
         private System.Windows.Forms.CheckBox visableCheckbox;
         private System.Windows.Forms.CheckBox disableLogin;
+        private System.Windows.Forms.TextBox userAuthTokenTextbox;
+        private System.Windows.Forms.Label altLoginLabel;
+        private System.Windows.Forms.Label altLoginTutLabel;
+        private System.Windows.Forms.TextBox userIdTextbox;
+        private System.ComponentModel.BackgroundWorker altLoginBG;
     }
 }

QobuzDownloaderX/LoginForm-v2.cs

@@ -47,6 +47,9 @@ namespace QobuzDownloaderX
 
         public string appSecret { get; set; }
         public string appID { get; set; }
+        public string userID { get; set; }
+        public string userAuthToken { get; set; }
+        public string altLoginValue { get; set; }
 
         string errorLog = Path.GetDirectoryName(Application.ExecutablePath) + "\\Latest_Error.log";
         string dllCheck = Path.GetDirectoryName(Application.ExecutablePath) + "\\taglib-sharp.dll";
@@ -163,83 +166,397 @@ namespace QobuzDownloaderX
             // Set saved settings to correct places.
             emailTextbox.Text = Settings.Default.savedEmail.ToString();
             passwordTextbox.Text = Settings.Default.savedPassword.ToString();
+            userIdTextbox.Text = Settings.Default.savedUserID.ToString();
+            userAuthTokenTextbox.Text = Settings.Default.savedUserAuthToken.ToString();
+            altLoginValue = Settings.Default.savedAltLoginValue.ToString();
 
+            // Set alt login mode & label text based on saved value
+            if (altLoginValue == "0")
+            {
+                // Change alt login label text
+                altLoginLabel.Text = "Can't login? Click here";
+
+                // Hide alt login methods
+                altLoginTutLabel.Visible = false;
+                userIdTextbox.Visible = false;
+                userAuthTokenTextbox.Visible = false;
+
+                // Unhide standard login methods
+                emailTextbox.Visible = true;
+                passwordTextbox.Visible = true;
+            }
+            else if (altLoginValue == "1")
+            {
+                // Change alt login label text
+                altLoginLabel.Text = "Login normally? Click here";
+
+                // Hide standard login methods
+                emailTextbox.Visible = false;
+                passwordTextbox.Visible = false;
+
+                // Unhide alt login methods
+                altLoginTutLabel.Visible = true;
+                userIdTextbox.Visible = true;
+                userAuthTokenTextbox.Visible = true;
+            }
+
+            // Set values for email textbox.
             if (emailTextbox.Text != "Email")
             {
                 emailTextbox.ForeColor = Color.FromArgb(186, 186, 186);
             }
-
             if (emailTextbox.Text == null | emailTextbox.Text == "")
             {
                 emailTextbox.ForeColor = Color.FromArgb(88, 92, 102);
                 emailTextbox.Text = "Email";
             }
 
+            // Set values for user_id textbox.
+            if (userIdTextbox.Text != "user_id")
+            {
+                userIdTextbox.ForeColor = Color.FromArgb(186, 186, 186);
+            }
+            if (userIdTextbox.Text == null | userIdTextbox.Text == "")
+            {
+                userIdTextbox.ForeColor = Color.FromArgb(88, 92, 102);
+                userIdTextbox.Text = "user_id";
+            }
+
+            // Set values for password textbox.
             if (passwordTextbox.Text != "Password")
             {
                 passwordTextbox.PasswordChar = '*';
                 passwordTextbox.UseSystemPasswordChar = false;
                 passwordTextbox.ForeColor = Color.FromArgb(186, 186, 186);
             }
-
             if (passwordTextbox.Text == null | passwordTextbox.Text == "")
             {
                 passwordTextbox.ForeColor = Color.FromArgb(88, 92, 102);
                 passwordTextbox.UseSystemPasswordChar = true;
                 passwordTextbox.Text = "Password";
             }
+
+            // Set values for user_auth_token textbox.
+            if (userAuthTokenTextbox.Text != "user_auth_token")
+            {
+                userAuthTokenTextbox.PasswordChar = '*';
+                userAuthTokenTextbox.UseSystemPasswordChar = false;
+                userAuthTokenTextbox.ForeColor = Color.FromArgb(186, 186, 186);
+            }
+            if (userAuthTokenTextbox.Text == null | userAuthTokenTextbox.Text == "")
+            {
+                userAuthTokenTextbox.ForeColor = Color.FromArgb(88, 92, 102);
+                userAuthTokenTextbox.UseSystemPasswordChar = true;
+                userAuthTokenTextbox.Text = "user_auth_token";
+            }
         }
 
         private void loginButton_Click(object sender, EventArgs e)
         {
-            if (emailTextbox.Text == "Email" | emailTextbox.Text == null | emailTextbox.Text == "")
+            // Hide alt login label until job is finished or failed
+            altLoginLabel.Visible = false;
+
+            // If logging in normally (email & password)
+            if (altLoginValue == "0")
             {
-                // If there's no email typed in.
+                #region Normal Login
-                loginText.Invoke(new Action(() => loginText.Text = "No email, please input email first."));
+                if (emailTextbox.Text == "Email" | emailTextbox.Text == null | emailTextbox.Text == "")
-                return;
-            }
-
-            if (passwordTextbox.Text == "Password")
-            {
-                // If there's no password typed in.
-                loginText.Invoke(new Action(() => loginText.Text = "No password typed, please input password first."));
-                return;
-            }
-
-            string plainTextPW = passwordTextbox.Text;
-
-            var passMD5CheckLog = Regex.Match(plainTextPW, "(?<md5Test>^[0-9a-f]{32}$)").Groups;
-            var passMD5Check = passMD5CheckLog[1].Value;
-
-            if (passMD5Check == null | passMD5Check == "")
-            {
-                // Generate the MD5 hash using the string created above.
-                using (MD5 md5PassHash = MD5.Create())
                 {
-                    string hashedPW = GetMd5Hash(md5PassHash, plainTextPW);
+                    // If there's no email typed in.
+                    loginText.Invoke(new Action(() => loginText.Text = "No email, please input email first."));
+                    return;
+                }
 
-                    if (VerifyMd5Hash(md5PassHash, plainTextPW, hashedPW))
+                if (passwordTextbox.Text == "Password")
+                {
+                    // If there's no password typed in.
+                    loginText.Invoke(new Action(() => loginText.Text = "No password typed, please input password first."));
+                    return;
+                }
+
+                string plainTextPW = passwordTextbox.Text;
+
+                var passMD5CheckLog = Regex.Match(plainTextPW, "(?<md5Test>^[0-9a-f]{32}$)").Groups;
+                var passMD5Check = passMD5CheckLog[1].Value;
+
+                if (passMD5Check == null | passMD5Check == "")
+                {
+                    // Generate the MD5 hash using the string created above.
+                    using (MD5 md5PassHash = MD5.Create())
                     {
-                        // If the MD5 hash is verified, proceed to get the streaming URL.
+                        string hashedPW = GetMd5Hash(md5PassHash, plainTextPW);
-                        passwordTextbox.Text = hashedPW;
+
-                    }
+                        if (VerifyMd5Hash(md5PassHash, plainTextPW, hashedPW))
-                    else
+                        {
-                    {
+                            // If the MD5 hash is verified, proceed to get the streaming URL.
-                        // If the hash can't be verified.
+                            passwordTextbox.Text = hashedPW;
-                        loginText.Invoke(new Action(() => loginText.Text = "Hashing failed. Please retry."));
+                        }
-                        return;
+                        else
+                        {
+                            // If the hash can't be verified.
+                            loginText.Invoke(new Action(() => loginText.Text = "Hashing failed. Please retry."));
+                            return;
+                        }
                     }
                 }
+
+                // Save info locally to be used on next launch.
+                Settings.Default.savedEmail = emailTextbox.Text;
+                Settings.Default.savedPassword = passwordTextbox.Text;
+                Settings.Default.savedAltLoginValue = altLoginValue;
+                Settings.Default.Save();
+
+                loginText.Text = "Getting App ID and Secret...";
+                loginButton.Enabled = false;
+                getSecretBG.RunWorkerAsync();
+                #endregion
+            }
+            // If logging in the alternate way (user_id & user_auth_token)
+            else
+            {
+                #region Alt Login
+                if (userIdTextbox.Text == "user_id" | userIdTextbox.Text == null | userIdTextbox.Text == "")
+                {
+                    // If there's no email typed in.
+                    loginText.Invoke(new Action(() => loginText.Text = "No user_id, please input user_id first."));
+                    return;
+                }
+
+                if (userAuthTokenTextbox.Text == "user_auth_token")
+                {
+                    // If there's no password typed in.
+                    loginText.Invoke(new Action(() => loginText.Text = "No user_auth_token typed, please input user_auth_token first."));
+                    return;
+                }
+
+                // Set user_id & user_auth_token to login.
+                userID = userIdTextbox.Text;
+                userAuthToken = userAuthTokenTextbox.Text;
+
+                // Save info locally to be used on next launch.
+                Settings.Default.savedUserID = userIdTextbox.Text;
+                Settings.Default.savedUserAuthToken = userAuthTokenTextbox.Text;
+                Settings.Default.savedAltLoginValue = altLoginValue;
+                Settings.Default.Save();
+
+                loginText.Text = "Getting App ID and Secret...";
+                loginButton.Enabled = false;
+                getSecretBG.RunWorkerAsync();
+                #endregion
+            }
+        }
+
+        private void getSecretBG_DoWork(object sender, DoWorkEventArgs e)
+        {
+            getSecretBG.WorkerSupportsCancellation = true;
+
+            WebClient bundleURLClient = new WebClient();
+            string bundleHTML = bundleURLClient.DownloadString("https://play.qobuz.com/login");
+
+            // Grab link to bundle.js
+            var bundleLog = Regex.Match(bundleHTML, "<script src=\"(?<bundleJS>\\/resources\\/\\d+\\.\\d+\\.\\d+-[a-z]\\d{3}\\/bundle\\.js)").Groups;
+            var bundleSuffix = bundleLog[1].Value;
+            var bundleURL = "https://play.qobuz.com" + bundleSuffix;
+
+            WebRequest bundleWR = WebRequest.Create(bundleURL);
+
+            try
+            {
+                WebResponse bundleWS = bundleWR.GetResponse();
+                StreamReader bundleSR = new StreamReader(bundleWS.GetResponseStream());
+
+                string getBundleRequest = bundleSR.ReadToEnd();
+                string text = getBundleRequest;
+
+                // Grab app_id from bundle.js
+                var bundleLog0 = Regex.Match(getBundleRequest, "\\):\\(n.qobuzapi={app_id:\"(?<appID>.*?)\",app_secret:").Groups;
+                appID = bundleLog0[1].Value;
+
+                // Grab "info" and "extras"
+                var bundleLog1 = Regex.Match(getBundleRequest, "{offset:\"(?<notUsed>.*?)\",name:\"Europe\\/Berlin\",info:\"(?<info>.*?)\",extras:\"(?<extras>.*?)\"}").Groups;
+                var bundleInfo = bundleLog1[2].Value;
+                var bundleExtras = bundleLog1[3].Value;
+
+                // Grab "seed"
+                var bundleLog2 = Regex.Match(getBundleRequest, "window.utimezone.paris\\):h.initialSeed\\(\"(?<seed>.*?)\",window.utimezone.berlin\\)").Groups;
+                var bundleSeed = bundleLog2[1].Value;
+
+                // Step 1 of getting the app_secret
+                string B64step1 = bundleSeed + bundleInfo + bundleExtras;
+                B64step1 = B64step1.Remove(B64step1.Length - 44, 44);
+                byte[] step1Bytes = Encoding.UTF8.GetBytes(B64step1);
+                B64step1 = Convert.ToBase64String(step1Bytes);
+
+                // Step 2 of getting the app_secret
+                byte[] step2Data = Convert.FromBase64String(B64step1);
+                string B64step2 = Encoding.UTF8.GetString(step2Data);
+
+                // Step 3 of getting the app_secret
+                byte[] step3Data = Convert.FromBase64String(B64step2);
+
+                // Set app_secret
+                appSecret = Encoding.UTF8.GetString(step3Data);
+                loginText.Invoke(new Action(() => loginText.Text = "ID and Secret Obtained! Logging in.."));
+                System.Threading.Thread.Sleep(1000);
+            }
+            catch (Exception bundleEx)
+            {
+                // If obtaining bundle.js info fails, show error info.
+                string bundleError = bundleEx.ToString();
+                loginText.Invoke(new Action(() => loginText.Text = "Couldn't obtain app info. Error Log saved"));
+                System.IO.File.WriteAllText(errorLog, bundleError);
+                bundleWR.Abort();
+                loginButton.Invoke(new Action(() => loginButton.Enabled = true));
+                altLoginLabel.Invoke(new Action(() => altLoginLabel.Visible = true));
+                return;
             }
 
-            // Save info locally to be used on next launch.
+            bundleWR.Abort();
-            Settings.Default.savedEmail = emailTextbox.Text;
+
-            Settings.Default.savedPassword = passwordTextbox.Text;
+            if (altLoginValue == "0")
-            Settings.Default.Save();
+            {
+                loginBG.RunWorkerAsync();
+            }
+            else if (altLoginValue == "1")
+            {
+                altLoginBG.RunWorkerAsync();
+            }
+            getSecretBG.CancelAsync();
+        }
+
+        private void loginBG_DoWork(object sender, DoWorkEventArgs e)
+        {
+            loginBG.WorkerSupportsCancellation = true;
+
+            // Create WebRequest to login using login information from input textboxes.
+            WebRequest wr = WebRequest.Create("https://www.qobuz.com/api.json/0.2/user/login?email=" + emailTextbox.Text + "&password=" + passwordTextbox.Text + "&app_id=" + appID);
+
+            try
+            {
+                // Grab info to be displayed and used.
+                WebResponse ws = wr.GetResponse();
+                StreamReader sr = new StreamReader(ws.GetResponseStream());
+
+                string loginRequest = sr.ReadToEnd();
+                string text = loginRequest;
+
+                // Grab user_id
+                var userIDLog = Regex.Match(loginRequest, "{\"user\":{\"id\":(?<userID>.*?),\"publicId").Groups;
+                var userID = userIDLog[1].Value;
+                qbdlx.userID = userID;
+
+                // Grab display name
+                var displayNameLog = Regex.Match(loginRequest, "\"display_name\":\"(?<displayName>.*?)\",\\\"").Groups;
+                var displayName = displayNameLog[1].Value;
+                qbdlx.displayName = displayName;
+
+                // Grab account type
+                var accountTypeLog = Regex.Match(loginRequest, "short_label\":\"(?<accountType>\\w+)").Groups;
+                var accountType = accountTypeLog[1].Value;
+                qbdlx.accountType = accountType;
+
+                // Grab authentication token
+                var userAuth = Regex.Match(loginRequest, "\"user_auth_token\":\"(?<userAuth>.*?)\\\"}").Groups;
+                var userAuthToken = userAuth[1].Value;
+
+                // Grab profile image
+                var profilePic = Regex.Match(loginRequest, "avatar\\\":\\\"(?<profilePic>.*?)\",").Groups;
+                var profilePicURL = profilePic[1].Value.Replace(@"\", null).Replace("s=50", "s=20");
+                qbdlx.profilePic = profilePicURL;
+
+                // Set user_auth_token
+                qbdlx.userAuth = userAuthToken;
+                loginText.Invoke(new Action(() => loginText.Text = "Login Successful! Launching QBDLX..."));
+            }
+            catch (Exception ex)
+            {
+                // If connection to API fails, show error info.
+                string error = ex.ToString();
+                loginText.Invoke(new Action(() => loginText.Text = "Login Failed. Error Log saved"));
+                System.IO.File.WriteAllText(errorLog, error);
+                wr.Abort();
+                loginButton.Invoke(new Action(() => loginButton.Enabled = true));
+                altLoginLabel.Invoke(new Action(() => altLoginLabel.Visible = true));
+                return;
+            }
+
+            wr.Abort();
+            finishLogin(sender, e);
+            loginBG.CancelAsync();
+        }
+
+        private void altLoginBG_DoWork(object sender, DoWorkEventArgs e)
+        {
+            altLoginBG.WorkerSupportsCancellation = true;
+
+            // Create WebRequest to login using login information from input textboxes.
+            WebRequest wr = WebRequest.Create("http://www.qobuz.com/api.json/0.2/user/get?user_id=" + userID + "&user_auth_token=" + userAuthToken + "&app_id=" + appID);
+
+            try
+            {
+                // Grab info to be displayed and used.
+                WebResponse ws = wr.GetResponse();
+                StreamReader sr = new StreamReader(ws.GetResponseStream());
+
+                string loginRequest = sr.ReadToEnd();
+                string text = loginRequest;
+
+                // Use user_id that was used by the user
+                qbdlx.userID = userID;
+
+                // Use user_auth_token that was used by the user
+                qbdlx.userAuth = userAuthToken;
+
+                // Grab display name
+                var displayNameLog = Regex.Match(loginRequest, "\"display_name\":\"(?<displayName>.*?)\",\\\"").Groups;
+                var displayName = displayNameLog[1].Value;
+                qbdlx.displayName = displayName;
+
+                // Grab account type
+                var accountTypeLog = Regex.Match(loginRequest, "short_label\":\"(?<accountType>\\w+)").Groups;
+                var accountType = accountTypeLog[1].Value;
+                qbdlx.accountType = accountType;
+
+                // Grab profile image
+                var profilePic = Regex.Match(loginRequest, "avatar\\\":\\\"(?<profilePic>.*?)\\\"}").Groups;
+                var profilePicURL = profilePic[1].Value.Replace(@"\", null).Replace("s=50", "s=20");
+                qbdlx.profilePic = profilePicURL;
+                
+                loginText.Invoke(new Action(() => loginText.Text = "Login Successful! Launching QBDLX..."));
+            }
+            catch (Exception ex)
+            {
+                // If connection to API fails, show error info.
+                string error = ex.ToString();
+                loginText.Invoke(new Action(() => loginText.Text = "Login Failed. Error Log saved"));
+                System.IO.File.WriteAllText(errorLog, error);
+                wr.Abort();
+                loginButton.Invoke(new Action(() => loginButton.Enabled = true));
+                altLoginLabel.Invoke(new Action(() => altLoginLabel.Visible = true));
+                return;
+            }
+
+            wr.Abort();
+            finishLogin(sender, e);
+            altLoginBG.CancelAsync();
+        }
+
+        private void finishLogin(object sender, EventArgs e)
+        {
+            loginButton.Invoke(new Action(() => loginButton.Enabled = true));
+            altLoginLabel.Invoke(new Action(() => altLoginLabel.Visible = true));
+            // If info is legit, go to the main form.
+            qbdlx.appid = appID;
+            qbdlx.eMail = emailTextbox.Text;
+            qbdlx.password = passwordTextbox.Text;
+            qbdlx.appSecret = appSecret;
+
+            if (disableLogin.Checked != true)
+            {
+                this.Invoke(new Action(() => this.Hide()));
+                Application.Run(qbdlx);
+            }
 
-            loginText.Text = "Getting App ID and Secret...";
-            loginButton.Enabled = false;
-            getSecretBG.RunWorkerAsync();
         }
 
         #region Textbox Focous & Text Change
@@ -285,17 +602,6 @@ namespace QobuzDownloaderX
             }
         }
 
-        private void panel3_Click(object sender, EventArgs e)
-        {
-            emailTextbox.Focus();
-
-            if (emailTextbox.Text == "Email")
-            {
-                emailTextbox.Text = null;
-                emailTextbox.ForeColor = Color.FromArgb(186, 186, 186);
-            }
-        }
-
         private void emailTextbox_Leave(object sender, EventArgs e)
         {
             if (emailTextbox.Text == null | emailTextbox.Text == "")
@@ -318,19 +624,6 @@ namespace QobuzDownloaderX
             }
         }
 
-        private void panel4_Click(object sender, EventArgs e)
-        {
-            passwordTextbox.Focus();
-
-            if (passwordTextbox.Text == "Password")
-            {
-                passwordTextbox.Text = null;
-                passwordTextbox.PasswordChar = '*';
-                passwordTextbox.UseSystemPasswordChar = false;
-                passwordTextbox.ForeColor = Color.FromArgb(186, 186, 186);
-            }
-        }
-
         private void passwordTextbox_Leave(object sender, EventArgs e)
         {
             if (passwordTextbox.Text == null | passwordTextbox.Text == "")
@@ -343,6 +636,49 @@ namespace QobuzDownloaderX
 
         #endregion
 
+        #region user_id Textbox
+        private void userIdTextbox_Click(object sender, EventArgs e)
+        {
+            if (userIdTextbox.Text == "user_id")
+            {
+                userIdTextbox.Text = null;
+                userIdTextbox.ForeColor = Color.FromArgb(186, 186, 186);
+            }
+        }
+
+        private void userIdTextbox_Leave(object sender, EventArgs e)
+        {
+            if (userIdTextbox.Text == null | userIdTextbox.Text == "")
+            {
+                userIdTextbox.ForeColor = Color.FromArgb(88, 92, 102);
+                userIdTextbox.Text = "user_id";
+            }
+        }
+        #endregion
+
+        #region user_auth_token Textbox
+        private void userAuthTokenTextbox_Click(object sender, EventArgs e)
+        {
+            if (userAuthTokenTextbox.Text == "user_auth_token")
+            {
+                userAuthTokenTextbox.Text = null;
+                userAuthTokenTextbox.PasswordChar = '*';
+                userAuthTokenTextbox.UseSystemPasswordChar = false;
+                userAuthTokenTextbox.ForeColor = Color.FromArgb(186, 186, 186);
+            }
+        }
+
+        private void userAuthTokenTextbox_Leave(object sender, EventArgs e)
+        {
+            if (userAuthTokenTextbox.Text == null | userAuthTokenTextbox.Text == "")
+            {
+                userAuthTokenTextbox.ForeColor = Color.FromArgb(88, 92, 102);
+                userAuthTokenTextbox.UseSystemPasswordChar = true;
+                userAuthTokenTextbox.Text = "user_auth_token";
+            }
+        }
+        #endregion
+
         #endregion
 
         private void visableCheckbox_CheckedChanged(object sender, EventArgs e)
@@ -350,10 +686,12 @@ namespace QobuzDownloaderX
             if (visableCheckbox.Checked == true)
             {
                 passwordTextbox.UseSystemPasswordChar = true;
+                userAuthTokenTextbox.UseSystemPasswordChar = true;
             }
             else
             {
                 passwordTextbox.UseSystemPasswordChar = false;
+                userAuthTokenTextbox.UseSystemPasswordChar = false;
             }
         }
 
@@ -419,150 +757,47 @@ namespace QobuzDownloaderX
             //}
         }
 
-        private void getSecretBG_DoWork(object sender, DoWorkEventArgs e)
+        private void altLoginLabel_Click(object sender, EventArgs e)
         {
-            getSecretBG.WorkerSupportsCancellation = true;
+            if (altLoginLabel.Text == "Can't login? Click here")
-
-            WebClient bundleURLClient = new WebClient();
-            string bundleHTML = bundleURLClient.DownloadString("https://play.qobuz.com/login");
-
-            // Grab link to bundle.js
-            var bundleLog = Regex.Match(bundleHTML, "<script src=\"(?<bundleJS>\\/resources\\/\\d+\\.\\d+\\.\\d+-[a-z]\\d{3}\\/bundle\\.js)").Groups;
-            var bundleSuffix = bundleLog[1].Value;
-            var bundleURL = "https://play.qobuz.com" + bundleSuffix;
-
-            WebRequest bundleWR = WebRequest.Create(bundleURL);
-
-            try
             {
-                WebResponse bundleWS = bundleWR.GetResponse();
+                // Set value if alt login is needed.
-                StreamReader bundleSR = new StreamReader(bundleWS.GetResponseStream());
+                altLoginValue = "1";
 
-                string getBundleRequest = bundleSR.ReadToEnd();
+                // Change alt login label text
-                string text = getBundleRequest;
+                altLoginLabel.Text = "Login normally? Click here";
 
-                // Grab app_id from bundle.js
+                // Hide standard login methods
-                var bundleLog0 = Regex.Match(getBundleRequest, "\\):\\(n.qobuzapi={app_id:\"(?<appID>.*?)\",app_secret:").Groups;
+                emailTextbox.Visible = false;
-                appID = bundleLog0[1].Value;
+                passwordTextbox.Visible = false;
 
-                // Grab "info" and "extras"
+                // Unhide alt login methods
-                var bundleLog1 = Regex.Match(getBundleRequest, "{offset:\"(?<notUsed>.*?)\",name:\"Europe\\/Berlin\",info:\"(?<info>.*?)\",extras:\"(?<extras>.*?)\"}").Groups;
+                altLoginTutLabel.Visible = true;
-                var bundleInfo = bundleLog1[2].Value;
+                userIdTextbox.Visible = true;
-                var bundleExtras = bundleLog1[3].Value;
+                userAuthTokenTextbox.Visible = true;
-
-                // Grab "seed"
-                var bundleLog2 = Regex.Match(getBundleRequest, "window.utimezone.paris\\):h.initialSeed\\(\"(?<seed>.*?)\",window.utimezone.berlin\\)").Groups;
-                var bundleSeed = bundleLog2[1].Value;
-
-                // Step 1 of getting the app_secret
-                string B64step1 = bundleSeed + bundleInfo + bundleExtras;
-                B64step1 = B64step1.Remove(B64step1.Length - 44, 44);
-                byte[] step1Bytes = Encoding.UTF8.GetBytes(B64step1);
-                B64step1 = Convert.ToBase64String(step1Bytes);
-
-                // Step 2 of getting the app_secret
-                byte[] step2Data = Convert.FromBase64String(B64step1);
-                string B64step2 = Encoding.UTF8.GetString(step2Data);
-
-                // Step 3 of getting the app_secret
-                byte[] step3Data = Convert.FromBase64String(B64step2);
-
-                // Set app_secret
-                appSecret = Encoding.UTF8.GetString(step3Data);
-                loginText.Invoke(new Action(() => loginText.Text = "ID and Secret Obtained! Logging in.."));
-                System.Threading.Thread.Sleep(1000);
             }
-            catch (Exception bundleEx)
+            else
             {
-                // If obtaining bundle.js info fails, show error info.
+                // Set value if alt login is not needed.
-                string bundleError = bundleEx.ToString();
+                altLoginValue = "0";
-                loginText.Invoke(new Action(() => loginText.Text = "Couldn't obtain app info. Error Log saved"));
-                System.IO.File.WriteAllText(errorLog, bundleError);
-                bundleWR.Abort();
-                loginButton.Invoke(new Action(() => loginButton.Enabled = true));
-                return;
-            }
 
-            bundleWR.Abort();
+                // Change alt login label text
-            loginBG.RunWorkerAsync();
+                altLoginLabel.Text = "Can't login? Click here";
-            getSecretBG.CancelAsync();
+
+                // Hide alt login methods
+                altLoginTutLabel.Visible = false;
+                userIdTextbox.Visible = false;
+                userAuthTokenTextbox.Visible = false;
+
+                // Unhide standard login methods
+                emailTextbox.Visible = true;
+                passwordTextbox.Visible = true;
+            }
         }
 
-        private void loginBG_DoWork(object sender, DoWorkEventArgs e)
+        private void altLoginTutLabel_Click(object sender, EventArgs e)
         {
-            loginBG.WorkerSupportsCancellation = true;
+            Process.Start("https://github.com/ImAiiR/QobuzDownloaderX/wiki/Logging-In-(The-Alternate-Way)");
-
-            // Create WebRequest to login using login information from input textboxes.
-            WebRequest wr = WebRequest.Create("https://www.qobuz.com/api.json/0.2/user/login?email=" + emailTextbox.Text + "&password=" + passwordTextbox.Text + "&app_id=" + appID);
-
-            try
-            {
-                // Grab info to be displayed and used.
-                WebResponse ws = wr.GetResponse();
-                StreamReader sr = new StreamReader(ws.GetResponseStream());
-
-                string loginRequest = sr.ReadToEnd();
-                string text = loginRequest;
-
-                // Grab user_id
-                var userIDLog = Regex.Match(loginRequest, "{\"user\":{\"id\":(?<userID>.*?),\"publicId").Groups;
-                var userID = userIDLog[1].Value;
-                qbdlx.userID = userID;
-
-                // Grab display name
-                var displayNameLog = Regex.Match(loginRequest, "\"display_name\":\"(?<displayName>.*?)\",\\\"").Groups;
-                var displayName = displayNameLog[1].Value;
-                qbdlx.displayName = displayName;
-
-                // Grab account type
-                var accountTypeLog = Regex.Match(loginRequest, "short_label\":\"(?<accountType>\\w+)").Groups;
-                var accountType = accountTypeLog[1].Value;
-                qbdlx.accountType = accountType;
-
-                // Grab authentication token
-                var userAuth = Regex.Match(loginRequest, "\"user_auth_token\":\"(?<userAuth>.*?)\\\"}").Groups;
-                var userAuthToken = userAuth[1].Value;
-
-                // Grab profile image
-                var profilePic = Regex.Match(loginRequest, "avatar\\\":\\\"(?<profilePic>.*?)\",").Groups;
-                var profilePicURL = profilePic[1].Value.Replace(@"\", null).Replace("s=50", "s=20");
-                qbdlx.profilePic = profilePicURL;
-
-                // Set user_auth_token
-                qbdlx.userAuth = userAuthToken;
-                loginText.Invoke(new Action(() => loginText.Text = "Login Successful! Launching QBDLX..."));
-            }
-            catch (Exception ex)
-            {
-                // If connection to API fails, show error info.
-                string error = ex.ToString();
-                loginText.Invoke(new Action(() => loginText.Text = "Login Failed. Error Log saved"));
-                System.IO.File.WriteAllText(errorLog, error);
-                wr.Abort();
-                loginButton.Invoke(new Action(() => loginButton.Enabled = true));
-                return;
-            }
-
-            wr.Abort();
-            finishLogin(sender, e);
-            loginBG.CancelAsync();
-        }
-
-        private void finishLogin(object sender, EventArgs e)
-        {
-            loginButton.Invoke(new Action(() => loginButton.Enabled = true));
-            // If info is legit, go to the main form.
-            qbdlx.appid = appID;
-            qbdlx.eMail = emailTextbox.Text;
-            qbdlx.password = passwordTextbox.Text;
-            qbdlx.appSecret = appSecret;
-
-            if (disableLogin.Checked != true)
-            {
-                this.Invoke(new Action(() => this.Hide()));
-                Application.Run(qbdlx);
-            }
-            
         }
     }
 }

QobuzDownloaderX/LoginForm-v2.resx

@@ -123,6 +123,9 @@
   <metadata name="loginBG.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>138, 20</value>
   </metadata>
+  <metadata name="altLoginBG.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>302, 20</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

QobuzDownloaderX/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.9.11")]
+[assembly: AssemblyVersion("0.9.9.12")]
-[assembly: AssemblyFileVersion("0.9.9.11")]
+[assembly: AssemblyFileVersion("0.9.9.12")]

QobuzDownloaderX/Properties/Settings.Designer.cs

@@ -382,5 +382,41 @@ namespace QobuzDownloaderX.Properties {
                 this["audioType"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string savedUserID {
+            get {
+                return ((string)(this["savedUserID"]));
+            }
+            set {
+                this["savedUserID"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string savedUserAuthToken {
+            get {
+                return ((string)(this["savedUserAuthToken"]));
+            }
+            set {
+                this["savedUserAuthToken"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public string savedAltLoginValue {
+            get {
+                return ((string)(this["savedAltLoginValue"]));
+            }
+            set {
+                this["savedAltLoginValue"] = value;
+            }
+        }
     }
 }

QobuzDownloaderX/Properties/Settings.settings

@@ -92,5 +92,14 @@
     <Setting Name="audioType" Type="System.String" Scope="User">
       <Value Profile="(Default)">.flac</Value>
     </Setting>
+    <Setting Name="savedUserID" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="savedUserAuthToken" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="savedAltLoginValue" Type="System.String" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>