webbrowser-app

Merge lp:~mardy/webbrowser-app/multi-account-no-ui into lp:webbrowser-app

multi-account-no-ui
Merge into trunk

Proposed by Alberto Mardegan on 2015-04-13

Status:	Needs review
Proposed branch:	lp:~mardy/webbrowser-app/multi-account-no-ui
Merge into:	lp:webbrowser-app
Diff against target:	1344 lines (+809/-244) 16 files modified src/app/webcontainer/AccountChooserDialog.qml (+129/-0) src/app/webcontainer/AccountItem.qml (+4/-6) src/app/webcontainer/AccountsLoginPage.qml (+54/-137) src/app/webcontainer/AccountsModel.qml (+0/-51) src/app/webcontainer/AccountsPage.qml (+173/-10) src/app/webcontainer/CMakeLists.txt (+1/-1) src/app/webcontainer/LoggingInSheet.qml (+39/-0) src/app/webcontainer/LogoutDetector.qml (+78/-0) src/app/webcontainer/LogoutErrorSheet.qml (+64/-0) src/app/webcontainer/SplashScreen.qml (+105/-0) src/app/webcontainer/WebApp.qml (+2/-0) src/app/webcontainer/cookie-store.cpp (+1/-0) src/app/webcontainer/logout-detector.js (+41/-0) src/app/webcontainer/webapp-container.cpp (+24/-0) src/app/webcontainer/webapp-container.h (+3/-0) src/app/webcontainer/webapp-container.qml (+91/-39)
To merge this branch:	bzr merge lp:~mardy/webbrowser-app/multi-account-no-ui
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-05-10
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-16
Ubuntu Phablet Team		2015-04-13	Pending
Review via email: mp+255946@code.launchpad.net

Commit message

Detection of logout events

Description of the change

Detection of logout events

This can be tested with Twitter: its .desktop file needs to be modified so that the Exec line becomes (remove any newlines!):

Exec=webapp-container --enable-back-forward --store-session-cookies
--name=Twitter --icon=./twitter.png --accountProvider='twitter' --logoutSelectors='input[type="password"]' --logoutUrlPattern=https://mobile.twitter.com/api/destroy --webappUrlPatterns=https?://mobile.twitter.com/* https://mobile.twitter.com/session/new %u

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1632/rebuild

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/multi-account-no-ui updated on 2015-04-15

974. By Alberto Mardegan on 2015-04-15

Remove multi-account leftovers

975. By Alberto Mardegan on 2015-04-15

From trunk

[ Alexandre Abreu ]
* remove qtwebkit deps (LP: #1362640) (LP: #1362640)
[ CI Train Bot ]
* New rebuild forced.
[ Justin McPherson ]
* Command line options for media-hub use through Oxide.
[ Olivier Tilloy ]
* Update translation template.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1642/rebuild

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/multi-account-no-ui updated on 2015-04-15

976. By Alberto Mardegan on 2015-04-15

Add missing import

977. By Alberto Mardegan on 2015-04-15

Remove count of login attempts

We cannot count it reliably anyway.

978. By Alberto Mardegan on 2015-04-15

Reset the webview on logout detected

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1643/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1647/rebuild

review: Approve (continuous-integration)

lp:~mardy/webbrowser-app/multi-account-no-ui updated on 2015-04-16

979. By Alberto Mardegan on 2015-04-16: UI changes
980. By Alberto Mardegan on 2015-04-16: Fixes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1654/rebuild

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/multi-account-no-ui updated on 2015-04-16

981. By Alberto Mardegan on 2015-04-16: UI updates
982. By Alberto Mardegan on 2015-04-16: alignment

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1656/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1661/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-05-10:

FAILED: Continuous integration, rev:982
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/492/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/494/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/494/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/492/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

982. By Alberto Mardegan on 2015-04-16

alignment

981. By Alberto Mardegan on 2015-04-16

UI updates

980. By Alberto Mardegan on 2015-04-16

Fixes

979. By Alberto Mardegan on 2015-04-16

UI changes

978. By Alberto Mardegan on 2015-04-15

Reset the webview on logout detected

977. By Alberto Mardegan on 2015-04-15

Remove count of login attempts

We cannot count it reliably anyway.

976. By Alberto Mardegan on 2015-04-15

Add missing import

975. By Alberto Mardegan on 2015-04-15

From trunk

974. By Alberto Mardegan on 2015-04-15

Remove multi-account leftovers

973. By Alberto Mardegan on 2015-04-13

Automatic re-login

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alberto Mardegan

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === added file 'src/app/webcontainer/AccountChooserDialog.qml'
 --- src/app/webcontainer/AccountChooserDialog.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/AccountChooserDialog.qml	2015-04-16 14:53:15 +0000
@@ -0,0 +1,129 @@
++/*
++ * Copyright 2013-2014 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Qt.labs.settings 1.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
++import Ubuntu.Components.Popups 1.0
++import Ubuntu.OnlineAccounts 0.1
++import Ubuntu.OnlineAccounts.Client 0.1
++
++Dialog {
++    id: root
++
++    property string providerId: ""
++    property string applicationId: ""
++    property bool accountMandatory: true
++    property var accountsModel: null
++
++    signal accountSelected(int accountId)
++    signal cancel()
++
++    property var __selectedAccount: settings.selectedAccount
++
++    Settings {
++        id: settings
++        property int selectedAccount
++    }
++
++    Setup {
++        id: setup
++        applicationId: root.applicationId
++        providerId: root.providerId
++        onFinished: {
++            if ("accountId" in reply) {
++                root.chooseAccount(reply.accountId)
++            } else {
++                root.cancel()
++            }
++        }
++    }
++
++    Repeater {
++        model: accountsModel
++        AccountItem {
++            providerName: model.providerName
++            accountName: model.displayName
++            selected: model.accountId === root.__selectedAccount
++            onClicked: root.__selectedAccount = model.accountId
++        }
++    }
++
++    ListItem.Standard {
++        id: addAccountButton
++        text: i18n.tr("Add account")
++        iconName: "add"
++        selected: root.__selectedAccount === -1
++        onClicked: root.__selectedAccount = -1
++    }
++
++    ListItem.Standard {
++        id: skipButton
++        visible: !root.accountMandatory
++        text: i18n.tr("Don't use an account")
++        selected: root.__selectedAccount === -2
++        onClicked: root.__selectedAccount = -2
++    }
++
++    Item {
++        anchors.left: parent.left
++        anchors.right: parent.right
++        anchors.margins: units.gu(1)
++        height: childrenRect.height + units.gu(1)
++
++        Button {
++            id: cancelButton
++            anchors.left: parent.left
++            width: parent.width / 2 - units.gu(1)
++            text: i18n.tr("Cancel")
++            onClicked: root.cancel()
++        }
++
++        Button {
++            anchors.right: parent.right
++            width: cancelButton.width
++            text: i18n.tr("OK")
++            onClicked: root.onConfirmed()
++        }
++    }
++
++    function chooseAccount(accountId) {
++        for (var i = 0; i < accountsModel.count; i++) {
++            if (accountsModel.get(i, "accountId") === accountId) {
++                settings.selectedAccount = accountId
++                root.accountSelected(accountId)
++                return
++            }
++        }
++
++        // The selected account was not found
++        settings.selectedAccount = -1
++        root.cancel()
++    }
++
++    function onConfirmed() {
++        if (__selectedAccount === -2) {
++            root.selectedAccount(0)
++        } else if (__selectedAccount === -1) {
++            setup.exec()
++        } else {
++            chooseAccount(__selectedAccount)
++        }
++    }
++}
 === renamed file 'src/app/webcontainer/AccountItemView.qml' => 'src/app/webcontainer/AccountItem.qml'
 --- src/app/webcontainer/AccountItemView.qml	2014-07-29 21:51:07 +0000
 +++ src/app/webcontainer/AccountItem.qml	2015-04-16 14:53:15 +0000
@@ -20,14 +20,12 @@
  import Ubuntu.Components 1.1
  import Ubuntu.Components.ListItems 1.0 as ListItem
--ListItem.Standard {
++ListItem.Subtitled {
      id: root
++    property string providerName
      property string accountName
--    text: accountName
--
--    iconSource: Qt.resolvedUrl("/usr/share/icons/ubuntu-mobile/actions/scalable/contact.svg")
++    text: providerName
++    subText: accountName
+ }
--
--
 === modified file 'src/app/webcontainer/AccountsLoginPage.qml'
 --- src/app/webcontainer/AccountsLoginPage.qml	2014-10-06 12:52:34 +0000
 +++ src/app/webcontainer/AccountsLoginPage.qml	2015-04-16 14:53:15 +0000
@@ -17,18 +17,19 @@
   */
  import QtQuick 2.0
++import Qt.labs.settings 1.0
  import Ubuntu.Components 1.1
  import Ubuntu.Components.ListItems 1.0 as ListItem
  import Ubuntu.OnlineAccounts 0.1
--
++import Ubuntu.OnlineAccounts.Client 0.1
  Item {
      id: root
--    property string accountProvider: ""
--    property string applicationName: ""
++    property var accountsModel
--    signal done(variant credentialsId)
++    signal accountSelected(int accountId)
++    signal done(bool successful)
      Timer {
          id: checkTimer
@@ -38,14 +39,21 @@
          interval: 100
+     }
--    AccountsModel {
--        id: accountsModel
--        accountProvider: root.accountProvider
--        applicationName: root.applicationName
--        onCountChanged: checkAccounts()
++    Settings {
++        id: settings
++        property int selectedAccount: -1
++    }
++
++    Setup {
++        id: setup
++        applicationId: accountsModel.applicationId
++        providerId: accountsModel.provider
          onFinished: {
--            if (count === 0) {
--                Qt.quit();
++            if ("accountId" in reply) {
++                settings.selectedAccount = reply.accountId
++                root.accountSelected(reply.accountId)
++            } else {
++                Qt.quit()
+             }
+         }
+     }
@@ -64,137 +72,46 @@
          checkTimer.stop()
          console.log("Accounts: " + accountsModel.count)
          if (accountsModel.count === 0) {
--            accountsModel.createNewAccount()
--        } else {
--            doLogin(accountsModel.model.get(0, "accountServiceHandle"))
--        }
--
--        // Note: Disable the account selection for now until we have a clearer view of
--        // the design and behavior related to the feature. Keep the code for reference.
--        /*
--        if (accountsModel.count === 1) {
--            doLogin(accountsModel.model.get(0, "accountServiceHandle"))
--        } else {
--            accountsViewLoader.sourceComponent = accountsSelectionViewComponent
--        }
--        */
--    }
--
--    Component {
--        id: accountsAdditionToolbarViewComponent
--        Item {
--            id: addAccountView
--
--            Label {
--                id: label
--                anchors.centerIn: parent
--                text: i18n.tr("No local account found for ") + root.accountProvider + "."
--            }
--
--            Label {
--                id: skipLabel
--                text: i18n.tr("Skip account creation step")
--                color: UbuntuColors.orange
--                fontSize: "small"
--
--                anchors.top: label.bottom
--                anchors.horizontalCenter: parent.horizontalCenter
--
--                Icon {
--                    anchors.left: parent.right
--                    anchors.verticalCenter: parent.verticalCenter
--                    height: units.dp(12)
--                    width: units.dp(12)
--                    name: "chevron"
--                    color: UbuntuColors.orange
--                }
--
--                MouseArea {
--                    anchors.fill: parent
--                    anchors.margins: -units.gu(5)
--                    onClicked: root.done(null)
--                }
--            }
--
--            Panel {
--                id: panel
--                anchors {
--                    right: parent.right
--                    left: parent.left
--                    bottom: parent.bottom
--                }
--
--                locked: true
--
--                height: units.gu(8)
--
--                Rectangle {
--                    color: Theme.palette.normal.overlay
--                    anchors.fill: parent
--                    Item {
--                        height: units.gu(8)
--                        width: units.gu(8)
--
--                        anchors {
--                            right: parent.right
--                            bottom: parent.bottom
--                        }
--
--                        ToolbarButton {
--                            action: Action {
--                                text: i18n.tr("Add account")
--                                iconSource: Qt.resolvedUrl("/usr/share/icons/ubuntu-mobile/actions/scalable/add.svg")
--                                onTriggered: {
--                                    accountsModel.createNewAccount();
--                                }
--                            }
--                        }
--
--                        signal clicked()
--                        onClicked: {
--                            accountsModel.createNewAccount();
--                        }
--                    }
--                }
--
--                Component.onCompleted: panel.open()
--            }
--
--        }
--    }
--
--    Component {
--        id: accountsSelectionViewComponent
--        AccountsView {
--            id: accountsView
--
--            model: accountsModel.model
--
--            onAccountSelected: doLogin(accountServiceHandle)
--        }
--    }
--
--    function doLogin(accountHandle) {
--        var account = accountComponent.createObject(root, {objectHandle: accountHandle});
++            setup.exec();
++        } else if (settings.selectedAccount > 0) {
++            // check that the account exists
++            for (var i = 0; i < accountsModel.count; i++) {
++                if (accountsModel.get(i, "accountId") === settings.selectedAccount) {
++                    break;
++                }
++            }
++            if (i >= accountsModel.count) {
++                // The selected account was not found, pick the first account
++                settings.selectedAccount = accountsModel.get(0, "accountId")
++            }
++        }
++
++        root.accountSelected(settings.selectedAccount)
++    }
++
++    function login(account, forceCookieRefresh) {
++        console.log("Preparing for login, forced = " + forceCookieRefresh)
          function authenticatedCallback() {
--            account.authenticated.disconnect(authenticatedCallback);
--            done(account.authData.credentialsId);
++            console.log("Authenticated!")
++            account.authenticated.disconnect(authenticatedCallback)
++            root.done(true)
+         }
--        account.authenticated.connect(authenticatedCallback);
++        account.authenticated.connect(authenticatedCallback)
          function errorCallback() {
--            account.authenticationError.disconnect(errorCallback);
--            done(null);
--        }
--        account.authenticationError.connect(errorCallback);
--
--        account.authenticate(null);
--    }
--
--    Component {
--        id: accountComponent
--        AccountService { }
++            console.log("Authentication error!")
++            account.authenticationError.disconnect(errorCallback)
++            root.done(false)
++        }
++        account.authenticationError.connect(errorCallback)
++
++        var params = {}
++        if (forceCookieRefresh) {
++            params["UiPolicy"] = 1 // RequestPasswordPolicy
++        }
++
++        account.authenticate(params)
+     }
+ }
 === removed file 'src/app/webcontainer/AccountsModel.qml'
 --- src/app/webcontainer/AccountsModel.qml	2014-10-02 07:30:06 +0000
 +++ src/app/webcontainer/AccountsModel.qml	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
--/*
-- * Copyright 2013 Canonical Ltd.
-- *
-- * This file is part of webbrowser-app.
-- *
-- * webbrowser-app is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * webbrowser-app is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.0
--import Ubuntu.OnlineAccounts 0.1
--import Ubuntu.OnlineAccounts.Client 0.1
--
--Item {
--    id: root
--    property string accountProvider: ""
--    property string applicationName: ""
--    property alias count: accountsModel.count
--
--    signal finished
--
--    function createNewAccount() {
--        setup.exec();
--    }
--
--    readonly property alias model: accountsModel
--
--    AccountServiceModel {
--        id: accountsModel
--        includeDisabled: false
--        serviceType: "webapps"
--        applicationId: root.applicationName
--        provider: root.accountProvider
--    }
--
--    Setup {
--        id: setup
--        applicationId: root.applicationName
--        providerId: root.accountProvider
--        onFinished: root.finished()
--    }
--}
 === modified file 'src/app/webcontainer/AccountsPage.qml'
 --- src/app/webcontainer/AccountsPage.qml	2014-10-02 18:03:46 +0000
 +++ src/app/webcontainer/AccountsPage.qml	2015-04-16 14:53:15 +0000
@@ -18,15 +18,33 @@
  import QtQuick 2.0
  import Ubuntu.Components 1.1
++import Ubuntu.Components.Popups 1.0
++import Ubuntu.OnlineAccounts 0.1
  import webcontainer.private 0.1
  Page {
--    id: accountsPage
--
--    property alias accountProvider: accountsLogin.accountProvider
--    property alias applicationName: accountsLogin.applicationName
--
--    signal done(bool successful, var credentialsId)
++    id: root
++
++    property string providerId: ""
++    property string applicationId: ""
++    property string webappName: ""
++    property url webappIcon
++    property int credentialsId: -1
++    property alias webview: detector.webview
++    property alias logoutUrlPattern: detector.logoutUrlPattern
++    property alias logoutSelectors: detector.logoutSelectors
++
++    signal accountSelected(var credentialsId)
++    signal done(bool successful)
++
++    property string __applicationName: webappName
++    property url __applicationIcon: webappIcon
++    property string __providerName: providerId
++    property var __account: null
++    property var __loggedOutAccounts: []
++    property var __accountsModel: accountsModel
++    property bool __loggingIn: false
++    property bool __ignoreLogout: false
      visible: true
      anchors.fill: parent
@@ -35,11 +53,156 @@
          id: accountsLogin
          anchors.fill: parent
++        accountsModel: root.__accountsModel
++        onAccountSelected: {
++            if (accountId < 0) {
++                showErrorSheet()
++            } else {
++                root.__setupAccount(accountId)
++            }
++        }
          onDone: {
--            if (!accountsPage.visible)
--                return
--            accountsPage.done(credentialsId != null, credentialsId)
--        }
++            __loggingIn = false
++            if (successful && __account) {
++                root.credentialsId = root.__account.authData.credentialsId
++            }
++            root.done(successful)
++        }
++    }
++
++    LogoutErrorSheet {
++        id: errorSheet
++
++        visible: false
++
++        onAccountLoginClicked: {
++            root.credentialsId = -1
++            __loggedOutAccounts.push(__account.accountId)
++            root.login()
++        }
++
++        onManualLoginClicked: {
++            root.__ignoreLogout = true
++            root.visible = false
++            visible = false
++        }
++    }
++
++    LoggingInSheet {
++        visible: root.__loggingIn
++    }
++
++    Component {
++        id: accountChooserComponent
++        AccountChooserDialog {
++            id: accountChooser
++            providerId: root.providerId
++            applicationId: root.applicationId
++            accountsModel: root.__accountsModel
++            onCancel: PopupUtils.close(accountChooser)
++            onAccountSelected: {
++                PopupUtils.close(accountChooser)
++                root.__setupAccount(accountId)
++            }
++        }
++    }
++
++    LogoutDetector {
++        id: detector
++        onLogoutDetected: {
++            console.log("Logout detected")
++            if (!__ignoreLogout) {
++                root.visible = true
++                root.showErrorSheet()
++            }
++        }
++    }
++
++    ApplicationModel {
++        id: applicationModel
++        service: root.applicationId
++    }
++
++    ProviderModel {
++        id: providerModel
++        applicationId: root.applicationId
++    }
++
++    AccountServiceModel {
++        id: accountsModel
++        provider: root.providerId
++        applicationId: root.applicationId
++    }
++
++    Component {
++        id: accountComponent
++        AccountService { }
++    }
++
++    function __setupApplicationData() {
++        for (var i = 0; i < applicationModel.count; i++) {
++            if (applicationModel.get(i, "applicationId") === root.applicationId) {
++                var name = applicationModel.get(i, "displayName")
++                if (name) root.__applicationName = name
++                var icon = applicationModel.get(i, "iconName")
++                if (icon) root.__applicationIcon = icon
++                break
++            }
++        }
++    }
++
++    function __setupProviderData() {
++        for (var i = 0; i < providerModel.count; i++) {
++            if (providerModel.get(i, "providerId") === root.providerId) {
++                root.__providerName = providerModel.get(i, "displayName")
++                break
++            }
++        }
++    }
++
++    Component.onCompleted: {
++        __setupApplicationData()
++        __setupProviderData()
++    }
++
++    function __setupAccount(accountId) {
++        console.log("Setup account " + accountId)
++        if (__account && accountId === __account.accountId) {
++            console.log("Same as current account")
++            return
++        }
++        __account = null
++        for (var i = 0; i < accountsModel.count; i++) {
++            if (accountsModel.get(i, "accountId") === accountId) {
++                var accountHandle = accountsModel.get(i, "accountServiceHandle")
++                __account = accountComponent.createObject(root, {
++                    objectHandle: accountHandle
++                })
++                break;
++            }
++        }
++        credentialsId = __account ? __account.authData.credentialsId : 0
++        console.log("Credentials ID: " + credentialsId)
++    }
++
++    function login() {
++        console.log("Logging in to " + __account)
++        __loggingIn = true
++        var forceCookieRefresh = false
++        var index = __loggedOutAccounts.indexOf(__account.accountId)
++        if (index >= 0) {
++            forceCookieRefresh = true
++            __loggedOutAccounts.splice(index, 1)
++        }
++        accountsLogin.login(__account, forceCookieRefresh)
++    }
++
++    function showErrorSheet() {
++        errorSheet.visible = true
++    }
++
++    function chooseAccount() {
++        PopupUtils.open(accountChooserComponent)
+     }
+ }
 === modified file 'src/app/webcontainer/CMakeLists.txt'
 --- src/app/webcontainer/CMakeLists.txt	2015-01-26 14:53:18 +0000
 +++ src/app/webcontainer/CMakeLists.txt	2015-04-16 14:53:15 +0000
@@ -30,7 +30,7 @@
  install(TARGETS ${WEBAPP_CONTAINER}
          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--file(GLOB QML_FILES *.qml)
++file(GLOB QML_FILES *.qml *.js)
  install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webcontainer)
  install(DIRECTORY actions DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webcontainer
          FILES_MATCHING PATTERN *.qml)
 === added file 'src/app/webcontainer/LoggingInSheet.qml'
 --- src/app/webcontainer/LoggingInSheet.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/LoggingInSheet.qml	2015-04-16 14:53:15 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++
++Rectangle {
++    anchors.fill: parent
++
++    ActivityIndicator {
++        id: spinner
++        anchors.centerIn: parent
++        running: true
++    }
++
++    Label {
++        anchors.left: parent.left
++        anchors.right: parent.right
++        anchors.top: spinner.bottom
++        anchors.margins: units.gu(3)
++        text: i18n.tr("Automatic login with Ubuntu in progress…").arg(url)
++        wrapMode: Text.Wrap
++    }
++}
 === added file 'src/app/webcontainer/LogoutDetector.qml'
 --- src/app/webcontainer/LogoutDetector.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/LogoutDetector.qml	2015-04-16 14:53:15 +0000
@@ -0,0 +1,78 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import com.canonical.Oxide 1.0
++
++QtObject {
++    id: root
++
++    property var webview: null
++    property string logoutUrlPattern: ""
++    property string logoutSelectors: ""
++
++    signal logoutDetected()
++
++    property var __scriptMessageHandlerComponent: Component {
++        ScriptMessageHandler {
++            msgId: "domChanged"
++            contexts: ["oxide://logoutDetector/"]
++            callback: function(msg, frame) {
++                console.log('Got a DOM changed message: ' + msg.args)
++                var request = webview.rootFrame.sendMessage(
++                    "oxide://logoutDetector/",
++                    "evaluateSelectors",
++                    { selectors: root.logoutSelectors }
++                )
++
++                // NOTE: does not handle error
++                request.onreply = function(response) {
++                    console.log('Selector result: ' + response.result)
++                    if (response.result) {
++                        root.logoutDetected()
++                    }
++                }
++            }
++        }
++    }
++
++    property var __connections: Connections {
++        target: webview
++        onLoadEvent: {
++            console.log("Load event: " + event.url)
++            if (logoutUrlPattern.length !== 0 && event.url.toString().match(logoutUrlPattern)) {
++                root.logoutDetected()
++            }
++        }
++    }
++
++    property var __userScript: UserScript {
++        context: "oxide://logoutDetector/"
++        url: Qt.resolvedUrl("logout-detector.js")
++        incognitoEnabled: true
++        matchAllFrames: true
++    }
++
++    onWebviewChanged: {
++        if (!webview) return
++        console.log("Webview changed, adding script")
++        var handler = __scriptMessageHandlerComponent.createObject(null, {})
++        webview.addMessageHandler(handler)
++        webview.context.addUserScript(__userScript)
++    }
++}
 === added file 'src/app/webcontainer/LogoutErrorSheet.qml'
 --- src/app/webcontainer/LogoutErrorSheet.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/LogoutErrorSheet.qml	2015-04-16 14:53:15 +0000
@@ -0,0 +1,64 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++
++Rectangle {
++    signal accountLoginClicked()
++    signal manualLoginClicked()
++
++    anchors.fill: parent
++
++    Column {
++        anchors.fill: parent
++        anchors.margins: units.gu(4)
++
++        spacing: units.gu(3)
++
++        Label {
++            width: parent.width
++            fontSize: "x-large"
++            text: i18n.tr("Logged out")
++        }
++
++        Label {
++            width: parent.width
++            text: i18n.tr("It appears that you have been logged out.").arg(url)
++            wrapMode: Text.Wrap
++        }
++
++        Label {
++            width: parent.width
++            text: i18n.tr("Press the <b>Login</b> button to automatically login via Ubuntu, or <b>Continue</b> to go back to the website.")
++            wrapMode: Text.Wrap
++        }
++
++        Button {
++            anchors.horizontalCenter: parent.horizontalCenter
++            text: i18n.tr("Login with Ubuntu")
++            onClicked: accountLoginClicked()
++        }
++
++        Button {
++            anchors.horizontalCenter: parent.horizontalCenter
++            text: i18n.tr("Continue anyway")
++            onClicked: manualLoginClicked()
++        }
++    }
++}
 === added file 'src/app/webcontainer/SplashScreen.qml'
 --- src/app/webcontainer/SplashScreen.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/SplashScreen.qml	2015-04-16 14:53:15 +0000
@@ -0,0 +1,105 @@
++/*
++ * Copyright 2013-2014 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import Ubuntu.OnlineAccounts 0.1
++
++Item {
++    id: root
++
++    property string providerName
++    property string applicationName
++    property alias iconSource: icon.source
++    property bool accountMandatory: true
++
++    signal chooseAccount()
++    signal skip()
++
++    anchors.fill: parent
++
++    Column {
++        anchors {
++            left: parent.left
++            right: parent.right
++            verticalCenter: parent.verticalCenter
++        }
++        spacing: units.gu(2)
++
++        Icon {
++            id: icon
++            anchors.horizontalCenter: parent.horizontalCenter
++            width: units.gu(10)
++            height: width
++        }
++
++        Label {
++            anchors.horizontalCenter: parent.horizontalCenter
++            fontSize: "x-large"
++            text: root.applicationName
++        }
++
++        Label {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            horizontalAlignment: Text.AlignHCenter
++            wrapMode: Text.WordWrap
++            text: i18n.tr("<b>%1</b> needs to access your %2 online account.").arg(root.applicationName).arg(root.providerName)
++            visible: root.accountMandatory
++        }
++
++        Label {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            horizontalAlignment: Text.AlignHCenter
++            wrapMode: Text.WordWrap
++            text: i18n.tr("<b>%1</b> would like to access your %2 online account.").arg(root.applicationName).arg(root.providerName)
++            visible: !root.accountMandatory
++        }
++
++        Label {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            horizontalAlignment: Text.AlignHCenter
++            wrapMode: Text.WordWrap
++            text: i18n.tr("Choose an account now, or skip this step and choose an online account later.")
++            visible: !root.accountMandatory
++        }
++
++        Item {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            anchors.margins: units.gu(1)
++            height: units.gu(6)
++
++            Button {
++                anchors.left: parent.left
++                width: parent.width / 2 - units.gu(1)
++                text: root.accountMandatory ? i18n.tr("Close the app") : i18n.tr("Skip")
++                onClicked: root.accountMandatory ? Qt.quit() : root.skip()
++            }
++
++            Button {
++                anchors.right: parent.right
++                width: parent.width / 2 - units.gu(1)
++                text: i18n.tr("Choose account")
++                onClicked: root.chooseAccount()
++            }
++        }
++    }
++}
 === modified file 'src/app/webcontainer/WebApp.qml'
 --- src/app/webcontainer/WebApp.qml	2015-04-08 13:20:57 +0000
 +++ src/app/webcontainer/WebApp.qml	2015-04-16 14:53:15 +0000
@@ -46,6 +46,8 @@
      property bool chromeVisible: false
      readonly property bool chromeless: !chromeVisible && !backForwardButtonsVisible
++    signal chooseAccount()
++
      actions: [
          Actions.Back {
              enabled: webapp.backForwardButtonsVisible && webview.currentWebview && webview.currentWebview.canGoBack
 === modified file 'src/app/webcontainer/cookie-store.cpp'
 --- src/app/webcontainer/cookie-store.cpp	2014-10-08 14:16:14 +0000
 +++ src/app/webcontainer/cookie-store.cpp	2015-04-16 14:53:15 +0000
@@ -51,6 +51,7 @@
      QObject(parent)
+ {
      qRegisterMetaType<QNetworkCookie>();
++    qRegisterMetaType<QList<QNetworkCookie> >("QList<QNetworkCookie>");
      qRegisterMetaType<Cookies>("Cookies");
+ }
 === added file 'src/app/webcontainer/logout-detector.js'
 --- src/app/webcontainer/logout-detector.js	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/logout-detector.js	2015-04-16 14:53:15 +0000
@@ -0,0 +1,41 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++oxide.sendMessage('domChanged', 'Some message');
++
++var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
++
++var observer = new MutationObserver(function(mutations) {
++    var addnodes = []
++    mutations.forEach(function(mutation) {
++        for (var i in mutation.addedNodes) {
++            addnodes.push(mutation.addedNodes[i].className)
++        }
++    });
++
++    oxide.sendMessage('domChanged', JSON.stringify(addnodes))
++});
++observer.observe(document.body, {childList: true, subtree: true });
++
++
++oxide.addMessageHandler("evaluateSelectors", function(msg) {
++    var selectors = msg.args.selectors;
++    console.log("Evaluating selectors: " + selectors);
++    var match = document.querySelector(selectors);
++    msg.reply({result: (match !== null)});
++});
 === modified file 'src/app/webcontainer/webapp-container.cpp'
 --- src/app/webcontainer/webapp-container.cpp	2015-04-10 13:33:19 +0000
 +++ src/app/webcontainer/webapp-container.cpp	2015-04-16 14:53:15 +0000
@@ -116,9 +116,17 @@
+         }
          m_window->setProperty("webappName", m_webappName);
++        QFileInfo iconInfo(m_webappIcon);
++        QUrl iconUrl;
++        if (iconInfo.isReadable()) {
++            iconUrl = QUrl::fromLocalFile(iconInfo.absoluteFilePath());
++        }
++        m_window->setProperty("webappIcon", iconUrl);
          m_window->setProperty("backForwardButtonsVisible", m_backForwardButtonsVisible);
          m_window->setProperty("chromeVisible", m_addressBarVisible);
          m_window->setProperty("accountProvider", m_accountProvider);
++        m_window->setProperty("logoutUrlPattern", m_logoutUrlPattern);
++        m_window->setProperty("logoutSelectors", m_logoutSelectors);
          m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns);
          QQmlContext* context = m_engine->rootContext();
@@ -251,9 +259,13 @@
         " [--app-id=APP_ID]"
         " [--homepage=URL]"
         " [--webapp=name]"
++       " [--name=NAME]"
++       " [--icon=PATH]"
         " [--webappModelSearchPath=PATH]"
         " [--webappUrlPatterns=URL_PATTERNS]"
         " [--accountProvider=PROVIDER_NAME]"
++       " [--logoutUrlPattern=URL_PATTERN]"
++       " [--logoutSelectors=selector1,selector2,...]"
         " [--enable-back-forward]"
         " [--enable-addressbar]"
         " [--store-session-cookies]"
@@ -268,9 +280,13 @@
      out << "  --app-id=APP_ID                     run the application with a specific APP_ID" << endl;
      out << "  --homepage=URL                      override any URL passed as an argument" << endl;
      out << "  --webapp=name                       try to match the webapp by name with an installed integration script" << endl;
++    out << "  --name=NAME                         display name of the webapp, shown in the splash screen" << endl;
++    out << "  --icon=PATH                         Icon to be shown in the splash screen. PATH can be an absolute or path relative to CWD" << endl;
      out << "  --webappModelSearchPath=PATH        alter the search path for installed webapps and set it to PATH. PATH can be an absolute or path relative to CWD" << endl;
      out << "  --webappUrlPatterns=URL_PATTERNS    list of comma-separated url patterns (wildcard based) that the webapp is allowed to navigate to" << endl;
      out << "  --accountProvider=PROVIDER_NAME     Online account provider for the application if the application is to reuse a local account." << endl;
++    out << "  --logoutUrlPattern=PATTERN          Regexp pattern for detecting logout URLs." << endl;
++    out << "  --logoutSelectors=SELECTORS         Comma separated list of CSS selectors to detect the logout situation." << endl;
      out << "  --store-session-cookies             store session cookies on disk" << endl;
      out << "  --enable-media-hub-audio            enable media-hub for audio playback" << endl;
      out << "  --user-agent-string=USER_AGENT      overrides the default User Agent with the provided one." << endl;
@@ -298,6 +314,10 @@
              // TODO: validate that it is fine in all cases (country dependent, etc…).
              QString name = argument.split("--webapp=")[1];
              m_webappName = QByteArray::fromBase64(name.toUtf8()).trimmed();
++        } else if (argument.startsWith("--name=")) {
++            m_webappName = argument.split("--name=")[1];
++        } else if (argument.startsWith("--icon=")) {
++            m_webappIcon = argument.split("--icon=")[1];
          } else if (argument.startsWith("--webappUrlPatterns=")) {
              QString tail = argument.split("--webappUrlPatterns=")[1];
              if (!tail.isEmpty()) {
@@ -306,6 +326,10 @@
+             }
          } else if (argument.startsWith("--accountProvider=")) {
              m_accountProvider = argument.split("--accountProvider=")[1];
++        } else if (argument.startsWith("--logoutUrlPattern=")) {
++            m_logoutUrlPattern = argument.split("--logoutUrlPattern=")[1];
++        } else if (argument.startsWith("--logoutSelectors=")) {
++            m_logoutSelectors = argument.split("--logoutSelectors=")[1];
          } else if (argument == "--clear-cookies") {
              qWarning() << argument << " is an unsupported option: it can be removed without notice..." << endl;
              clearCookiesHack(m_accountProvider);
 === modified file 'src/app/webcontainer/webapp-container.h'
 --- src/app/webcontainer/webapp-container.h	2015-04-10 13:33:19 +0000
 +++ src/app/webcontainer/webapp-container.h	2015-04-16 14:53:15 +0000
@@ -58,9 +58,12 @@
  private:
      QString m_webappName;
++    QString m_webappIcon;
      QString m_webappModelSearchPath;
      QStringList m_webappUrlPatterns;
      QString m_accountProvider;
++    QString m_logoutUrlPattern;
++    QString m_logoutSelectors;
      bool m_storeSessionCookies;
      bool m_backForwardButtonsVisible;
      bool m_addressBarVisible;
 === modified file 'src/app/webcontainer/webapp-container.qml'
 --- src/app/webcontainer/webapp-container.qml	2015-04-07 14:30:52 +0000
 +++ src/app/webcontainer/webapp-container.qml	2015-04-16 14:53:15 +0000
@@ -34,10 +34,13 @@
      property var intentFilterHandler
      property string url: ""
++    property string webappIcon: ""
      property string webappName: ""
      property string webappModelSearchPath: ""
      property var webappUrlPatterns
      property string accountProvider: ""
++    property string logoutUrlPattern: ""
++    property string logoutSelectors: ""
      property string popupRedirectionUrlPrefixPattern: ""
      property url webviewOverrideFile: ""
      property var __webappCookieStore: null
@@ -50,6 +53,10 @@
      title: getWindowTitle()
++    onCurrentWebviewChanged: if (accountsPageComponentLoader.item) {
++        accountsPageComponentLoader.item.webview = currentWebview
++    }
++
      // Used for testing
      signal intentUriHandleResult(string uri)
@@ -102,6 +109,8 @@
                      root.title = getWindowTitle();
+                 }
+             }
++
++            onChooseAccount: accountsPageComponentLoader.item.chooseAccount()
+         }
+     }
@@ -158,13 +167,15 @@
      Loader {
          id: accountsPageComponentLoader
          anchors.fill: parent
++        z: -1 // This is needed to have the dialogs shown; see above comment about bug 1398046
          onStatusChanged: {
              if (status == Loader.Error) {
                  // Happens on the desktop, if Ubuntu.OnlineAccounts.Client
                  // can't be imported
--                loadWebAppView()
++                loadWebAppView(true)
              } else if (status == Loader.Ready) {
                  item.visible = true
++                initializeForAccount(item.credentialsId)
+             }
+         }
+     }
@@ -175,48 +186,82 @@
+         }
          if (!result) {
              console.log("Cookies were not moved")
++        } else {
++            console.log("cookies moved")
+         }
          webappViewLoader.item.url = root.url
+     }
      function moveCookies(credentialsId) {
++        console.log("moving cookies for id " + credentialsId)
++        var storeComponent = localCookieStoreDbPath.length !== 0 ?
++                    localCookieStoreComponent : onlineAccountStoreComponent
++
++        var instance = storeComponent.createObject(root, { "accountId": credentialsId })
++        __webappCookieStore.moved.connect(onCookiesMoved)
++        __webappCookieStore.moveFrom(instance)
++    }
++
++    function doLogin() {
          if (!__webappCookieStore) {
              var context = webappViewLoader.item.currentWebview.context
--            __webappCookieStore = oxideCookieStoreComponent.createObject(this, {
++            __webappCookieStore = oxideCookieStoreComponent.createObject(webappViewLoader.item, {
                  "oxideStoreBackend": context.cookieManager,
                  "dbPath": context.dataPath + "/cookies.sqlite"
              })
+         }
--        var storeComponent = localCookieStoreDbPath.length !== 0 ?
--                    localCookieStoreComponent : onlineAccountStoreComponent
--
--        var instance = storeComponent.createObject(root, { "accountId": credentialsId })
--        __webappCookieStore.moved.connect(onCookiesMoved)
--        __webappCookieStore.moveFrom(instance)
++        accountsPageComponentLoader.item.login()
++    }
++
++    function initializeForAccount(credentialsId) {
++        console.log("Account selected, creds: " + credentialsId)
++        if (credentialsId < 0) {
++            webappViewLoader.sourceComponent = null
++            __webappCookieStore = null
++            webappViewLoader.credentialsId = credentialsId
++            return
++        }
++
++        if (credentialsId > 0) {
++            if (credentialsId == webappViewLoader.credentialsId) {
++                doLogin()
++                return
++            }
++
++            webappViewLoader.sourceComponent = null
++            __webappCookieStore = null
++            webappViewLoader.loaded.connect(function onLoaded() {
++                if (webappViewLoader.status == Loader.Ready) {
++                    webappViewLoader.loaded.disconnect(onLoaded)
++                    doLogin()
++                }
++            });
++            webappViewLoader.credentialsId = credentialsId
++            // If we need to preserve session cookies, make sure that the
++            // mode is "restored" and not "persistent", or the cookies
++            // transferred from OA would be lost.
++            // We check if the webContextSessionCookieMode is defined and, if so,
++            // we override it in the webapp loader.
++            if (typeof webContextSessionCookieMode === "string") {
++                webappViewLoader.webContextSessionCookieMode = "restored"
++            }
++        }
++
++        loadWebAppView(credentialsId == 0)
+     }
      Connections {
          target: accountsPageComponentLoader.item
++        onCredentialsIdChanged: initializeForAccount(accountsPageComponentLoader.item.credentialsId)
++        onVisibleChanged: webappViewLoader.item.visible = !accountsPageComponentLoader.item.visible
          onDone: {
++            console.log("Authentication done, successful = " + successful)
              if (successful) {
--                webappViewLoader.loaded.connect(function () {
--                    if (webappViewLoader.status == Loader.Ready) {
--                        moveCookies(webappViewLoader.credentialsId)
--                    }
--                });
--                webappViewLoader.credentialsId = credentialsId
--                // If we need to preserve session cookies, make sure that the
--                // mode is "restored" and not "persistent", or the cookies
--                // transferred from OA would be lost.
--                // We check if the webContextSessionCookieMode is defined and, if so,
--                // we override it in the webapp loader.
--                if (typeof webContextSessionCookieMode === "string") {
--                    webappViewLoader.webContextSessionCookieMode = "restored"
--                }
++                moveCookies(webappViewLoader.credentialsId)
++            } else {
++                loadWebAppView(true)
+             }
--
--            loadWebAppView()
+         }
+     }
@@ -241,7 +286,7 @@
          if (accountProvider.length !== 0) {
              loadLoginView();
          } else {
--            loadWebAppView();
++            loadWebAppView(true);
+         }
+     }
@@ -252,27 +297,34 @@
      function loadLoginView() {
          accountsPageComponentLoader.setSource("AccountsPage.qml", {
--            "accountProvider": accountProvider,
--            "applicationName": unversionedAppId,
++            "providerId": accountProvider,
++            "applicationId": unversionedAppId,
++            "webappName": getWebappName(),
++            "webappIcon": webappIcon,
++            "logoutUrlPattern": logoutUrlPattern,
++            "logoutSelectors": logoutSelectors,
          })
+     }
--    function loadWebAppView() {
++    function loadWebAppView(startBrowsing) {
          if (accountsPageComponentLoader.item)
              accountsPageComponentLoader.item.visible = false
--        webappViewLoader.loaded.connect(function () {
--            if (webappViewLoader.status === Loader.Ready) {
--                // As we use StateSaver to restore the URL, we need to check first if
--                // it has not been set previously before setting the URL to the default property
--                // homepage.
--                var webView = webappViewLoader.item.currentWebview
--                var current_url = webView.url.toString();
--                if (!current_url || current_url.length === 0) {
--                    webView.url = root.url
++        if (startBrowsing) {
++            webappViewLoader.loaded.connect(function onLoaded() {
++                if (webappViewLoader.status === Loader.Ready) {
++                    webappViewLoader.loaded.disconnect(onLoaded)
++                    // As we use StateSaver to restore the URL, we need to check first if
++                    // it has not been set previously before setting the URL to the default property
++                    // homepage.
++                    var webView = webappViewLoader.item.currentWebview
++                    var current_url = webView.url.toString();
++                    if (!current_url || current_url.length === 0) {
++                        webView.url = root.url
++                    }
+                 }
--            }
--        });
++            });
++        }
          webappViewLoader.sourceComponent = webappViewComponent
+     }