#21324: Fix for vdc dsuids == 000...; pop-up added for when login fails

ui/js/app.js

@@ -67,6 +67,7 @@
     var $rediscoverButton;
     var $searchingForDevicesPopup;
     var $remoteConnectivityPopup;
+    var $loginFailedPopup;
     var $noControllersPopup;
     var $noDevicesFoundPopup;
     var $oAuthForm;
@@ -169,6 +170,14 @@
             oAuthUpdateStatus('dS internal error', initial);
             checkRemoteConnect(true);
         });
+
+        // check if the user tried to log in and failed
+        var qsParams = dS.utils.getQueryStringParams();
+        var keys = Object.keys(qsParams);
+        if (keys.indexOf('addon_final_page') > -1 && keys.indexOf('vdc_dsuid') > -1 && qsParams['message'] === 'Internal error') {
+            // show popup
+            $loginFailedPopup.open();
+        }
     }
 
     function oAuthLogIn () {
@@ -312,6 +321,7 @@
         $noControllersPopup = $('#NoControllersFound');
         $oAuthButton = $('#oauth_button');
         $remoteConnectivityPopup = $('#RemoteConnectivity');
+        $loginFailedPopup = $('#LoginFailed');
 
         dS.utils.detectFeed(feedDetectedCallback);
 
@@ -459,7 +469,7 @@
                 }
             }
         }
-        vdcDsuid = dsmuids[0];
+
         $deviceTable.setTableState('success');
         copyTableBody($deviceTableWorkingCopy, $deviceTable);
         $searchingForDevicesPopup.close();

ui/locale/template/singleStrings.pot

@@ -78,6 +78,10 @@ msgstr ""
 msgid "checking status..."
 msgstr ""
 
+# #login_failed
+msgid "Login to Home-Connect account has failed. Please try again."
+msgstr ""
+
 msgid "Setting cloud type on the controller failed. Please try again in a few minutes."
 msgstr ""
 

ui/resources/css/app.css

-/* Build timestamp: Wed Dec 06 2017 21:40:35 GMT+0100 (Środkowoeuropejski czas stand.) */
+/* Build timestamp: Tue Jan 16 2018 11:56:46 GMT+0100 (Środkowoeuropejski czas stand.) */
 
 table .name{font-weight:bold}table .name::before{font-weight:normal}#DeviceApiSelection{position:fixed;top:0;right:0;width:auto}#vdc_starting_up{margin-top:0.5em}@media screen and (min-width: 64em){.status{width:400px}}

ui/resources/partials/dialogs.html

@@ -50,3 +50,14 @@
             <input type="text" id="vdc_dsuid" name="vdc_dsuid">
             <input type="text" id="addon_final_page" name="addon_final_page">
         </form>
+
+        <!-- Login failed due to server error -->
+        <div class="tiny reveal" id="LoginFailed" data-reveal data-animate="fade-in fade-out" data-close-on-click="false">
+            <div class="reveal-content" id="login_failed"></div>
+            <div class="reveal-actions">
+                <a class="button auto-width pull-right button-close" data-close></a>
+            </div>
+            <button class="close-button" data-close aria-label="Close modal" type="button">
+                <span aria-hidden="true">&times;</span>
+            </button>
+        </div>