File tree 6 files changed +15
-22
lines changed
6 files changed +15
-22
lines changed Original file line number Diff line number Diff line change @@ -43,8 +43,8 @@ io.use(ioMiddleware);
43
43
server .listen (() => {
44
44
const { port } = server .address ();
45
45
const client = createIoClient (` http://localhost:${ port} ` , {
46
- extraHeaders : {
47
- Cookie : " session= " // + await firebaseAdmin.auth().createSessionCookie(idToken)
46
+ query : {
47
+ session : " " // await firebaseAdmin.auth().createSessionCookie(idToken)
48
48
}
49
49
});
50
50
client .on (" connect" , error => {
Original file line number Diff line number Diff line change 1
- import cookie from "cookie" ;
2
-
3
1
export default ( app , options = { } ) => {
4
2
const auth = app . auth ( ) ;
5
3
const opts = Object . assign ( { deny : true , cache : true } , options ) ;
6
4
7
5
const cache = { } ;
8
6
const middleware = async ( client , next ) => {
9
- const { session = "" } = cookie . parse (
10
- client . handshake . headers . cookie || ""
11
- ) ;
7
+ const { session = "" } = client . handshake . query ;
12
8
if ( ! session && ! opts . deny ) {
13
9
return next ( ) ;
14
10
}
Original file line number Diff line number Diff line change 2
2
"name" : " socket.io-middleware-firebase-admin" ,
3
3
"version" : " 0.0.1" ,
4
4
"description" : " a socket.io middleware firebaseAdmin.verifySessionCookie" ,
5
- "files" : [" index.js" , " index.mjs" ],
5
+ "files" : [
6
+ " index.js" ,
7
+ " index.mjs"
8
+ ],
6
9
"scripts" : {
7
10
"start" : " abby format, test --watch \" *.mjs\" " ,
8
11
"test" : " node --experimental-modules test.mjs" ,
9
12
"format" : " prettier \" *.mjs\" --write" ,
10
13
"build" : " babel index.mjs --out-file index.js" ,
11
14
"postversion" : " git push --follow-tags && conventional-github-releaser -p atom"
12
15
},
13
- "dependencies" : {
14
- "cookie" : " ^0.3.1"
15
- },
16
+ "dependencies" : {},
16
17
"devDependencies" : {
17
18
"@babel/cli" : " ^7.0.0-rc.1" ,
18
19
"@babel/core" : " ^7.0.0-rc.1" ,
Original file line number Diff line number Diff line change @@ -45,13 +45,9 @@ export const createIoServerAsync = ioMiddleware => {
45
45
} ) ;
46
46
} ;
47
47
48
- export const createIoClientAsync = ( port , cookie ) => {
48
+ export const createIoClientAsync = ( port , query ) => {
49
49
return new Promise ( ( resolve , reject ) => {
50
- const client = createIoClient ( `http://localhost:${ port } ` , {
51
- extraHeaders : {
52
- Cookie : cookie
53
- }
54
- } ) ;
50
+ const client = createIoClient ( `http://localhost:${ port } ` , { query } ) ;
55
51
client . on ( "connect" , ( ) => {
56
52
resolve ( client ) ;
57
53
} ) ;
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ spec.after(async () => {
27
27
} ) ;
28
28
29
29
spec ( "should deny unauthorized user using deny mode(default)" , async ( ) => {
30
- const error = await rejects ( createIoClientAsync ( port , "session=" ) ) ;
30
+ const error = await rejects ( createIoClientAsync ( port ) ) ;
31
31
const expectMessage = "Decoding Firebase session cookie failed" ;
32
32
strictEqual ( error . message . slice ( 0 , expectMessage . length ) , expectMessage ) ;
33
33
} ) ;
45
45
} ) ;
46
46
} ) ;
47
47
48
- const client = await createIoClientAsync ( port , `session= ${ session } ` ) ;
48
+ const client = await createIoClientAsync ( port , { session } ) ;
49
49
await new Promise ( async resolve => {
50
50
client . emit ( "claims" , claims => {
51
51
strictEqual ( claims . email , "i59naga@icloud.com" ) ;
Original file line number Diff line number Diff line change @@ -904,7 +904,7 @@ convert-source-map@^1.1.0:
904
904
version "1.5.1"
905
905
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
906
906
907
- cookie@0.3.1, cookie@^0.3.1 :
907
+ cookie@0.3.1 :
908
908
version "0.3.1"
909
909
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
910
910
@@ -1043,8 +1043,8 @@ eastasianwidth@^0.2.0:
1043
1043
resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
1044
1044
1045
1045
eastern@^0.1.0 :
1046
- version "0.1.0 "
1047
- resolved "https://registry.yarnpkg.com/eastern/-/eastern-0.1.0 .tgz#5018052e0333f5c351499ef42589fb999a558359 "
1046
+ version "0.1.1 "
1047
+ resolved "https://registry.yarnpkg.com/eastern/-/eastern-0.1.1 .tgz#5d3f87714a139eda0588edcbd897903ded92eaa8 "
1048
1048
dependencies :
1049
1049
chalk "^2.4.1"
1050
1050
exit-hook "^2.0.0"
You can’t perform that action at this time.
0 commit comments