@@ -112,15 +112,7 @@ class Web3Auth {
112112 if ( sessionId && sessionId . length > 0 ) {
113113 var pubKey = getPublic ( Buffer . from ( sessionId , "hex" ) ) . toString ( "hex" ) ;
114114 var response = await Web3AuthApi . authorizeSession ( pubKey ) ;
115- if ( response . success == false ) {
116- return ;
117- }
118- var shareMetadata = JSON . parse ( response . message ) as ShareMetadata ;
119115
120- this . keyStore . set ( "ephemPublicKey" , shareMetadata . ephemPublicKey ) ;
121- this . keyStore . set ( "ivKey" , shareMetadata . iv ) ;
122- this . keyStore . set ( "mac" , shareMetadata . mac ) ;
123-
124116 var web3AuthResponse = await decryptData < any > ( sessionId , response . message ) ;
125117 web3AuthResponse [ "userInfo" ] = web3AuthResponse [ "store" ]
126118 delete web3AuthResponse [ 'store' ] ;
@@ -131,27 +123,24 @@ class Web3Auth {
131123 return Promise . resolve ( web3AuthResponse ) ;
132124 }
133125 } else {
134- return Promise . reject ( `session recovery failed with error ${ web3AuthResponse . error } ` ) ;
126+ throw new Error ( `session recovery failed with error ${ web3AuthResponse . error } ` ) ;
135127 }
136128 }
137129 }
138130
139131 async sessionTimeout ( ) {
140132 const sessionId = await this . keyStore . get ( "sessionId" ) ;
141133 if ( sessionId && sessionId . length > 0 ) {
142- var ephemKey = await this . keyStore . get ( "ephemPublicKey" ) ;
143- var ivKey = await this . keyStore . get ( "ivKey" ) ;
144- var mac = await this . keyStore . get ( "mac" ) ;
145-
146- if ( ephemKey ?. length == 0 && ivKey ?. length == 0 )
134+ var pubKey = getPublic ( Buffer . from ( sessionId , "hex" ) ) . toString ( "hex" ) ;
135+ var response = await Web3AuthApi . authorizeSession ( pubKey ) ;
136+ if ( ! response . success ) {
147137 return ;
148-
138+ }
139+ var shareMetadata = JSON . parse ( response . message ) as ShareMetadata ;
149140 var encryptedData = await encryptData ( sessionId , "" ) ;
150141 var encryptedMetadata : ShareMetadata = {
151- iv : ivKey ,
152- ephemPublicKey : ephemKey ,
153- ciphertext : encryptedData ,
154- mac : mac
142+ ... shareMetadata ,
143+ ciphertext : encryptedData
155144 } ;
156145 var jsonData = JSON . stringify ( encryptedMetadata ) ;
157146 var hashData = keccak256 ( jsonData ) ;
@@ -163,9 +152,7 @@ class Web3Auth {
163152 timeout : 1
164153 } ) ;
165154
166- this . keyStore . remove ( "ephemPublicKey" ) ;
167- this . keyStore . remove ( "ivKey" ) ;
168- this . keyStore . remove ( "mac" ) ;
155+ this . keyStore . remove ( "sessionId" ) ;
169156
170157 if ( this . initParams . loginConfig ) {
171158 var loginConfigItem = Object . values ( this . initParams . loginConfig ) [ 0 ] ;
0 commit comments