File tree Expand file tree Collapse file tree 3 files changed +13
-5
lines changed Expand file tree Collapse file tree 3 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 1
1
/*global module*/
2
- var base64url = require ( 'base64url' ) ;
2
+ var Buffer = require ( 'safe-buffer' ) . Buffer ;
3
3
var DataStream = require ( './data-stream' ) ;
4
4
var jwa = require ( 'jwa' ) ;
5
5
var Stream = require ( 'stream' ) ;
6
6
var toString = require ( './tostring' ) ;
7
7
var util = require ( 'util' ) ;
8
8
9
+ function base64url ( string , encoding ) {
10
+ return Buffer
11
+ . from ( string , encoding )
12
+ . toString ( 'base64' )
13
+ . replace ( / = / g, '' )
14
+ . replace ( / \+ / g, '-' )
15
+ . replace ( / \/ / g, '_' ) ;
16
+ }
17
+
9
18
function jwsSecuredInput ( header , payload , encoding ) {
10
19
encoding = encoding || 'utf8' ;
11
20
var encodedHeader = base64url ( toString ( header ) , 'binary' ) ;
Original file line number Diff line number Diff line change 1
1
/*global module*/
2
- var base64url = require ( 'base64url' ) ;
2
+ var Buffer = require ( 'safe-buffer' ) . Buffer ;
3
3
var DataStream = require ( './data-stream' ) ;
4
4
var jwa = require ( 'jwa' ) ;
5
5
var Stream = require ( 'stream' ) ;
@@ -20,7 +20,7 @@ function safeJsonParse(thing) {
20
20
21
21
function headerFromJWS ( jwsSig ) {
22
22
var encodedHeader = jwsSig . split ( '.' , 1 ) [ 0 ] ;
23
- return safeJsonParse ( base64url . decode ( encodedHeader , 'binary' ) ) ;
23
+ return safeJsonParse ( Buffer . from ( encodedHeader , 'base64' ) . toString ( 'binary' ) ) ;
24
24
}
25
25
26
26
function securedInputFromJWS ( jwsSig ) {
@@ -34,7 +34,7 @@ function signatureFromJWS(jwsSig) {
34
34
function payloadFromJWS ( jwsSig , encoding ) {
35
35
encoding = encoding || 'utf8' ;
36
36
var payload = jwsSig . split ( '.' ) [ 1 ] ;
37
- return base64url . decode ( payload , encoding ) ;
37
+ return Buffer . from ( payload , 'base64' ) . toString ( encoding ) ;
38
38
}
39
39
40
40
function isValidJws ( string ) {
Original file line number Diff line number Diff line change 24
24
"readmeFilename" : " readme.md" ,
25
25
"gitHead" : " c0f6b27bcea5a2ad2e304d91c2e842e4076a6b03" ,
26
26
"dependencies" : {
27
- "base64url" : " ^2.0.0" ,
28
27
"jwa" : " ^1.1.5" ,
29
28
"safe-buffer" : " ^5.0.1"
30
29
},
You can’t perform that action at this time.
0 commit comments