firebase-admin-edge 1.0.11 → 1.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -7
- package/dist/auth/firebase-admin-auth.js +33 -33
- package/dist/auth/firebase-admin-auth.js.map +1 -1
- package/dist/auth/firebase-admin-auth.test.js +71 -71
- package/dist/auth/firebase-admin-auth.test.js.map +1 -1
- package/dist/auth/firebase-auth-endpoints.js +27 -27
- package/dist/auth/firebase-auth-endpoints.test.js +29 -29
- package/dist/auth/firebase-auth-endpoints.test.js.map +1 -1
- package/dist/auth/firebase-auth.js +7 -7
- package/dist/auth/firebase-auth.js.map +1 -1
- package/dist/auth/firebase-auth.test.js +9 -9
- package/dist/auth/firebase-jwt.js +32 -32
- package/dist/auth/firebase-jwt.js.map +1 -1
- package/dist/auth/firebase-jwt.test.js +14 -14
- package/dist/auth/firebase-jwt.test.js.map +1 -1
- package/dist/auth/github-oauth.d.ts +16 -0
- package/dist/auth/github-oauth.d.ts.map +1 -0
- package/dist/auth/github-oauth.js +31 -0
- package/dist/auth/github-oauth.js.map +1 -0
- package/dist/auth/google-oauth.d.ts.map +1 -1
- package/dist/auth/google-oauth.js +16 -15
- package/dist/auth/google-oauth.js.map +1 -1
- package/dist/auth/google-oauth.test.js +15 -14
- package/dist/auth/google-oauth.test.js.map +1 -1
- package/dist/firebase-edge-server.d.ts +14 -74
- package/dist/firebase-edge-server.d.ts.map +1 -1
- package/dist/firebase-edge-server.js +105 -278
- package/dist/firebase-edge-server.js.map +1 -1
- package/dist/firebase-edge-server.test.js +115 -76
- package/dist/firebase-edge-server.test.js.map +1 -1
- package/dist/rest-fetch.d.ts.map +1 -1
- package/dist/rest-fetch.js +7 -6
- package/dist/rest-fetch.js.map +1 -1
- package/dist/rest-fetch.test.js +48 -30
- package/dist/rest-fetch.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
-
import { createFirebaseEdgeServer, OFFICIAL_FIREBASE_OAUTH_PROVIDERS
|
|
2
|
+
import { createFirebaseEdgeServer, OFFICIAL_FIREBASE_OAUTH_PROVIDERS } from './firebase-edge-server.js';
|
|
3
3
|
// Mock dependencies
|
|
4
4
|
vi.mock('./auth/firebase-admin-auth.js');
|
|
5
5
|
vi.mock('./auth/firebase-auth.js');
|
|
6
6
|
vi.mock('./auth/firebase-jwt.js');
|
|
7
7
|
vi.mock('./auth/google-oauth.js');
|
|
8
|
+
vi.mock('./auth/github-oauth.js');
|
|
8
9
|
const mockServiceAccount = {
|
|
9
10
|
type: 'service_account',
|
|
10
11
|
project_id: 'test-project',
|
|
@@ -15,7 +16,7 @@ const mockServiceAccount = {
|
|
|
15
16
|
auth_uri: 'https://accounts.google.com/o/oauth2/auth',
|
|
16
17
|
token_uri: 'https://oauth2.googleapis.com/token',
|
|
17
18
|
auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
|
|
18
|
-
client_x509_cert_url: 'https://www.googleapis.com/robot/v1/metadata/x509/test%40test-project.iam.gserviceaccount.com'
|
|
19
|
+
client_x509_cert_url: 'https://www.googleapis.com/robot/v1/metadata/x509/test%40test-project.iam.gserviceaccount.com'
|
|
19
20
|
};
|
|
20
21
|
const mockFirebaseConfig = {
|
|
21
22
|
apiKey: 'test-api-key',
|
|
@@ -23,131 +24,169 @@ const mockFirebaseConfig = {
|
|
|
23
24
|
projectId: 'test-project',
|
|
24
25
|
storageBucket: 'test-project.appspot.com',
|
|
25
26
|
messagingSenderId: '123456789',
|
|
26
|
-
appId: 'test-app-id'
|
|
27
|
+
appId: 'test-app-id'
|
|
27
28
|
};
|
|
28
29
|
const mockProviders = {
|
|
29
30
|
google: {
|
|
30
31
|
client_id: 'google-client-id',
|
|
31
|
-
client_secret: 'google-client-secret'
|
|
32
|
+
client_secret: 'google-client-secret'
|
|
32
33
|
},
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
microsoft: { client_id: 'ms-id', client_secret: 'ms-secret' },
|
|
38
|
-
yahoo: { client_id: 'yahoo-id', client_secret: 'yahoo-secret' },
|
|
39
|
-
playgames: { client_id: 'pg-id', client_secret: 'pg-secret' },
|
|
34
|
+
github: {
|
|
35
|
+
client_id: 'github-client-id',
|
|
36
|
+
client_secret: 'github-client-secret'
|
|
37
|
+
}
|
|
40
38
|
};
|
|
41
39
|
describe('createFirebaseEdgeServer', () => {
|
|
42
40
|
let mockGetSession;
|
|
43
41
|
let mockSaveSession;
|
|
44
|
-
let
|
|
42
|
+
let server;
|
|
45
43
|
beforeEach(() => {
|
|
46
44
|
vi.clearAllMocks();
|
|
47
45
|
mockGetSession = vi.fn();
|
|
48
46
|
mockSaveSession = vi.fn();
|
|
49
|
-
|
|
50
|
-
});
|
|
51
|
-
it('should create server with all required methods', () => {
|
|
52
|
-
const server = createFirebaseEdgeServer({
|
|
47
|
+
server = createFirebaseEdgeServer({
|
|
53
48
|
serviceAccount: mockServiceAccount,
|
|
54
49
|
firebaseConfig: mockFirebaseConfig,
|
|
55
50
|
providers: mockProviders,
|
|
56
51
|
cookies: {
|
|
57
52
|
getSession: mockGetSession,
|
|
58
|
-
saveSession: mockSaveSession
|
|
59
|
-
}
|
|
53
|
+
saveSession: mockSaveSession
|
|
54
|
+
}
|
|
60
55
|
});
|
|
61
|
-
expect(server).toHaveProperty('auth');
|
|
62
|
-
expect(server).toHaveProperty('adminAuth');
|
|
63
|
-
expect(server).toHaveProperty('signOut');
|
|
64
|
-
expect(server).toHaveProperty('getUser');
|
|
65
|
-
expect(server).toHaveProperty('getGoogleLoginURL');
|
|
66
|
-
expect(server).toHaveProperty('signInWithGoogleWithCode');
|
|
67
|
-
expect(server).toHaveProperty('getToken');
|
|
68
56
|
});
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
57
|
+
describe('factory function', () => {
|
|
58
|
+
it('creates server with all required methods', () => {
|
|
59
|
+
expect(server).toHaveProperty('auth');
|
|
60
|
+
expect(server).toHaveProperty('adminAuth');
|
|
61
|
+
expect(server).toHaveProperty('signOut');
|
|
62
|
+
expect(server).toHaveProperty('getUser');
|
|
63
|
+
expect(server).toHaveProperty('getGoogleLoginURL');
|
|
64
|
+
expect(server).toHaveProperty('getGitHubLoginURL');
|
|
65
|
+
expect(server).toHaveProperty('signInWithCode');
|
|
66
|
+
expect(server).toHaveProperty('getToken');
|
|
79
67
|
});
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
68
|
+
it('uses custom session name when provided', () => {
|
|
69
|
+
const customServer = createFirebaseEdgeServer({
|
|
70
|
+
serviceAccount: mockServiceAccount,
|
|
71
|
+
firebaseConfig: mockFirebaseConfig,
|
|
72
|
+
providers: mockProviders,
|
|
73
|
+
cookies: {
|
|
74
|
+
getSession: mockGetSession,
|
|
75
|
+
saveSession: mockSaveSession,
|
|
76
|
+
sessionName: 'custom-session'
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
customServer.signOut();
|
|
80
|
+
expect(mockSaveSession).toHaveBeenCalledWith('custom-session', '', expect.objectContaining({ maxAge: 0 }));
|
|
92
81
|
});
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
it('should accept custom fetch function', () => {
|
|
97
|
-
createFirebaseEdgeServer({
|
|
98
|
-
serviceAccount: mockServiceAccount,
|
|
99
|
-
firebaseConfig: mockFirebaseConfig,
|
|
100
|
-
providers: mockProviders,
|
|
101
|
-
cookies: {
|
|
102
|
-
getSession: mockGetSession,
|
|
103
|
-
saveSession: mockSaveSession,
|
|
104
|
-
},
|
|
105
|
-
fetch: mockFetch,
|
|
82
|
+
it('uses default session name "__session"', () => {
|
|
83
|
+
server.signOut();
|
|
84
|
+
expect(mockSaveSession).toHaveBeenCalledWith('__session', '', expect.objectContaining({ maxAge: 0 }));
|
|
106
85
|
});
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
it('should clear session cookie with proper options', () => {
|
|
111
|
-
const server = createFirebaseEdgeServer({
|
|
86
|
+
it('accepts custom fetch function', () => {
|
|
87
|
+
const mockFetch = vi.fn();
|
|
88
|
+
const customServer = createFirebaseEdgeServer({
|
|
112
89
|
serviceAccount: mockServiceAccount,
|
|
113
90
|
firebaseConfig: mockFirebaseConfig,
|
|
114
91
|
providers: mockProviders,
|
|
115
92
|
cookies: {
|
|
116
93
|
getSession: mockGetSession,
|
|
117
|
-
saveSession: mockSaveSession
|
|
94
|
+
saveSession: mockSaveSession
|
|
118
95
|
},
|
|
96
|
+
fetch: mockFetch
|
|
119
97
|
});
|
|
98
|
+
expect(customServer).toBeDefined();
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
describe('signOut', () => {
|
|
102
|
+
it('clears session cookie with proper options', () => {
|
|
120
103
|
server.signOut();
|
|
121
104
|
expect(mockSaveSession).toHaveBeenCalledWith('__session', '', {
|
|
122
105
|
httpOnly: true,
|
|
123
106
|
secure: true,
|
|
124
107
|
sameSite: 'lax',
|
|
125
108
|
path: '/',
|
|
126
|
-
maxAge: 0
|
|
109
|
+
maxAge: 0
|
|
127
110
|
});
|
|
128
111
|
});
|
|
129
112
|
});
|
|
130
113
|
describe('getUser', () => {
|
|
131
|
-
it('
|
|
114
|
+
it('returns null data when no session exists', async () => {
|
|
132
115
|
mockGetSession.mockResolvedValue(null);
|
|
133
|
-
const
|
|
116
|
+
const result = await server.getUser();
|
|
117
|
+
expect(result).toEqual({
|
|
118
|
+
data: null,
|
|
119
|
+
error: null
|
|
120
|
+
});
|
|
121
|
+
expect(mockGetSession).toHaveBeenCalledWith('__session');
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
describe('getGoogleLoginURL', () => {
|
|
125
|
+
it('throws error when Google provider not configured', async () => {
|
|
126
|
+
const serverWithoutGoogle = createFirebaseEdgeServer({
|
|
134
127
|
serviceAccount: mockServiceAccount,
|
|
135
128
|
firebaseConfig: mockFirebaseConfig,
|
|
136
|
-
providers:
|
|
129
|
+
providers: {},
|
|
137
130
|
cookies: {
|
|
138
131
|
getSession: mockGetSession,
|
|
139
|
-
saveSession: mockSaveSession
|
|
140
|
-
}
|
|
132
|
+
saveSession: mockSaveSession
|
|
133
|
+
}
|
|
141
134
|
});
|
|
142
|
-
|
|
135
|
+
await expect(serverWithoutGoogle.getGoogleLoginURL('http://localhost', '/dashboard')).rejects.toThrow('Google provider not configured');
|
|
136
|
+
});
|
|
137
|
+
it('calls deleteSession before generating URL', async () => {
|
|
138
|
+
const { createGoogleOAuthLoginUrl } = await import('./auth/google-oauth.js');
|
|
139
|
+
vi.mocked(createGoogleOAuthLoginUrl).mockReturnValue('http://oauth-url');
|
|
140
|
+
await server.getGoogleLoginURL('http://localhost', '/dashboard');
|
|
141
|
+
expect(mockSaveSession).toHaveBeenCalledWith('__session', '', expect.objectContaining({ maxAge: 0 }));
|
|
142
|
+
});
|
|
143
|
+
});
|
|
144
|
+
describe('getGitHubLoginURL', () => {
|
|
145
|
+
it('throws error when GitHub provider not configured', async () => {
|
|
146
|
+
const serverWithoutGitHub = createFirebaseEdgeServer({
|
|
147
|
+
serviceAccount: mockServiceAccount,
|
|
148
|
+
firebaseConfig: mockFirebaseConfig,
|
|
149
|
+
providers: {},
|
|
150
|
+
cookies: {
|
|
151
|
+
getSession: mockGetSession,
|
|
152
|
+
saveSession: mockSaveSession
|
|
153
|
+
}
|
|
154
|
+
});
|
|
155
|
+
await expect(serverWithoutGitHub.getGitHubLoginURL('http://localhost', '/dashboard')).rejects.toThrow('GitHub provider not configured');
|
|
156
|
+
});
|
|
157
|
+
it('calls deleteSession before generating URL', async () => {
|
|
158
|
+
const { createGitHubOAuthLoginUrl } = await import('./auth/github-oauth.js');
|
|
159
|
+
vi.mocked(createGitHubOAuthLoginUrl).mockReturnValue('http://github-oauth-url');
|
|
160
|
+
await server.getGitHubLoginURL('http://localhost', '/dashboard');
|
|
161
|
+
expect(mockSaveSession).toHaveBeenCalledWith('__session', '', expect.objectContaining({ maxAge: 0 }));
|
|
162
|
+
});
|
|
163
|
+
});
|
|
164
|
+
describe('signInWithCode', () => {
|
|
165
|
+
it('returns error when no provider specified in state', async () => {
|
|
166
|
+
const result = await server.signInWithCode('auth-code', 'http://localhost', null);
|
|
167
|
+
expect(result).toEqual({
|
|
168
|
+
error: expect.any(Error)
|
|
169
|
+
});
|
|
170
|
+
expect(result.error).toBeInstanceOf(Error);
|
|
171
|
+
expect(result.error.message).toBe('No provider specified in state');
|
|
172
|
+
});
|
|
173
|
+
it('handles invalid JSON state gracefully', async () => {
|
|
174
|
+
// We expect this to throw during JSON.parse, which is the current behavior
|
|
175
|
+
await expect(server.signInWithCode('auth-code', 'http://localhost', 'invalid-json')).rejects.toThrow();
|
|
176
|
+
});
|
|
177
|
+
});
|
|
178
|
+
describe('getToken', () => {
|
|
179
|
+
it('returns null when no verified token', async () => {
|
|
180
|
+
mockGetSession.mockResolvedValue(null);
|
|
181
|
+
const result = await server.getToken();
|
|
143
182
|
expect(result).toEqual({
|
|
144
183
|
data: null,
|
|
145
|
-
error: null
|
|
184
|
+
error: null
|
|
146
185
|
});
|
|
147
186
|
});
|
|
148
187
|
});
|
|
149
188
|
describe('OFFICIAL_FIREBASE_OAUTH_PROVIDERS', () => {
|
|
150
|
-
it('
|
|
189
|
+
it('contains all supported OAuth providers', () => {
|
|
151
190
|
expect(OFFICIAL_FIREBASE_OAUTH_PROVIDERS).toEqual([
|
|
152
191
|
'google',
|
|
153
192
|
'facebook',
|
|
@@ -156,7 +195,7 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
156
195
|
'github',
|
|
157
196
|
'microsoft',
|
|
158
197
|
'yahoo',
|
|
159
|
-
'playgames'
|
|
198
|
+
'playgames'
|
|
160
199
|
]);
|
|
161
200
|
});
|
|
162
201
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase-edge-server.test.js","sourceRoot":"","sources":["../src/firebase-edge-server.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAa,MAAM,QAAQ,CAAC;AACzE,OAAO,EACH,wBAAwB,EACxB,iCAAiC,
|
|
1
|
+
{"version":3,"file":"firebase-edge-server.test.js","sourceRoot":"","sources":["../src/firebase-edge-server.test.ts"],"names":[],"mappings":"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"}
|
package/dist/rest-fetch.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-fetch.d.ts","sourceRoot":"","sources":["../src/rest-fetch.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,GAAU,CAAC,EAAE,CAAC,EAChC,KAAK,MAAM,EACX,UAAU;IACN,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACxB,MAAM,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;KACxB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;;;;;;
|
|
1
|
+
{"version":3,"file":"rest-fetch.d.ts","sourceRoot":"","sources":["../src/rest-fetch.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,GAAU,CAAC,EAAE,CAAC,EAChC,KAAK,MAAM,EACX,UAAU;IACN,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACxB,MAAM,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;KACxB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;;;;;;EAoEJ,CAAC"}
|
package/dist/rest-fetch.js
CHANGED
|
@@ -11,17 +11,18 @@ export const restFetch = async (url, options) => {
|
|
|
11
11
|
const res = await fetchFn(url + query, {
|
|
12
12
|
method: options?.method ?? 'POST',
|
|
13
13
|
headers: {
|
|
14
|
+
Accept: 'application/json',
|
|
14
15
|
'Content-Type': form
|
|
15
16
|
? 'application/x-www-form-urlencoded'
|
|
16
17
|
: 'application/json',
|
|
17
18
|
...bearerHeader,
|
|
18
|
-
...options?.headers
|
|
19
|
+
...options?.headers
|
|
19
20
|
},
|
|
20
21
|
body: options?.body
|
|
21
22
|
? form
|
|
22
23
|
? new URLSearchParams(options.body)
|
|
23
24
|
: JSON.stringify(options.body)
|
|
24
|
-
: undefined
|
|
25
|
+
: undefined
|
|
25
26
|
});
|
|
26
27
|
if (PRINT_URL) {
|
|
27
28
|
console.log('restFetch', url + query);
|
|
@@ -32,26 +33,26 @@ export const restFetch = async (url, options) => {
|
|
|
32
33
|
const error = (await res.json());
|
|
33
34
|
return {
|
|
34
35
|
data: null,
|
|
35
|
-
error
|
|
36
|
+
error
|
|
36
37
|
};
|
|
37
38
|
}
|
|
38
39
|
const data = (await res.json());
|
|
39
40
|
return {
|
|
40
41
|
data,
|
|
41
|
-
error: null
|
|
42
|
+
error: null
|
|
42
43
|
};
|
|
43
44
|
}
|
|
44
45
|
if (!res.ok) {
|
|
45
46
|
const error = (await res.text());
|
|
46
47
|
return {
|
|
47
48
|
data: null,
|
|
48
|
-
error
|
|
49
|
+
error
|
|
49
50
|
};
|
|
50
51
|
}
|
|
51
52
|
const data = (await res.text());
|
|
52
53
|
return {
|
|
53
54
|
data,
|
|
54
|
-
error: null
|
|
55
|
+
error: null
|
|
55
56
|
};
|
|
56
57
|
};
|
|
57
58
|
//# sourceMappingURL=rest-fetch.js.map
|
package/dist/rest-fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-fetch.js","sourceRoot":"","sources":["../src/rest-fetch.ts"],"names":[],"mappings":"AAAA,MAAM,SAAS,GAAG,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC1B,GAAW,EACX,OAUC,EACH,EAAE;IACA,MAAM,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,KAAK,CAAC;IACpC,MAAM,YAAY,GAAG,OAAO,EAAE,WAAW;QACrC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,OAAO,CAAC,WAAW,EAAE,EAAE;QACpD,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,KAAK,GAAG,OAAO,EAAE,MAAM;QACzB,CAAC,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC;QAC3C,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,GAAG,KAAK,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,MAAM;QACjC,OAAO,EAAE;YACL,cAAc,EAAE,IAAI;gBAChB,CAAC,CAAC,mCAAmC;gBACrC,CAAC,CAAC,kBAAkB;YACxB,GAAG,YAAY;YACf,GAAG,OAAO,EAAE,OAAO;SACtB;QACD,IAAI,EAAE,OAAO,EAAE,IAAI;YACf,CAAC,CAAC,IAAI;gBACF,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,IAA8B,CAAC;gBAC7D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,SAAS;KAClB,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAChE,+CAA+C;QAE/C,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;YAEtC,OAAO;gBACH,IAAI,EAAE,IAAI;gBACV,KAAK;aACR,CAAC;QACN,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;QAErC,OAAO;YACH,IAAI;YACJ,KAAK,EAAE,IAAI;SACd,CAAC;IACN,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACV,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;QAEtC,OAAO;YACH,IAAI,EAAE,IAAI;YACV,KAAK;SACR,CAAC;IACN,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;IAErC,OAAO;QACH,IAAI;QACJ,KAAK,EAAE,IAAI;KACd,CAAC;AACN,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"rest-fetch.js","sourceRoot":"","sources":["../src/rest-fetch.ts"],"names":[],"mappings":"AAAA,MAAM,SAAS,GAAG,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC1B,GAAW,EACX,OAUC,EACH,EAAE;IACA,MAAM,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,KAAK,CAAC;IACpC,MAAM,YAAY,GAAG,OAAO,EAAE,WAAW;QACrC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,OAAO,CAAC,WAAW,EAAE,EAAE;QACpD,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,KAAK,GAAG,OAAO,EAAE,MAAM;QACzB,CAAC,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC;QAC3C,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,GAAG,KAAK,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,MAAM;QACjC,OAAO,EAAE;YACL,MAAM,EAAE,kBAAkB;YAC1B,cAAc,EAAE,IAAI;gBAChB,CAAC,CAAC,mCAAmC;gBACrC,CAAC,CAAC,kBAAkB;YACxB,GAAG,YAAY;YACf,GAAG,OAAO,EAAE,OAAO;SACtB;QACD,IAAI,EAAE,OAAO,EAAE,IAAI;YACf,CAAC,CAAC,IAAI;gBACF,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,IAA8B,CAAC;gBAC7D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,SAAS;KAClB,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAChE,+CAA+C;QAE/C,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;YAEtC,OAAO;gBACH,IAAI,EAAE,IAAI;gBACV,KAAK;aACR,CAAC;QACN,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;QAErC,OAAO;YACH,IAAI;YACJ,KAAK,EAAE,IAAI;SACd,CAAC;IACN,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACV,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;QAEtC,OAAO;YACH,IAAI,EAAE,IAAI;YACV,KAAK;SACR,CAAC;IACN,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAM,CAAC;IAErC,OAAO;QACH,IAAI;QACJ,KAAK,EAAE,IAAI;KACd,CAAC;AACN,CAAC,CAAC"}
|
package/dist/rest-fetch.test.js
CHANGED
|
@@ -10,13 +10,16 @@ describe('restFetch', () => {
|
|
|
10
10
|
mockFetch.mockResolvedValue({
|
|
11
11
|
ok: true,
|
|
12
12
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
13
|
-
json: () => Promise.resolve({ success: true })
|
|
13
|
+
json: () => Promise.resolve({ success: true })
|
|
14
14
|
});
|
|
15
15
|
const result = await restFetch('https://api.example.com');
|
|
16
16
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
17
17
|
method: 'POST',
|
|
18
|
-
headers: {
|
|
19
|
-
|
|
18
|
+
headers: {
|
|
19
|
+
Accept: 'application/json',
|
|
20
|
+
'Content-Type': 'application/json'
|
|
21
|
+
},
|
|
22
|
+
body: undefined
|
|
20
23
|
});
|
|
21
24
|
expect(result).toEqual({ data: { success: true }, error: null });
|
|
22
25
|
});
|
|
@@ -24,126 +27,141 @@ describe('restFetch', () => {
|
|
|
24
27
|
mockFetch.mockResolvedValue({
|
|
25
28
|
ok: true,
|
|
26
29
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
27
|
-
json: () => Promise.resolve({ data: 'test' })
|
|
30
|
+
json: () => Promise.resolve({ data: 'test' })
|
|
28
31
|
});
|
|
29
32
|
await restFetch('https://api.example.com', {
|
|
30
33
|
method: 'GET',
|
|
31
|
-
params: {
|
|
34
|
+
params: { search: 'query', limit: '10' }
|
|
35
|
+
});
|
|
36
|
+
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com?search=query&limit=10', {
|
|
37
|
+
method: 'GET',
|
|
38
|
+
headers: {
|
|
39
|
+
Accept: 'application/json',
|
|
40
|
+
'Content-Type': 'application/json'
|
|
41
|
+
},
|
|
42
|
+
body: undefined
|
|
32
43
|
});
|
|
33
|
-
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com?foo=bar&baz=qux', expect.any(Object));
|
|
34
44
|
});
|
|
35
45
|
it('should send JSON body with POST request', async () => {
|
|
36
46
|
mockFetch.mockResolvedValue({
|
|
37
47
|
ok: true,
|
|
38
48
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
39
|
-
json: () => Promise.resolve({})
|
|
49
|
+
json: () => Promise.resolve({})
|
|
40
50
|
});
|
|
41
51
|
await restFetch('https://api.example.com', {
|
|
42
52
|
method: 'POST',
|
|
43
|
-
body: { name: 'test', value: 123 }
|
|
53
|
+
body: { name: 'test', value: 123 }
|
|
44
54
|
});
|
|
45
55
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
46
56
|
method: 'POST',
|
|
47
|
-
headers: {
|
|
48
|
-
|
|
57
|
+
headers: {
|
|
58
|
+
Accept: 'application/json',
|
|
59
|
+
'Content-Type': 'application/json'
|
|
60
|
+
},
|
|
61
|
+
body: JSON.stringify({ name: 'test', value: 123 })
|
|
49
62
|
});
|
|
50
63
|
});
|
|
51
64
|
it('should send form data when form option is true', async () => {
|
|
52
65
|
mockFetch.mockResolvedValue({
|
|
53
66
|
ok: true,
|
|
54
67
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
55
|
-
json: () => Promise.resolve({})
|
|
68
|
+
json: () => Promise.resolve({})
|
|
56
69
|
});
|
|
57
70
|
await restFetch('https://api.example.com', {
|
|
58
71
|
form: true,
|
|
59
|
-
body: { username: 'test', password: 'secret' }
|
|
72
|
+
body: { username: 'test', password: 'secret' }
|
|
60
73
|
});
|
|
61
74
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
62
75
|
method: 'POST',
|
|
63
|
-
headers: {
|
|
64
|
-
|
|
76
|
+
headers: {
|
|
77
|
+
Accept: 'application/json',
|
|
78
|
+
'Content-Type': 'application/x-www-form-urlencoded'
|
|
79
|
+
},
|
|
80
|
+
body: expect.any(URLSearchParams)
|
|
65
81
|
});
|
|
66
82
|
});
|
|
67
83
|
it('should include bearer token in headers', async () => {
|
|
68
84
|
mockFetch.mockResolvedValue({
|
|
69
85
|
ok: true,
|
|
70
86
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
71
|
-
json: () => Promise.resolve({})
|
|
87
|
+
json: () => Promise.resolve({})
|
|
72
88
|
});
|
|
73
89
|
await restFetch('https://api.example.com', {
|
|
74
|
-
bearerToken: 'abc123'
|
|
90
|
+
bearerToken: 'abc123'
|
|
75
91
|
});
|
|
76
92
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
77
93
|
method: 'POST',
|
|
78
94
|
headers: {
|
|
95
|
+
Accept: 'application/json',
|
|
79
96
|
'Content-Type': 'application/json',
|
|
80
|
-
Authorization: 'Bearer abc123'
|
|
97
|
+
Authorization: 'Bearer abc123'
|
|
81
98
|
},
|
|
82
|
-
body: undefined
|
|
99
|
+
body: undefined
|
|
83
100
|
});
|
|
84
101
|
});
|
|
85
102
|
it('should merge custom headers', async () => {
|
|
86
103
|
mockFetch.mockResolvedValue({
|
|
87
104
|
ok: true,
|
|
88
105
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
89
|
-
json: () => Promise.resolve({})
|
|
106
|
+
json: () => Promise.resolve({})
|
|
90
107
|
});
|
|
91
108
|
await restFetch('https://api.example.com', {
|
|
92
|
-
headers: { 'X-Custom': 'value' }
|
|
109
|
+
headers: { 'X-Custom': 'value' }
|
|
93
110
|
});
|
|
94
111
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
95
112
|
method: 'POST',
|
|
96
113
|
headers: {
|
|
114
|
+
Accept: 'application/json',
|
|
97
115
|
'Content-Type': 'application/json',
|
|
98
|
-
'X-Custom': 'value'
|
|
116
|
+
'X-Custom': 'value'
|
|
99
117
|
},
|
|
100
|
-
body: undefined
|
|
118
|
+
body: undefined
|
|
101
119
|
});
|
|
102
120
|
});
|
|
103
121
|
it('should handle JSON error response', async () => {
|
|
104
122
|
mockFetch.mockResolvedValue({
|
|
105
123
|
ok: false,
|
|
106
124
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
107
|
-
json: () => Promise.resolve({ message: 'Not found' })
|
|
125
|
+
json: () => Promise.resolve({ message: 'Not found' })
|
|
108
126
|
});
|
|
109
127
|
const result = await restFetch('https://api.example.com');
|
|
110
128
|
expect(result).toEqual({
|
|
111
129
|
data: null,
|
|
112
|
-
error: { message: 'Not found' }
|
|
130
|
+
error: { message: 'Not found' }
|
|
113
131
|
});
|
|
114
132
|
});
|
|
115
133
|
it('should handle text error response', async () => {
|
|
116
134
|
mockFetch.mockResolvedValue({
|
|
117
135
|
ok: false,
|
|
118
136
|
headers: new Headers({ 'content-type': 'text/plain' }),
|
|
119
|
-
text: () => Promise.resolve('Server error')
|
|
137
|
+
text: () => Promise.resolve('Server error')
|
|
120
138
|
});
|
|
121
139
|
const result = await restFetch('https://api.example.com');
|
|
122
140
|
expect(result).toEqual({
|
|
123
141
|
data: null,
|
|
124
|
-
error: 'Server error'
|
|
142
|
+
error: 'Server error'
|
|
125
143
|
});
|
|
126
144
|
});
|
|
127
145
|
it('should handle text success response', async () => {
|
|
128
146
|
mockFetch.mockResolvedValue({
|
|
129
147
|
ok: true,
|
|
130
148
|
headers: new Headers({ 'content-type': 'text/plain' }),
|
|
131
|
-
text: () => Promise.resolve('Success message')
|
|
149
|
+
text: () => Promise.resolve('Success message')
|
|
132
150
|
});
|
|
133
151
|
const result = await restFetch('https://api.example.com');
|
|
134
152
|
expect(result).toEqual({
|
|
135
153
|
data: 'Success message',
|
|
136
|
-
error: null
|
|
154
|
+
error: null
|
|
137
155
|
});
|
|
138
156
|
});
|
|
139
157
|
it('should use custom fetch function', async () => {
|
|
140
158
|
const customFetch = vi.fn().mockResolvedValue({
|
|
141
159
|
ok: true,
|
|
142
160
|
headers: new Headers({ 'content-type': 'application/json' }),
|
|
143
|
-
json: () => Promise.resolve({ custom: true })
|
|
161
|
+
json: () => Promise.resolve({ custom: true })
|
|
144
162
|
});
|
|
145
163
|
await restFetch('https://api.example.com', {
|
|
146
|
-
global: { fetch: customFetch }
|
|
164
|
+
global: { fetch: customFetch }
|
|
147
165
|
});
|
|
148
166
|
expect(customFetch).toHaveBeenCalled();
|
|
149
167
|
expect(mockFetch).not.toHaveBeenCalled();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-fetch.test.js","sourceRoot":"","sources":["../src/rest-fetch.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,IAAI,SAAiD,CAAC;IAEtD,UAAU,CAAC,GAAG,EAAE;QACZ,SAAS,GAAG,EAAE,CAAC,EAAE,EAAgB,CAAC;QAClC,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC1D,SAAS,CAAC,iBAAiB,CAAC;YACxB,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI,OAAO,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;YAC5D,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SACrC,CAAC,CAAC;QAEf,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,yBAAyB,CAAC,CAAC;QAE1D,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,yBAAyB,EAAE;YAC9D,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB
|
|
1
|
+
{"version":3,"file":"rest-fetch.test.js","sourceRoot":"","sources":["../src/rest-fetch.test.ts"],"names":[],"mappings":"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"}
|