firebase-admin-edge 1.0.12 → 1.0.14
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 +1 -1
- 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.js +5 -5
- package/dist/auth/google-oauth.js +16 -16
- package/dist/auth/google-oauth.test.js +15 -15
- package/dist/auth/google-oauth.test.js.map +1 -1
- package/dist/firebase-edge-server.d.ts +1 -18
- package/dist/firebase-edge-server.d.ts.map +1 -1
- package/dist/firebase-edge-server.js +32 -33
- package/dist/firebase-edge-server.js.map +1 -1
- package/dist/firebase-edge-server.test.js +21 -21
- 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,15 +1,15 @@
|
|
|
1
1
|
import { FirebaseAdminAuth } from './auth/firebase-admin-auth.js';
|
|
2
2
|
import { FirebaseAuth } from './auth/firebase-auth.js';
|
|
3
3
|
import { signJWTCustomToken } from './auth/firebase-jwt.js';
|
|
4
|
-
import { createGitHubOAuthLoginUrl, exchangeCodeForGitHubIdToken
|
|
5
|
-
import { createGoogleOAuthLoginUrl, exchangeCodeForGoogleIdToken
|
|
4
|
+
import { createGitHubOAuthLoginUrl, exchangeCodeForGitHubIdToken } from './auth/github-oauth.js';
|
|
5
|
+
import { createGoogleOAuthLoginUrl, exchangeCodeForGoogleIdToken } from './auth/google-oauth.js';
|
|
6
6
|
const DEFAULT_SESSION_NAME = '__session';
|
|
7
7
|
const COOKIE_OPTIONS = {
|
|
8
8
|
httpOnly: true,
|
|
9
9
|
secure: true,
|
|
10
10
|
sameSite: 'lax',
|
|
11
11
|
path: '/',
|
|
12
|
-
maxAge: 60 * 60 * 24 * 5 * 1000
|
|
12
|
+
maxAge: 60 * 60 * 24 * 5 * 1000
|
|
13
13
|
};
|
|
14
14
|
/**
|
|
15
15
|
* Official Firebase OAuth providers
|
|
@@ -22,7 +22,7 @@ export const OFFICIAL_FIREBASE_OAUTH_PROVIDERS = [
|
|
|
22
22
|
'github',
|
|
23
23
|
'microsoft',
|
|
24
24
|
'yahoo',
|
|
25
|
-
'playgames'
|
|
25
|
+
'playgames'
|
|
26
26
|
];
|
|
27
27
|
/**
|
|
28
28
|
* Creates a Firebase Edge Server for authentication and session management in edge environments.
|
|
@@ -35,7 +35,7 @@ export const OFFICIAL_FIREBASE_OAUTH_PROVIDERS = [
|
|
|
35
35
|
* @param config.fetch Optional custom fetch implementation
|
|
36
36
|
* @returns Object with authentication methods
|
|
37
37
|
*/
|
|
38
|
-
export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, providers, cookies, fetch
|
|
38
|
+
export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, providers, cookies, fetch }) {
|
|
39
39
|
const sessionName = cookies.sessionName || DEFAULT_SESSION_NAME;
|
|
40
40
|
const getSession = cookies.getSession;
|
|
41
41
|
const saveSession = cookies.saveSession;
|
|
@@ -49,7 +49,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
49
49
|
function deleteSession() {
|
|
50
50
|
saveSession(sessionName, '', {
|
|
51
51
|
...COOKIE_OPTIONS,
|
|
52
|
-
maxAge: 0
|
|
52
|
+
maxAge: 0
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
/**
|
|
@@ -71,7 +71,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
71
71
|
if (!sessionCookie) {
|
|
72
72
|
return {
|
|
73
73
|
data: null,
|
|
74
|
-
error: null
|
|
74
|
+
error: null
|
|
75
75
|
};
|
|
76
76
|
}
|
|
77
77
|
const { data: decodedToken, error: verifyError } = await adminAuth.verifySessionCookie(sessionCookie, checkRevoked);
|
|
@@ -79,19 +79,19 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
79
79
|
deleteSession();
|
|
80
80
|
return {
|
|
81
81
|
data: null,
|
|
82
|
-
error: verifyError
|
|
82
|
+
error: verifyError
|
|
83
83
|
};
|
|
84
84
|
}
|
|
85
85
|
if (!decodedToken) {
|
|
86
86
|
deleteSession();
|
|
87
87
|
return {
|
|
88
88
|
data: null,
|
|
89
|
-
error: null
|
|
89
|
+
error: null
|
|
90
90
|
};
|
|
91
91
|
}
|
|
92
92
|
return {
|
|
93
93
|
data: decodedToken,
|
|
94
|
-
error: null
|
|
94
|
+
error: null
|
|
95
95
|
};
|
|
96
96
|
}
|
|
97
97
|
/**
|
|
@@ -138,7 +138,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
138
138
|
const provider = state ? JSON.parse(state).provider : null;
|
|
139
139
|
if (!provider) {
|
|
140
140
|
return {
|
|
141
|
-
error: new Error('No provider specified in state')
|
|
141
|
+
error: new Error('No provider specified in state')
|
|
142
142
|
};
|
|
143
143
|
}
|
|
144
144
|
let oauthToken = null;
|
|
@@ -147,12 +147,12 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
147
147
|
const { data: googleData, error: exchangeError } = await exchangeCodeForGoogleIdToken(code, redirect_uri, client_id, client_secret, fetchImpl);
|
|
148
148
|
if (exchangeError) {
|
|
149
149
|
return {
|
|
150
|
-
error: exchangeError
|
|
150
|
+
error: exchangeError
|
|
151
151
|
};
|
|
152
152
|
}
|
|
153
153
|
if (!googleData) {
|
|
154
154
|
return {
|
|
155
|
-
error: new Error('No exchange data!')
|
|
155
|
+
error: new Error('No exchange data!')
|
|
156
156
|
};
|
|
157
157
|
}
|
|
158
158
|
oauthToken = googleData.id_token;
|
|
@@ -162,50 +162,49 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
162
162
|
const { data: githubData, error: exchangeError } = await exchangeCodeForGitHubIdToken(code, redirect_uri, client_id, client_secret, fetchImpl);
|
|
163
163
|
if (exchangeError) {
|
|
164
164
|
return {
|
|
165
|
-
error: exchangeError
|
|
165
|
+
error: exchangeError
|
|
166
166
|
};
|
|
167
167
|
}
|
|
168
168
|
if (!githubData) {
|
|
169
169
|
return {
|
|
170
|
-
error: new Error('No exchange data!')
|
|
170
|
+
error: new Error('No exchange data!')
|
|
171
171
|
};
|
|
172
172
|
}
|
|
173
173
|
oauthToken = githubData.access_token;
|
|
174
174
|
}
|
|
175
175
|
if (!oauthToken) {
|
|
176
176
|
return {
|
|
177
|
-
error: new Error('No OAuth token obtained')
|
|
177
|
+
error: new Error('No OAuth token obtained')
|
|
178
178
|
};
|
|
179
179
|
}
|
|
180
|
-
const
|
|
180
|
+
const providerId = provider === 'google' ? 'google.com' : 'github.com';
|
|
181
|
+
const { data: signInData, error: signInError } = await auth.signInWithProvider(oauthToken, redirect_uri, providerId);
|
|
181
182
|
if (signInError) {
|
|
182
183
|
return {
|
|
183
|
-
|
|
184
|
-
error: signInError,
|
|
184
|
+
error: signInError
|
|
185
185
|
};
|
|
186
186
|
}
|
|
187
187
|
if (!signInData) {
|
|
188
188
|
return {
|
|
189
|
-
|
|
190
|
-
error: null,
|
|
189
|
+
error: null
|
|
191
190
|
};
|
|
192
191
|
}
|
|
193
192
|
const { data: sessionCookie, error: sessionError } = await adminAuth.createSessionCookie(signInData.idToken, {
|
|
194
|
-
expiresIn: 60 * 60 * 24 * 5 * 1000
|
|
193
|
+
expiresIn: 60 * 60 * 24 * 5 * 1000
|
|
195
194
|
});
|
|
196
195
|
if (sessionError) {
|
|
197
196
|
return {
|
|
198
|
-
error: sessionError
|
|
197
|
+
error: sessionError
|
|
199
198
|
};
|
|
200
199
|
}
|
|
201
200
|
if (!sessionCookie) {
|
|
202
201
|
return {
|
|
203
|
-
error: new Error('No session cookie returned')
|
|
202
|
+
error: new Error('No session cookie returned')
|
|
204
203
|
};
|
|
205
204
|
}
|
|
206
205
|
saveSession(sessionName, sessionCookie, COOKIE_OPTIONS);
|
|
207
206
|
return {
|
|
208
|
-
error: null
|
|
207
|
+
error: null
|
|
209
208
|
};
|
|
210
209
|
}
|
|
211
210
|
/**
|
|
@@ -218,44 +217,44 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
218
217
|
if (verifyError) {
|
|
219
218
|
return {
|
|
220
219
|
data: null,
|
|
221
|
-
error: verifyError
|
|
220
|
+
error: verifyError
|
|
222
221
|
};
|
|
223
222
|
}
|
|
224
223
|
if (!verifiedToken) {
|
|
225
224
|
return {
|
|
226
225
|
data: null,
|
|
227
|
-
error: null
|
|
226
|
+
error: null
|
|
228
227
|
};
|
|
229
228
|
}
|
|
230
229
|
const { data: signJWTData, error: signJWTError } = await signJWTCustomToken(verifiedToken.sub, serviceAccount);
|
|
231
230
|
if (signJWTError) {
|
|
232
231
|
return {
|
|
233
232
|
data: null,
|
|
234
|
-
error: signJWTError
|
|
233
|
+
error: signJWTError
|
|
235
234
|
};
|
|
236
235
|
}
|
|
237
236
|
if (!signJWTData) {
|
|
238
237
|
return {
|
|
239
238
|
data: null,
|
|
240
|
-
error: new Error('No custom token signed')
|
|
239
|
+
error: new Error('No custom token signed')
|
|
241
240
|
};
|
|
242
241
|
}
|
|
243
242
|
const { data: signInData, error: signInError } = await auth.signInWithCustomToken(signJWTData);
|
|
244
243
|
if (signInError) {
|
|
245
244
|
return {
|
|
246
245
|
data: null,
|
|
247
|
-
error: signInError
|
|
246
|
+
error: signInError
|
|
248
247
|
};
|
|
249
248
|
}
|
|
250
249
|
if (!signInData) {
|
|
251
250
|
return {
|
|
252
251
|
data: null,
|
|
253
|
-
error: null
|
|
252
|
+
error: null
|
|
254
253
|
};
|
|
255
254
|
}
|
|
256
255
|
return {
|
|
257
256
|
data: signInData,
|
|
258
|
-
error: null
|
|
257
|
+
error: null
|
|
259
258
|
};
|
|
260
259
|
}
|
|
261
260
|
return {
|
|
@@ -266,7 +265,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
266
265
|
getGoogleLoginURL,
|
|
267
266
|
getGitHubLoginURL,
|
|
268
267
|
signInWithCode,
|
|
269
|
-
getToken
|
|
268
|
+
getToken
|
|
270
269
|
};
|
|
271
270
|
}
|
|
272
271
|
//# sourceMappingURL=firebase-edge-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase-edge-server.js","sourceRoot":"","sources":["../src/firebase-edge-server.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EACH,yBAAyB,EACzB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"firebase-edge-server.js","sourceRoot":"","sources":["../src/firebase-edge-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
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');
|
|
@@ -16,7 +16,7 @@ const mockServiceAccount = {
|
|
|
16
16
|
auth_uri: 'https://accounts.google.com/o/oauth2/auth',
|
|
17
17
|
token_uri: 'https://oauth2.googleapis.com/token',
|
|
18
18
|
auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
|
|
19
|
-
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'
|
|
20
20
|
};
|
|
21
21
|
const mockFirebaseConfig = {
|
|
22
22
|
apiKey: 'test-api-key',
|
|
@@ -24,17 +24,17 @@ const mockFirebaseConfig = {
|
|
|
24
24
|
projectId: 'test-project',
|
|
25
25
|
storageBucket: 'test-project.appspot.com',
|
|
26
26
|
messagingSenderId: '123456789',
|
|
27
|
-
appId: 'test-app-id'
|
|
27
|
+
appId: 'test-app-id'
|
|
28
28
|
};
|
|
29
29
|
const mockProviders = {
|
|
30
30
|
google: {
|
|
31
31
|
client_id: 'google-client-id',
|
|
32
|
-
client_secret: 'google-client-secret'
|
|
32
|
+
client_secret: 'google-client-secret'
|
|
33
33
|
},
|
|
34
34
|
github: {
|
|
35
35
|
client_id: 'github-client-id',
|
|
36
|
-
client_secret: 'github-client-secret'
|
|
37
|
-
}
|
|
36
|
+
client_secret: 'github-client-secret'
|
|
37
|
+
}
|
|
38
38
|
};
|
|
39
39
|
describe('createFirebaseEdgeServer', () => {
|
|
40
40
|
let mockGetSession;
|
|
@@ -50,8 +50,8 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
50
50
|
providers: mockProviders,
|
|
51
51
|
cookies: {
|
|
52
52
|
getSession: mockGetSession,
|
|
53
|
-
saveSession: mockSaveSession
|
|
54
|
-
}
|
|
53
|
+
saveSession: mockSaveSession
|
|
54
|
+
}
|
|
55
55
|
});
|
|
56
56
|
});
|
|
57
57
|
describe('factory function', () => {
|
|
@@ -73,8 +73,8 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
73
73
|
cookies: {
|
|
74
74
|
getSession: mockGetSession,
|
|
75
75
|
saveSession: mockSaveSession,
|
|
76
|
-
sessionName: 'custom-session'
|
|
77
|
-
}
|
|
76
|
+
sessionName: 'custom-session'
|
|
77
|
+
}
|
|
78
78
|
});
|
|
79
79
|
customServer.signOut();
|
|
80
80
|
expect(mockSaveSession).toHaveBeenCalledWith('custom-session', '', expect.objectContaining({ maxAge: 0 }));
|
|
@@ -91,9 +91,9 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
91
91
|
providers: mockProviders,
|
|
92
92
|
cookies: {
|
|
93
93
|
getSession: mockGetSession,
|
|
94
|
-
saveSession: mockSaveSession
|
|
94
|
+
saveSession: mockSaveSession
|
|
95
95
|
},
|
|
96
|
-
fetch: mockFetch
|
|
96
|
+
fetch: mockFetch
|
|
97
97
|
});
|
|
98
98
|
expect(customServer).toBeDefined();
|
|
99
99
|
});
|
|
@@ -106,7 +106,7 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
106
106
|
secure: true,
|
|
107
107
|
sameSite: 'lax',
|
|
108
108
|
path: '/',
|
|
109
|
-
maxAge: 0
|
|
109
|
+
maxAge: 0
|
|
110
110
|
});
|
|
111
111
|
});
|
|
112
112
|
});
|
|
@@ -116,7 +116,7 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
116
116
|
const result = await server.getUser();
|
|
117
117
|
expect(result).toEqual({
|
|
118
118
|
data: null,
|
|
119
|
-
error: null
|
|
119
|
+
error: null
|
|
120
120
|
});
|
|
121
121
|
expect(mockGetSession).toHaveBeenCalledWith('__session');
|
|
122
122
|
});
|
|
@@ -129,8 +129,8 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
129
129
|
providers: {},
|
|
130
130
|
cookies: {
|
|
131
131
|
getSession: mockGetSession,
|
|
132
|
-
saveSession: mockSaveSession
|
|
133
|
-
}
|
|
132
|
+
saveSession: mockSaveSession
|
|
133
|
+
}
|
|
134
134
|
});
|
|
135
135
|
await expect(serverWithoutGoogle.getGoogleLoginURL('http://localhost', '/dashboard')).rejects.toThrow('Google provider not configured');
|
|
136
136
|
});
|
|
@@ -149,8 +149,8 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
149
149
|
providers: {},
|
|
150
150
|
cookies: {
|
|
151
151
|
getSession: mockGetSession,
|
|
152
|
-
saveSession: mockSaveSession
|
|
153
|
-
}
|
|
152
|
+
saveSession: mockSaveSession
|
|
153
|
+
}
|
|
154
154
|
});
|
|
155
155
|
await expect(serverWithoutGitHub.getGitHubLoginURL('http://localhost', '/dashboard')).rejects.toThrow('GitHub provider not configured');
|
|
156
156
|
});
|
|
@@ -165,7 +165,7 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
165
165
|
it('returns error when no provider specified in state', async () => {
|
|
166
166
|
const result = await server.signInWithCode('auth-code', 'http://localhost', null);
|
|
167
167
|
expect(result).toEqual({
|
|
168
|
-
error: expect.any(Error)
|
|
168
|
+
error: expect.any(Error)
|
|
169
169
|
});
|
|
170
170
|
expect(result.error).toBeInstanceOf(Error);
|
|
171
171
|
expect(result.error.message).toBe('No provider specified in state');
|
|
@@ -181,7 +181,7 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
181
181
|
const result = await server.getToken();
|
|
182
182
|
expect(result).toEqual({
|
|
183
183
|
data: null,
|
|
184
|
-
error: null
|
|
184
|
+
error: null
|
|
185
185
|
});
|
|
186
186
|
});
|
|
187
187
|
});
|
|
@@ -195,7 +195,7 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
195
195
|
'github',
|
|
196
196
|
'microsoft',
|
|
197
197
|
'yahoo',
|
|
198
|
-
'playgames'
|
|
198
|
+
'playgames'
|
|
199
199
|
]);
|
|
200
200
|
});
|
|
201
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"}
|