Kaydet (Commit) a3b93ed6 authored tarafından Mihai Varga's avatar Mihai Varga Kaydeden (comit) Miklos Vajna

OneDrive authentication fallback request handler

To fix build, squashed in:

Author: Mihai Varga <mihai.mv13@gmail.com>
Date:   Sun Dec 14 12:11:29 2014 +0100

    Added namespace for vcl::Window

Change-Id: I136912073582c29f68b25787b69f7cc117fb4a6a
üst 4998e6a3
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <com/sun/star/task/XInteractionPassword.hpp> #include <com/sun/star/task/XInteractionPassword.hpp>
#include <com/sun/star/task/XInteractionPassword2.hpp> #include <com/sun/star/task/XInteractionPassword2.hpp>
#include <com/sun/star/task/XInteractionRetry.hpp> #include <com/sun/star/task/XInteractionRetry.hpp>
#include <com/sun/star/ucb/XInteractionAuthFallback.hpp>
#include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp> #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
#include <com/sun/star/ucb/URLAuthenticationRequest.hpp> #include <com/sun/star/ucb/URLAuthenticationRequest.hpp>
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
#include <vcl/abstdlg.hxx> #include <vcl/abstdlg.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include "authfallbackdlg.hxx"
#include "ids.hrc" #include "ids.hrc"
#include "getcontinuations.hxx" #include "getcontinuations.hxx"
#include "passwordcontainer.hxx" #include "passwordcontainer.hxx"
...@@ -744,4 +746,25 @@ UUIInteractionHelper::handlePasswordRequest( ...@@ -744,4 +746,25 @@ UUIInteractionHelper::handlePasswordRequest(
return false; return false;
} }
bool
UUIInteractionHelper::handleAuthFallbackRequest( OUString & instructions,
OUString & url,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations )
{
vcl::Window * pParent = getParentProperty( );
AuthFallbackDlg *dlg = new AuthFallbackDlg( pParent, instructions, url );
int retCode = dlg->Execute( );
uno::Reference< task::XInteractionAbort > xAbort;
uno::Reference< ucb::XInteractionAuthFallback > xAuthFallback;
getContinuations(rContinuations, &xAbort, &xAuthFallback);
if( retCode == RET_OK && xAuthFallback.is( ) )
{
xAuthFallback->setCode( dlg->GetCode( ) );
xAuthFallback->select( );
}
return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/task/XInteractionHandler2.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/task/XInteractionRequest.hpp>
#include <com/sun/star/task/XInteractionRetry.hpp> #include <com/sun/star/task/XInteractionRetry.hpp>
#include <com/sun/star/ucb/AuthenticationFallbackRequest.hpp>
#include <com/sun/star/ucb/InteractiveAppException.hpp> #include <com/sun/star/ucb/InteractiveAppException.hpp>
#include <com/sun/star/ucb/InteractiveLockingLockedException.hpp> #include <com/sun/star/ucb/InteractiveLockingLockedException.hpp>
#include <com/sun/star/ucb/InteractiveLockingNotLockedException.hpp> #include <com/sun/star/ucb/InteractiveLockingNotLockedException.hpp>
...@@ -805,6 +806,14 @@ UUIInteractionHelper::handleRequest_impl( ...@@ -805,6 +806,14 @@ UUIInteractionHelper::handleRequest_impl(
if (!bObtainErrorStringOnly) if (!bObtainErrorStringOnly)
{ {
ucb::AuthenticationFallbackRequest anAuthFallbackRequest;
if ( aAnyRequest >>= anAuthFallbackRequest )
{
handleAuthFallbackRequest( anAuthFallbackRequest.instructions,
anAuthFallbackRequest.url, rRequest->getContinuations() );
return true;
}
if ( handleAuthenticationRequest( rRequest ) ) if ( handleAuthenticationRequest( rRequest ) )
return true; return true;
......
...@@ -285,6 +285,12 @@ private: ...@@ -285,6 +285,12 @@ private:
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest,
const OUString& i_rServiceName const OUString& i_rServiceName
) const; ) const;
bool
handleAuthFallbackRequest(
OUString & instructions,
OUString & url,
Continuations const & rContinuations );
}; };
class ErrorResource: private Resource class ErrorResource: private Resource
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment