firebase-admin-edge 1.0.17 → 1.0.19
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 +28 -0
- package/dist/auth/auth-endpoint-errors.d.ts +15 -0
- package/dist/auth/auth-endpoint-errors.d.ts.map +1 -0
- package/dist/auth/auth-endpoint-errors.js +120 -0
- package/dist/auth/auth-endpoint-errors.js.map +1 -0
- package/dist/auth/auth-error-codes.d.ts +777 -0
- package/dist/auth/auth-error-codes.d.ts.map +1 -0
- package/dist/auth/auth-error-codes.js +823 -0
- package/dist/auth/auth-error-codes.js.map +1 -0
- package/dist/auth/errors.d.ts +20 -0
- package/dist/auth/errors.d.ts.map +1 -0
- package/dist/auth/errors.js +29 -0
- package/dist/auth/errors.js.map +1 -0
- package/dist/auth/firebase-admin-auth.d.ts +6 -45
- package/dist/auth/firebase-admin-auth.d.ts.map +1 -1
- package/dist/auth/firebase-admin-auth.js +17 -39
- package/dist/auth/firebase-admin-auth.js.map +1 -1
- package/dist/auth/firebase-admin-auth.test.js +38 -54
- package/dist/auth/firebase-admin-auth.test.js.map +1 -1
- package/dist/auth/firebase-auth-endpoints.d.ts +9 -72
- package/dist/auth/firebase-auth-endpoints.d.ts.map +1 -1
- package/dist/auth/firebase-auth-endpoints.js +10 -8
- package/dist/auth/firebase-auth-endpoints.js.map +1 -1
- package/dist/auth/firebase-auth-endpoints.test.js +13 -4
- package/dist/auth/firebase-auth-endpoints.test.js.map +1 -1
- package/dist/auth/firebase-auth.d.ts +3 -24
- package/dist/auth/firebase-auth.d.ts.map +1 -1
- package/dist/auth/firebase-auth.js +58 -20
- package/dist/auth/firebase-auth.js.map +1 -1
- package/dist/auth/firebase-auth.test.js +26 -9
- package/dist/auth/firebase-auth.test.js.map +1 -1
- package/dist/auth/firebase-jwt.d.ts +5 -29
- package/dist/auth/firebase-jwt.d.ts.map +1 -1
- package/dist/auth/firebase-jwt.js +74 -27
- package/dist/auth/firebase-jwt.js.map +1 -1
- package/dist/auth/firebase-jwt.test.js +31 -11
- package/dist/auth/firebase-jwt.test.js.map +1 -1
- package/dist/auth/firebase-types.d.ts +12 -8
- package/dist/auth/firebase-types.d.ts.map +1 -1
- package/dist/auth/github-oauth.d.ts +5 -2
- package/dist/auth/github-oauth.d.ts.map +1 -1
- package/dist/auth/github-oauth.js +126 -13
- package/dist/auth/github-oauth.js.map +1 -1
- package/dist/auth/github-oauth.test.d.ts +2 -0
- package/dist/auth/github-oauth.test.d.ts.map +1 -0
- package/dist/auth/github-oauth.test.js +202 -0
- package/dist/auth/github-oauth.test.js.map +1 -0
- package/dist/auth/google-oauth.d.ts +7 -22
- package/dist/auth/google-oauth.d.ts.map +1 -1
- package/dist/auth/google-oauth.js +103 -40
- package/dist/auth/google-oauth.js.map +1 -1
- package/dist/auth/google-oauth.test.js +107 -32
- package/dist/auth/google-oauth.test.js.map +1 -1
- package/dist/auth/oauth.d.ts +3 -0
- package/dist/auth/oauth.d.ts.map +1 -0
- package/dist/auth/oauth.js +28 -0
- package/dist/auth/oauth.js.map +1 -0
- package/dist/auth/oauth.test.d.ts +2 -0
- package/dist/auth/oauth.test.d.ts.map +1 -0
- package/dist/auth/oauth.test.js +233 -0
- package/dist/auth/oauth.test.js.map +1 -0
- package/dist/firebase-edge-errors.d.ts +95 -0
- package/dist/firebase-edge-errors.d.ts.map +1 -0
- package/dist/firebase-edge-errors.js +102 -0
- package/dist/firebase-edge-errors.js.map +1 -0
- package/dist/firebase-edge-errors.test.d.ts +2 -0
- package/dist/firebase-edge-errors.test.d.ts.map +1 -0
- package/dist/firebase-edge-errors.test.js +72 -0
- package/dist/firebase-edge-errors.test.js.map +1 -0
- package/dist/firebase-edge-server.d.ts +4 -35
- package/dist/firebase-edge-server.d.ts.map +1 -1
- package/dist/firebase-edge-server.js +29 -12
- package/dist/firebase-edge-server.js.map +1 -1
- package/dist/firebase-edge-server.test.js +10 -7
- package/dist/firebase-edge-server.test.js.map +1 -1
- package/dist/rest-fetch.js +4 -5
- package/dist/rest-fetch.js.map +1 -1
- package/dist/rest-fetch.test.js +0 -6
- package/dist/rest-fetch.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
export const FirebaseEdgeServerErrorInfo = {
|
|
2
|
+
// Provider Configuration Errors
|
|
3
|
+
EDGE_PROVIDER_NOT_CONFIGURED: {
|
|
4
|
+
message: 'OAuth provider not configured for this edge server instance.',
|
|
5
|
+
code: 'edge/provider-not-configured'
|
|
6
|
+
},
|
|
7
|
+
EDGE_GOOGLE_PROVIDER_NOT_CONFIGURED: {
|
|
8
|
+
message: 'Google provider not configured.',
|
|
9
|
+
code: 'edge/google-provider-not-configured'
|
|
10
|
+
},
|
|
11
|
+
EDGE_GITHUB_PROVIDER_NOT_CONFIGURED: {
|
|
12
|
+
message: 'GitHub provider not configured.',
|
|
13
|
+
code: 'edge/github-provider-not-configured'
|
|
14
|
+
},
|
|
15
|
+
// OAuth Flow Errors
|
|
16
|
+
EDGE_NO_PROVIDER_IN_STATE: {
|
|
17
|
+
message: 'No provider specified in state.',
|
|
18
|
+
code: 'edge/no-provider-in-state'
|
|
19
|
+
},
|
|
20
|
+
EDGE_INVALID_STATE_FORMAT: {
|
|
21
|
+
message: 'OAuth state parameter has invalid format.',
|
|
22
|
+
code: 'edge/invalid-state-format'
|
|
23
|
+
},
|
|
24
|
+
EDGE_NO_OAUTH_TOKEN: {
|
|
25
|
+
message: 'No OAuth token obtained from provider.',
|
|
26
|
+
code: 'edge/no-oauth-token'
|
|
27
|
+
},
|
|
28
|
+
EDGE_NO_EXCHANGE_DATA: {
|
|
29
|
+
message: 'No exchange data returned from OAuth provider.',
|
|
30
|
+
code: 'edge/no-exchange-data'
|
|
31
|
+
},
|
|
32
|
+
EDGE_NO_SIGN_IN_DATA: {
|
|
33
|
+
message: 'No sign-in data obtained from authentication.',
|
|
34
|
+
code: 'edge/no-sign-in-data'
|
|
35
|
+
},
|
|
36
|
+
// Token and Session Errors
|
|
37
|
+
EDGE_NO_ID_TOKEN: {
|
|
38
|
+
message: 'No ID token obtained from sign-in.',
|
|
39
|
+
code: 'edge/no-id-token'
|
|
40
|
+
},
|
|
41
|
+
EDGE_NO_SESSION_COOKIE: {
|
|
42
|
+
message: 'No session cookie returned from authentication.',
|
|
43
|
+
code: 'edge/no-session-cookie'
|
|
44
|
+
},
|
|
45
|
+
EDGE_NO_CUSTOM_TOKEN_SIGNED: {
|
|
46
|
+
message: 'No custom token signed for user.',
|
|
47
|
+
code: 'edge/no-custom-token-signed'
|
|
48
|
+
},
|
|
49
|
+
EDGE_ACCOUNT_EXISTS_DIFFERENT_METHOD: {
|
|
50
|
+
message: 'Account exists with a different sign-in method.',
|
|
51
|
+
code: 'edge/account-exists-different-method'
|
|
52
|
+
},
|
|
53
|
+
// Session Management Errors
|
|
54
|
+
EDGE_SESSION_EXPIRED: {
|
|
55
|
+
message: 'Edge server session has expired.',
|
|
56
|
+
code: 'edge/session-expired'
|
|
57
|
+
},
|
|
58
|
+
EDGE_SESSION_INVALID: {
|
|
59
|
+
message: 'Edge server session is invalid.',
|
|
60
|
+
code: 'edge/session-invalid'
|
|
61
|
+
},
|
|
62
|
+
EDGE_SESSION_REVOKED: {
|
|
63
|
+
message: 'Edge server session has been revoked.',
|
|
64
|
+
code: 'edge/session-revoked'
|
|
65
|
+
},
|
|
66
|
+
// Configuration Errors
|
|
67
|
+
EDGE_SERVICE_ACCOUNT_MISSING: {
|
|
68
|
+
message: 'Service account configuration is required for edge server.',
|
|
69
|
+
code: 'edge/service-account-missing'
|
|
70
|
+
},
|
|
71
|
+
EDGE_FIREBASE_CONFIG_MISSING: {
|
|
72
|
+
message: 'Firebase configuration is required for edge server.',
|
|
73
|
+
code: 'edge/firebase-config-missing'
|
|
74
|
+
},
|
|
75
|
+
EDGE_COOKIE_FUNCTIONS_MISSING: {
|
|
76
|
+
message: 'Cookie management functions are required for edge server.',
|
|
77
|
+
code: 'edge/cookie-functions-missing'
|
|
78
|
+
},
|
|
79
|
+
// Runtime Environment Errors
|
|
80
|
+
EDGE_FETCH_NOT_AVAILABLE: {
|
|
81
|
+
message: 'Fetch function not available in edge environment.',
|
|
82
|
+
code: 'edge/fetch-not-available'
|
|
83
|
+
},
|
|
84
|
+
EDGE_ENVIRONMENT_NOT_SUPPORTED: {
|
|
85
|
+
message: 'Current environment is not supported for edge server.',
|
|
86
|
+
code: 'edge/environment-not-supported'
|
|
87
|
+
},
|
|
88
|
+
// Generic Edge Server Errors
|
|
89
|
+
EDGE_SERVER_INITIALIZATION_FAILED: {
|
|
90
|
+
message: 'Firebase edge server initialization failed.',
|
|
91
|
+
code: 'edge/server-initialization-failed'
|
|
92
|
+
},
|
|
93
|
+
EDGE_OPERATION_FAILED: {
|
|
94
|
+
message: 'Edge server operation failed.',
|
|
95
|
+
code: 'edge/operation-failed'
|
|
96
|
+
},
|
|
97
|
+
EDGE_UNKNOWN_ERROR: {
|
|
98
|
+
message: 'An unknown error occurred in Firebase edge server.',
|
|
99
|
+
code: 'edge/unknown-error'
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
//# sourceMappingURL=firebase-edge-errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"firebase-edge-errors.js","sourceRoot":"","sources":["../src/firebase-edge-errors.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,gCAAgC;IAChC,4BAA4B,EAAE;QAC1B,OAAO,EAAE,8DAA8D;QACvE,IAAI,EAAE,8BAA8B;KACvC;IACD,mCAAmC,EAAE;QACjC,OAAO,EAAE,iCAAiC;QAC1C,IAAI,EAAE,qCAAqC;KAC9C;IACD,mCAAmC,EAAE;QACjC,OAAO,EAAE,iCAAiC;QAC1C,IAAI,EAAE,qCAAqC;KAC9C;IAED,oBAAoB;IACpB,yBAAyB,EAAE;QACvB,OAAO,EAAE,iCAAiC;QAC1C,IAAI,EAAE,2BAA2B;KACpC;IACD,yBAAyB,EAAE;QACvB,OAAO,EAAE,2CAA2C;QACpD,IAAI,EAAE,2BAA2B;KACpC;IACD,mBAAmB,EAAE;QACjB,OAAO,EAAE,wCAAwC;QACjD,IAAI,EAAE,qBAAqB;KAC9B;IACD,qBAAqB,EAAE;QACnB,OAAO,EAAE,gDAAgD;QACzD,IAAI,EAAE,uBAAuB;KAChC;IACD,oBAAoB,EAAE;QAClB,OAAO,EAAE,+CAA+C;QACxD,IAAI,EAAE,sBAAsB;KAC/B;IAED,2BAA2B;IAC3B,gBAAgB,EAAE;QACd,OAAO,EAAE,oCAAoC;QAC7C,IAAI,EAAE,kBAAkB;KAC3B;IACD,sBAAsB,EAAE;QACpB,OAAO,EAAE,iDAAiD;QAC1D,IAAI,EAAE,wBAAwB;KACjC;IACD,2BAA2B,EAAE;QACzB,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,6BAA6B;KACtC;IACD,oCAAoC,EAAE;QAClC,OAAO,EAAE,iDAAiD;QAC1D,IAAI,EAAE,sCAAsC;KAC/C;IAED,4BAA4B;IAC5B,oBAAoB,EAAE;QAClB,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,sBAAsB;KAC/B;IACD,oBAAoB,EAAE;QAClB,OAAO,EAAE,iCAAiC;QAC1C,IAAI,EAAE,sBAAsB;KAC/B;IACD,oBAAoB,EAAE;QAClB,OAAO,EAAE,uCAAuC;QAChD,IAAI,EAAE,sBAAsB;KAC/B;IAED,uBAAuB;IACvB,4BAA4B,EAAE;QAC1B,OAAO,EAAE,4DAA4D;QACrE,IAAI,EAAE,8BAA8B;KACvC;IACD,4BAA4B,EAAE;QAC1B,OAAO,EAAE,qDAAqD;QAC9D,IAAI,EAAE,8BAA8B;KACvC;IACD,6BAA6B,EAAE;QAC3B,OAAO,EAAE,2DAA2D;QACpE,IAAI,EAAE,+BAA+B;KACxC;IAED,6BAA6B;IAC7B,wBAAwB,EAAE;QACtB,OAAO,EAAE,mDAAmD;QAC5D,IAAI,EAAE,0BAA0B;KACnC;IACD,8BAA8B,EAAE;QAC5B,OAAO,EAAE,uDAAuD;QAChE,IAAI,EAAE,gCAAgC;KACzC;IAED,6BAA6B;IAC7B,iCAAiC,EAAE;QAC/B,OAAO,EAAE,6CAA6C;QACtD,IAAI,EAAE,mCAAmC;KAC5C;IACD,qBAAqB,EAAE;QACnB,OAAO,EAAE,+BAA+B;QACxC,IAAI,EAAE,uBAAuB;KAChC;IACD,kBAAkB,EAAE;QAChB,OAAO,EAAE,oDAAoD;QAC7D,IAAI,EAAE,oBAAoB;KAC7B;CACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"firebase-edge-errors.test.d.ts","sourceRoot":"","sources":["../src/firebase-edge-errors.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { FirebaseEdgeError } from './auth/errors.js';
|
|
3
|
+
import { FirebaseEdgeServerErrorInfo } from './firebase-edge-errors.js';
|
|
4
|
+
describe('firebase-edge-errors', () => {
|
|
5
|
+
describe('FirebaseEdgeServerErrorInfo', () => {
|
|
6
|
+
it('contains all required error definitions', () => {
|
|
7
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_PROVIDER_NOT_CONFIGURED).toBeDefined();
|
|
8
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_GOOGLE_PROVIDER_NOT_CONFIGURED).toBeDefined();
|
|
9
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_GITHUB_PROVIDER_NOT_CONFIGURED).toBeDefined();
|
|
10
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_NO_PROVIDER_IN_STATE).toBeDefined();
|
|
11
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_NO_OAUTH_TOKEN).toBeDefined();
|
|
12
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_NO_ID_TOKEN).toBeDefined();
|
|
13
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_NO_SESSION_COOKIE).toBeDefined();
|
|
14
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_NO_CUSTOM_TOKEN_SIGNED).toBeDefined();
|
|
15
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_SESSION_EXPIRED).toBeDefined();
|
|
16
|
+
expect(FirebaseEdgeServerErrorInfo.EDGE_ACCOUNT_EXISTS_DIFFERENT_METHOD).toBeDefined();
|
|
17
|
+
});
|
|
18
|
+
it('has proper error structure for provider configuration errors', () => {
|
|
19
|
+
const error = FirebaseEdgeServerErrorInfo.EDGE_GOOGLE_PROVIDER_NOT_CONFIGURED;
|
|
20
|
+
expect(error).toHaveProperty('code');
|
|
21
|
+
expect(error).toHaveProperty('message');
|
|
22
|
+
expect(error.code).toBe('edge/google-provider-not-configured');
|
|
23
|
+
expect(error.message).toContain('Google');
|
|
24
|
+
});
|
|
25
|
+
it('has proper error structure for OAuth flow errors', () => {
|
|
26
|
+
const error = FirebaseEdgeServerErrorInfo.EDGE_NO_OAUTH_TOKEN;
|
|
27
|
+
expect(error).toHaveProperty('code');
|
|
28
|
+
expect(error).toHaveProperty('message');
|
|
29
|
+
expect(error.code).toBe('edge/no-oauth-token');
|
|
30
|
+
expect(error.message).toContain('OAuth token');
|
|
31
|
+
});
|
|
32
|
+
it('has proper error structure for session management errors', () => {
|
|
33
|
+
const error = FirebaseEdgeServerErrorInfo.EDGE_SESSION_EXPIRED;
|
|
34
|
+
expect(error).toHaveProperty('code');
|
|
35
|
+
expect(error).toHaveProperty('message');
|
|
36
|
+
expect(error.code).toBe('edge/session-expired');
|
|
37
|
+
expect(error.message).toContain('session');
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
describe('FirebaseEdgeError with edge-specific errors', () => {
|
|
41
|
+
it('creates proper error instance with provider configuration error', () => {
|
|
42
|
+
const error = new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_GOOGLE_PROVIDER_NOT_CONFIGURED);
|
|
43
|
+
expect(error).toBeInstanceOf(FirebaseEdgeError);
|
|
44
|
+
expect(error).toBeInstanceOf(Error);
|
|
45
|
+
expect(error.code).toBe('edge/google-provider-not-configured');
|
|
46
|
+
expect(error.message).toContain('Google provider not configured');
|
|
47
|
+
});
|
|
48
|
+
it('creates proper error instance with OAuth flow error', () => {
|
|
49
|
+
const error = new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_OAUTH_TOKEN);
|
|
50
|
+
expect(error).toBeInstanceOf(FirebaseEdgeError);
|
|
51
|
+
expect(error).toBeInstanceOf(Error);
|
|
52
|
+
expect(error.code).toBe('edge/no-oauth-token');
|
|
53
|
+
expect(error.message).toContain('OAuth token obtained');
|
|
54
|
+
});
|
|
55
|
+
it('creates proper error instance with session management error', () => {
|
|
56
|
+
const error = new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_SESSION_EXPIRED);
|
|
57
|
+
expect(error).toBeInstanceOf(FirebaseEdgeError);
|
|
58
|
+
expect(error).toBeInstanceOf(Error);
|
|
59
|
+
expect(error.code).toBe('edge/session-expired');
|
|
60
|
+
expect(error.message).toContain('session has expired');
|
|
61
|
+
});
|
|
62
|
+
it('includes additional context when provided', () => {
|
|
63
|
+
const context = {
|
|
64
|
+
provider: 'google',
|
|
65
|
+
redirectUri: 'http://localhost'
|
|
66
|
+
};
|
|
67
|
+
const error = new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_GOOGLE_PROVIDER_NOT_CONFIGURED, { context });
|
|
68
|
+
expect(error.context).toEqual(context);
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
//# sourceMappingURL=firebase-edge-errors.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"firebase-edge-errors.test.js","sourceRoot":"","sources":["../src/firebase-edge-errors.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { GetSession, SetSession } from './auth/cookie-types.js';
|
|
|
2
2
|
import { FirebaseAdminAuth } from './auth/firebase-admin-auth.js';
|
|
3
3
|
import { FirebaseAuth } from './auth/firebase-auth.js';
|
|
4
4
|
import type { FirebaseConfig, ServiceAccount } from './auth/firebase-types.js';
|
|
5
|
+
import { FirebaseEdgeError } from './auth/errors.js';
|
|
5
6
|
/**
|
|
6
7
|
* Official Firebase OAuth providers
|
|
7
8
|
*/
|
|
@@ -42,17 +43,7 @@ export declare function createFirebaseEdgeServer({ serviceAccount, firebaseConfi
|
|
|
42
43
|
error: null;
|
|
43
44
|
} | {
|
|
44
45
|
data: null;
|
|
45
|
-
error:
|
|
46
|
-
code: number;
|
|
47
|
-
message: string;
|
|
48
|
-
errors?: {
|
|
49
|
-
message: string;
|
|
50
|
-
domain: string;
|
|
51
|
-
reason: string;
|
|
52
|
-
}[];
|
|
53
|
-
} | import("jose/errors").JOSEError | Error | {
|
|
54
|
-
message: string;
|
|
55
|
-
};
|
|
46
|
+
error: Error;
|
|
56
47
|
} | {
|
|
57
48
|
data: import("./auth/firebase-types.js").FirebaseIdTokenPayload;
|
|
58
49
|
error: null;
|
|
@@ -60,35 +51,13 @@ export declare function createFirebaseEdgeServer({ serviceAccount, firebaseConfi
|
|
|
60
51
|
getGoogleLoginURL: (redirect_uri: string, path: string) => Promise<string>;
|
|
61
52
|
getGitHubLoginURL: (redirect_uri: string, path: string) => Promise<string>;
|
|
62
53
|
signInWithCode: (code: string, redirect_uri: string, state?: string | null) => Promise<{
|
|
63
|
-
error:
|
|
54
|
+
error: FirebaseEdgeError;
|
|
64
55
|
} | {
|
|
65
56
|
error: null;
|
|
66
|
-
} | {
|
|
67
|
-
error: {
|
|
68
|
-
code: number;
|
|
69
|
-
message: string;
|
|
70
|
-
errors?: {
|
|
71
|
-
message: string;
|
|
72
|
-
domain: string;
|
|
73
|
-
reason: string;
|
|
74
|
-
}[];
|
|
75
|
-
} | import("jose/errors").JOSEError | Error | {
|
|
76
|
-
message: string;
|
|
77
|
-
};
|
|
78
57
|
}>;
|
|
79
58
|
getToken: () => Promise<{
|
|
80
59
|
data: null;
|
|
81
|
-
error:
|
|
82
|
-
code: number;
|
|
83
|
-
message: string;
|
|
84
|
-
errors?: {
|
|
85
|
-
message: string;
|
|
86
|
-
domain: string;
|
|
87
|
-
reason: string;
|
|
88
|
-
}[];
|
|
89
|
-
} | import("jose/errors").JOSEError | Error | {
|
|
90
|
-
message: string;
|
|
91
|
-
};
|
|
60
|
+
error: Error;
|
|
92
61
|
} | {
|
|
93
62
|
data: null;
|
|
94
63
|
error: null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase-edge-server.d.ts","sourceRoot":"","sources":["../src/firebase-edge-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,UAAU,EACV,UAAU,EACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"firebase-edge-server.d.ts","sourceRoot":"","sources":["../src/firebase-edge-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,UAAU,EACV,UAAU,EACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAO/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAarD;;GAEG;AACH,eAAO,MAAM,iCAAiC,kGASpC,CAAC;AAEX,KAAK,YAAY,GAAG,CAAC,OAAO,iCAAiC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvE,KAAK,cAAc,GAAG,OAAO,CACzB,MAAM,CACF,YAAY,EACZ;IACI,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACzB,CACJ,CACJ,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,EACrC,cAAc,EACd,cAAc,EACd,SAAS,EACT,OAAO,EACP,KAAK,EACR,EAAE;IACC,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACnC;;;;6BAoCwC,OAAO;;;;;;;;;;sCA6CG,MAAM,QAAQ,MAAM;sCAsBpB,MAAM,QAAQ,MAAM;2BAuBzD,MAAM,gBACE,MAAM,UACb,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;EA2N3B"}
|
|
@@ -1,8 +1,11 @@
|
|
|
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 {
|
|
5
|
-
import {
|
|
4
|
+
import { exchangeCodeForGitHubIdToken } from './auth/github-oauth.js';
|
|
5
|
+
import { exchangeCodeForGoogleIdToken } from './auth/google-oauth.js';
|
|
6
|
+
import { createGitHubOAuthLoginUrl, createGoogleOAuthLoginUrl } from './auth/oauth.js';
|
|
7
|
+
import { FirebaseEdgeError } from './auth/errors.js';
|
|
8
|
+
import { FirebaseEdgeServerErrorInfo } from './firebase-edge-errors.js';
|
|
6
9
|
const DEFAULT_SESSION_NAME = '__session';
|
|
7
10
|
const COOKIE_OPTIONS = {
|
|
8
11
|
httpOnly: true,
|
|
@@ -105,7 +108,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
105
108
|
async function getGoogleLoginURL(redirect_uri, path) {
|
|
106
109
|
deleteSession();
|
|
107
110
|
if (!providers.google) {
|
|
108
|
-
throw new
|
|
111
|
+
throw new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_GOOGLE_PROVIDER_NOT_CONFIGURED);
|
|
109
112
|
}
|
|
110
113
|
const { client_id } = providers.google;
|
|
111
114
|
return createGoogleOAuthLoginUrl(redirect_uri, path, client_id);
|
|
@@ -121,7 +124,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
121
124
|
async function getGitHubLoginURL(redirect_uri, path) {
|
|
122
125
|
deleteSession();
|
|
123
126
|
if (!providers.github) {
|
|
124
|
-
throw new
|
|
127
|
+
throw new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_GITHUB_PROVIDER_NOT_CONFIGURED);
|
|
125
128
|
}
|
|
126
129
|
const { client_id } = providers.github;
|
|
127
130
|
return createGitHubOAuthLoginUrl(redirect_uri, path, client_id);
|
|
@@ -138,7 +141,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
138
141
|
const provider = state ? JSON.parse(state).provider : null;
|
|
139
142
|
if (!provider) {
|
|
140
143
|
return {
|
|
141
|
-
error: new
|
|
144
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_PROVIDER_IN_STATE)
|
|
142
145
|
};
|
|
143
146
|
}
|
|
144
147
|
let oauthToken = null;
|
|
@@ -152,7 +155,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
152
155
|
}
|
|
153
156
|
if (!googleData) {
|
|
154
157
|
return {
|
|
155
|
-
error: new
|
|
158
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_EXCHANGE_DATA)
|
|
156
159
|
};
|
|
157
160
|
}
|
|
158
161
|
oauthToken = googleData.id_token;
|
|
@@ -167,14 +170,14 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
167
170
|
}
|
|
168
171
|
if (!githubData) {
|
|
169
172
|
return {
|
|
170
|
-
error: new
|
|
173
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_EXCHANGE_DATA)
|
|
171
174
|
};
|
|
172
175
|
}
|
|
173
176
|
oauthToken = githubData.access_token;
|
|
174
177
|
}
|
|
175
178
|
if (!oauthToken) {
|
|
176
179
|
return {
|
|
177
|
-
error: new
|
|
180
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_OAUTH_TOKEN)
|
|
178
181
|
};
|
|
179
182
|
}
|
|
180
183
|
const providerId = provider === 'google' ? 'google.com' : 'github.com';
|
|
@@ -186,10 +189,24 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
186
189
|
}
|
|
187
190
|
if (!signInData) {
|
|
188
191
|
return {
|
|
189
|
-
error:
|
|
192
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_SIGN_IN_DATA)
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
if (signInData.needConfirmation) {
|
|
196
|
+
return {
|
|
197
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_ACCOUNT_EXISTS_DIFFERENT_METHOD)
|
|
198
|
+
};
|
|
199
|
+
}
|
|
200
|
+
const idToken = signInData?.idToken ??
|
|
201
|
+
signInData?.oauthIdToken ??
|
|
202
|
+
signInData?.oauthAccessToken ??
|
|
203
|
+
null;
|
|
204
|
+
if (!idToken) {
|
|
205
|
+
return {
|
|
206
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_ID_TOKEN)
|
|
190
207
|
};
|
|
191
208
|
}
|
|
192
|
-
const { data: sessionCookie, error: sessionError } = await adminAuth.createSessionCookie(
|
|
209
|
+
const { data: sessionCookie, error: sessionError } = await adminAuth.createSessionCookie(idToken, {
|
|
193
210
|
expiresIn: 60 * 60 * 24 * 5 * 1000
|
|
194
211
|
});
|
|
195
212
|
if (sessionError) {
|
|
@@ -199,7 +216,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
199
216
|
}
|
|
200
217
|
if (!sessionCookie) {
|
|
201
218
|
return {
|
|
202
|
-
error: new
|
|
219
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_SESSION_COOKIE)
|
|
203
220
|
};
|
|
204
221
|
}
|
|
205
222
|
saveSession(sessionName, sessionCookie, COOKIE_OPTIONS);
|
|
@@ -236,7 +253,7 @@ export function createFirebaseEdgeServer({ serviceAccount, firebaseConfig, provi
|
|
|
236
253
|
if (!signJWTData) {
|
|
237
254
|
return {
|
|
238
255
|
data: null,
|
|
239
|
-
error: new
|
|
256
|
+
error: new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_NO_CUSTOM_TOKEN_SIGNED)
|
|
240
257
|
};
|
|
241
258
|
}
|
|
242
259
|
const { data: signInData, error: signInError } = await auth.signInWithCustomToken(signJWTData);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"firebase-edge-server.js","sourceRoot":"","sources":["../src/firebase-edge-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
2
|
import { createFirebaseEdgeServer, OFFICIAL_FIREBASE_OAUTH_PROVIDERS } from './firebase-edge-server.js';
|
|
3
|
+
import { FirebaseEdgeError } from './auth/errors.js';
|
|
4
|
+
import { FirebaseEdgeServerErrorInfo } from './firebase-edge-errors.js';
|
|
3
5
|
// Mock dependencies
|
|
4
6
|
vi.mock('./auth/firebase-admin-auth.js');
|
|
5
7
|
vi.mock('./auth/firebase-auth.js');
|
|
6
8
|
vi.mock('./auth/firebase-jwt.js');
|
|
9
|
+
vi.mock('./auth/oauth.js');
|
|
7
10
|
vi.mock('./auth/google-oauth.js');
|
|
8
11
|
vi.mock('./auth/github-oauth.js');
|
|
9
12
|
const mockServiceAccount = {
|
|
@@ -132,10 +135,10 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
132
135
|
saveSession: mockSaveSession
|
|
133
136
|
}
|
|
134
137
|
});
|
|
135
|
-
await expect(serverWithoutGoogle.getGoogleLoginURL('http://localhost', '/dashboard')).rejects.toThrow(
|
|
138
|
+
await expect(serverWithoutGoogle.getGoogleLoginURL('http://localhost', '/dashboard')).rejects.toThrow(new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_GOOGLE_PROVIDER_NOT_CONFIGURED));
|
|
136
139
|
});
|
|
137
140
|
it('calls deleteSession before generating URL', async () => {
|
|
138
|
-
const { createGoogleOAuthLoginUrl } = await import('./auth/
|
|
141
|
+
const { createGoogleOAuthLoginUrl } = await import('./auth/oauth.js');
|
|
139
142
|
vi.mocked(createGoogleOAuthLoginUrl).mockReturnValue('http://oauth-url');
|
|
140
143
|
await server.getGoogleLoginURL('http://localhost', '/dashboard');
|
|
141
144
|
expect(mockSaveSession).toHaveBeenCalledWith('__session', '', expect.objectContaining({ maxAge: 0 }));
|
|
@@ -152,10 +155,10 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
152
155
|
saveSession: mockSaveSession
|
|
153
156
|
}
|
|
154
157
|
});
|
|
155
|
-
await expect(serverWithoutGitHub.getGitHubLoginURL('http://localhost', '/dashboard')).rejects.toThrow(
|
|
158
|
+
await expect(serverWithoutGitHub.getGitHubLoginURL('http://localhost', '/dashboard')).rejects.toThrow(new FirebaseEdgeError(FirebaseEdgeServerErrorInfo.EDGE_GITHUB_PROVIDER_NOT_CONFIGURED));
|
|
156
159
|
});
|
|
157
160
|
it('calls deleteSession before generating URL', async () => {
|
|
158
|
-
const { createGitHubOAuthLoginUrl } = await import('./auth/
|
|
161
|
+
const { createGitHubOAuthLoginUrl } = await import('./auth/oauth.js');
|
|
159
162
|
vi.mocked(createGitHubOAuthLoginUrl).mockReturnValue('http://github-oauth-url');
|
|
160
163
|
await server.getGitHubLoginURL('http://localhost', '/dashboard');
|
|
161
164
|
expect(mockSaveSession).toHaveBeenCalledWith('__session', '', expect.objectContaining({ maxAge: 0 }));
|
|
@@ -165,10 +168,10 @@ describe('createFirebaseEdgeServer', () => {
|
|
|
165
168
|
it('returns error when no provider specified in state', async () => {
|
|
166
169
|
const result = await server.signInWithCode('auth-code', 'http://localhost', null);
|
|
167
170
|
expect(result).toEqual({
|
|
168
|
-
error: expect.any(
|
|
171
|
+
error: expect.any(FirebaseEdgeError)
|
|
169
172
|
});
|
|
170
|
-
expect(result.error).toBeInstanceOf(
|
|
171
|
-
expect(result.error.
|
|
173
|
+
expect(result.error).toBeInstanceOf(FirebaseEdgeError);
|
|
174
|
+
expect(result.error.code).toBe(FirebaseEdgeServerErrorInfo.EDGE_NO_PROVIDER_IN_STATE.code);
|
|
172
175
|
});
|
|
173
176
|
it('handles invalid JSON state gracefully', async () => {
|
|
174
177
|
// We expect this to throw during JSON.parse, which is the current behavior
|
|
@@ -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,EACpC,MAAM,2BAA2B,CAAC;
|
|
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.js
CHANGED
|
@@ -12,18 +12,17 @@ export const restFetch = async (url, options) => {
|
|
|
12
12
|
const res = await fetchFn(url + query, {
|
|
13
13
|
method: options?.method ?? 'POST',
|
|
14
14
|
headers: {
|
|
15
|
-
Accept:
|
|
15
|
+
...(acceptJson && { Accept: 'application/json' }),
|
|
16
16
|
'Content-Type': form
|
|
17
17
|
? 'application/x-www-form-urlencoded'
|
|
18
18
|
: 'application/json',
|
|
19
19
|
...bearerHeader,
|
|
20
20
|
...options?.headers
|
|
21
21
|
},
|
|
22
|
-
body: options?.body
|
|
23
|
-
|
|
22
|
+
body: options?.body &&
|
|
23
|
+
(form
|
|
24
24
|
? new URLSearchParams(options.body)
|
|
25
|
-
: JSON.stringify(options.body)
|
|
26
|
-
: undefined
|
|
25
|
+
: JSON.stringify(options.body))
|
|
27
26
|
});
|
|
28
27
|
if (PRINT_URL) {
|
|
29
28
|
console.log('restFetch', url + query);
|
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,OAWC,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,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,KAAK,CAAC;IAChD,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,
|
|
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,OAWC,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,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,KAAK,CAAC;IAChD,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,GAAG,CAAC,UAAU,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;YACjD,cAAc,EAAE,IAAI;gBAChB,CAAC,CAAC,mCAAmC;gBACrC,CAAC,CAAC,kBAAkB;YACxB,GAAG,YAAY;YACf,GAAG,OAAO,EAAE,OAAO;SACtB;QACD,IAAI,EACA,OAAO,EAAE,IAAI;YACb,CAAC,IAAI;gBACD,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,IAA8B,CAAC;gBAC7D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAC1C,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
|
@@ -16,7 +16,6 @@ describe('restFetch', () => {
|
|
|
16
16
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
17
17
|
method: 'POST',
|
|
18
18
|
headers: {
|
|
19
|
-
Accept: '*/*',
|
|
20
19
|
'Content-Type': 'application/json'
|
|
21
20
|
},
|
|
22
21
|
body: undefined
|
|
@@ -36,7 +35,6 @@ describe('restFetch', () => {
|
|
|
36
35
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com?search=query&limit=10', {
|
|
37
36
|
method: 'GET',
|
|
38
37
|
headers: {
|
|
39
|
-
Accept: '*/*',
|
|
40
38
|
'Content-Type': 'application/json'
|
|
41
39
|
},
|
|
42
40
|
body: undefined
|
|
@@ -55,7 +53,6 @@ describe('restFetch', () => {
|
|
|
55
53
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
56
54
|
method: 'POST',
|
|
57
55
|
headers: {
|
|
58
|
-
Accept: '*/*',
|
|
59
56
|
'Content-Type': 'application/json'
|
|
60
57
|
},
|
|
61
58
|
body: JSON.stringify({ name: 'test', value: 123 })
|
|
@@ -74,7 +71,6 @@ describe('restFetch', () => {
|
|
|
74
71
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
75
72
|
method: 'POST',
|
|
76
73
|
headers: {
|
|
77
|
-
Accept: '*/*',
|
|
78
74
|
'Content-Type': 'application/x-www-form-urlencoded'
|
|
79
75
|
},
|
|
80
76
|
body: expect.any(URLSearchParams)
|
|
@@ -92,7 +88,6 @@ describe('restFetch', () => {
|
|
|
92
88
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
93
89
|
method: 'POST',
|
|
94
90
|
headers: {
|
|
95
|
-
Accept: '*/*',
|
|
96
91
|
'Content-Type': 'application/json',
|
|
97
92
|
Authorization: 'Bearer abc123'
|
|
98
93
|
},
|
|
@@ -111,7 +106,6 @@ describe('restFetch', () => {
|
|
|
111
106
|
expect(mockFetch).toHaveBeenCalledWith('https://api.example.com', {
|
|
112
107
|
method: 'POST',
|
|
113
108
|
headers: {
|
|
114
|
-
Accept: '*/*',
|
|
115
109
|
'Content-Type': 'application/json',
|
|
116
110
|
'X-Custom': 'value'
|
|
117
111
|
},
|
|
@@ -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;gBACL,
|
|
1
|
+
{"version":3,"file":"rest-fetch.test.js","sourceRoot":"","sources":["../src/rest-fetch.test.ts"],"names":[],"mappings":"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"}
|