@@ -45,7 +45,7 @@ class GpgAuthController extends MfaController {
4545 this . URL_VERIFY = `${ baseUrl } /verify.json` ;
4646 this . URL_CHECKSESSION = `${ baseUrl } /is-authenticated.json` ;
4747 this . URL_LOGIN = `${ baseUrl } /login.json` ;
48- this . URL_LOGOUT = `${ baseUrl } /logout` ;
48+ this . URL_LOGOUT = `${ baseUrl } /logout.json ` ;
4949
5050 // Session cookie
5151 this . COOKIE_FILE = `${ this . appDir } /app/tmp/cookie.json` ;
@@ -176,16 +176,16 @@ class GpgAuthController extends MfaController {
176176 */
177177 async logout ( ) {
178178 try {
179+ this . _clearCookie ( ) ;
179180 const response = await this . get ( {
180181 url : this . URL_LOGOUT ,
181182 jar : this . cookieJar
182183 } ) ;
183184 this . _serverResponseHealthCheck ( 'logout' , response ) ;
184- this . _clearCookie ( ) ;
185185 return true ;
186186 } catch ( error ) {
187- this . error ( error ) ;
188- return false ;
187+ this . log ( error , 'verbose' ) ;
188+ return true ;
189189 }
190190 }
191191
@@ -225,25 +225,24 @@ class GpgAuthController extends MfaController {
225225 */
226226 _parseProgramArg ( program ) {
227227 if ( ! program ) {
228+ console . log ( 'no program' ) ;
228229 return ;
229230 }
230-
231- if ( program . fingerprint ) {
231+ if ( program . opts ( ) . fingerprint ) {
232232 this . user = new User ( {
233233 privateKey : {
234- fingerprint : program . fingerprint
234+ fingerprint : program . opts ( ) . fingerprint
235235 }
236236 } ) ;
237237 } else {
238238 this . user = new User ( ) ;
239239 }
240240
241- if ( program . passphrase ) {
241+ if ( program . opts ( ) . passphrase ) {
242242 // if no passphrase is given but is needed
243243 // a gpg prompt will be triggered by gpg itself
244- this . passphrase = program . passphrase ;
244+ this . passphrase = program . opts ( ) . passphrase ;
245245 }
246-
247246 this . force = program . force || false ;
248247 }
249248
@@ -329,7 +328,10 @@ class GpgAuthController extends MfaController {
329328 const encryptedAuthToken = Compat . stripslashes ( Compat . urldecode ( response . headers [ 'x-gpgauth-user-auth-token' ] ) ) ;
330329 let options ;
331330 if ( this . passphrase !== undefined ) {
332- options = [ '--passphrase' , this . passphrase ] ;
331+ options = [
332+ '--pinentry-mode' , 'loopback' ,
333+ '--passphrase' , this . passphrase
334+ ] ;
333335 }
334336 const userAuthToken = await Crypto . decrypt ( encryptedAuthToken , options ) ;
335337 GpgAuthToken . validate ( 'token' , userAuthToken ) ;
0 commit comments