Fixed function hoisting

This commit is contained in:
Gustaf Räntilä
2017-09-29 14:29:22 +02:00
parent 972c8fa030
commit 6848878d93
+47 -45
View File
@@ -196,36 +196,38 @@ function register( registerRequests, signRequests /* = null */, timeout )
return new Promise( function( resolve, reject )
{
function cbNative( response )
{
if ( response.errorCode )
reject( makeError( "Registration failed", response ) );
else
{
delete response.errorCode;
resolve( response );
}
}
function cbChrome( err, response )
{
if ( err )
reject( err );
else if ( response.errorCode )
reject( makeError( "Registration failed", response ) );
else
resolve( response );
}
if ( native )
{
function cb( response )
{
if ( response.errorCode )
reject( makeError( "Registration failed", response ) );
else
{
delete response.errorCode;
resolve( response );
}
}
var appId = registerRequests[ 0 ].appId;
u2f.register(
appId, registerRequests, signRequests, cb, timeout );
appId, registerRequests, signRequests, cbNative, timeout );
}
else
{
function cb( err, response )
{
if ( err )
reject( err );
else if ( response.errorCode )
reject( makeError( "Registration failed", response ) );
else
resolve( response );
}
u2f.register( registerRequests, signRequests, cb, timeout );
u2f.register(
registerRequests, signRequests, cbChrome, timeout );
}
} );
} ) ).promise;
@@ -248,37 +250,37 @@ function sign( signRequests, timeout )
return new Promise( function( resolve, reject )
{
function cbNative( response )
{
if ( response.errorCode )
reject( makeError( "Sign failed", response ) );
else
{
delete response.errorCode;
resolve( response );
}
}
function cbChrome( err, response )
{
if ( err )
reject( err );
else if ( response.errorCode )
reject( makeError( "Sign failed", response ) );
else
resolve( response );
}
if ( native )
{
function cb( response )
{
if ( response.errorCode )
reject( makeError( "Sign failed", response ) );
else
{
delete response.errorCode;
resolve( response );
}
}
var appId = signRequests[ 0 ].appId;
var challenge = signRequests[ 0 ].challenge;
u2f.sign( appId, challenge, signRequests, cb, timeout );
u2f.sign( appId, challenge, signRequests, cbNative, timeout );
}
else
{
function cb( err, response )
{
if ( err )
reject( err );
else if ( response.errorCode )
reject( makeError( "Sign failed", response ) );
else
resolve( response );
}
u2f.sign( signRequests, cb, timeout );
u2f.sign( signRequests, cbChrome, timeout );
}
} );
} ) ).promise;