@superblocksteam/shared 0.9577.4 → 0.9578.1
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/dist/plugins/templates/shared/auth.d.ts +7 -2
- package/dist/plugins/templates/shared/auth.d.ts.map +1 -1
- package/dist/plugins/templates/shared/auth.js +10 -6
- package/dist/plugins/templates/shared/auth.js.map +1 -1
- package/dist/plugins/templates/shared/openapi.d.ts +1 -0
- package/dist/plugins/templates/shared/openapi.d.ts.map +1 -1
- package/dist/plugins/templates/shared/openapi.js +8 -1
- package/dist/plugins/templates/shared/openapi.js.map +1 -1
- package/dist/plugins/templates/snowflakecortex.d.ts.map +1 -1
- package/dist/plugins/templates/snowflakecortex.js +13 -1
- package/dist/plugins/templates/snowflakecortex.js.map +1 -1
- package/dist/types/billing/billing.d.ts +3 -0
- package/dist/types/billing/billing.d.ts.map +1 -1
- package/dist/types/billing/billing.js.map +1 -1
- package/dist/types/billing/freeCreditsTier.d.ts +12 -0
- package/dist/types/billing/freeCreditsTier.d.ts.map +1 -0
- package/dist/types/billing/freeCreditsTier.js +15 -0
- package/dist/types/billing/freeCreditsTier.js.map +1 -0
- package/dist/types/billing/freeCreditsTier.test.d.ts +2 -0
- package/dist/types/billing/freeCreditsTier.test.d.ts.map +1 -0
- package/dist/types/billing/freeCreditsTier.test.js +11 -0
- package/dist/types/billing/freeCreditsTier.test.js.map +1 -0
- package/dist/types/billing/index.d.ts +1 -0
- package/dist/types/billing/index.d.ts.map +1 -1
- package/dist/types/billing/index.js +1 -0
- package/dist/types/billing/index.js.map +1 -1
- package/dist/types/datasource/auth.d.ts.map +1 -1
- package/dist/types/datasource/auth.js +17 -2
- package/dist/types/datasource/auth.js.map +1 -1
- package/dist/types/datasource/auth.test.js +68 -0
- package/dist/types/datasource/auth.test.js.map +1 -1
- package/dist/types/deployment/deployQueueStatus.d.ts +9 -0
- package/dist/types/deployment/deployQueueStatus.d.ts.map +1 -0
- package/dist/types/deployment/deployQueueStatus.js +11 -0
- package/dist/types/deployment/deployQueueStatus.js.map +1 -0
- package/dist/types/deployment/index.d.ts +1 -0
- package/dist/types/deployment/index.d.ts.map +1 -1
- package/dist/types/deployment/index.js +3 -0
- package/dist/types/deployment/index.js.map +1 -1
- package/dist-esm/plugins/templates/shared/auth.d.ts +7 -2
- package/dist-esm/plugins/templates/shared/auth.d.ts.map +1 -1
- package/dist-esm/plugins/templates/shared/auth.js +10 -6
- package/dist-esm/plugins/templates/shared/auth.js.map +1 -1
- package/dist-esm/plugins/templates/shared/openapi.d.ts +1 -0
- package/dist-esm/plugins/templates/shared/openapi.d.ts.map +1 -1
- package/dist-esm/plugins/templates/shared/openapi.js +7 -0
- package/dist-esm/plugins/templates/shared/openapi.js.map +1 -1
- package/dist-esm/plugins/templates/snowflakecortex.d.ts.map +1 -1
- package/dist-esm/plugins/templates/snowflakecortex.js +13 -1
- package/dist-esm/plugins/templates/snowflakecortex.js.map +1 -1
- package/dist-esm/types/billing/billing.d.ts +3 -0
- package/dist-esm/types/billing/billing.d.ts.map +1 -1
- package/dist-esm/types/billing/billing.js.map +1 -1
- package/dist-esm/types/billing/freeCreditsTier.d.ts +12 -0
- package/dist-esm/types/billing/freeCreditsTier.d.ts.map +1 -0
- package/dist-esm/types/billing/freeCreditsTier.js +12 -0
- package/dist-esm/types/billing/freeCreditsTier.js.map +1 -0
- package/dist-esm/types/billing/freeCreditsTier.test.d.ts +2 -0
- package/dist-esm/types/billing/freeCreditsTier.test.d.ts.map +1 -0
- package/dist-esm/types/billing/freeCreditsTier.test.js +9 -0
- package/dist-esm/types/billing/freeCreditsTier.test.js.map +1 -0
- package/dist-esm/types/billing/index.d.ts +1 -0
- package/dist-esm/types/billing/index.d.ts.map +1 -1
- package/dist-esm/types/billing/index.js +1 -0
- package/dist-esm/types/billing/index.js.map +1 -1
- package/dist-esm/types/datasource/auth.d.ts.map +1 -1
- package/dist-esm/types/datasource/auth.js +17 -2
- package/dist-esm/types/datasource/auth.js.map +1 -1
- package/dist-esm/types/datasource/auth.test.js +69 -1
- package/dist-esm/types/datasource/auth.test.js.map +1 -1
- package/dist-esm/types/deployment/deployQueueStatus.d.ts +9 -0
- package/dist-esm/types/deployment/deployQueueStatus.d.ts.map +1 -0
- package/dist-esm/types/deployment/deployQueueStatus.js +8 -0
- package/dist-esm/types/deployment/deployQueueStatus.js.map +1 -0
- package/dist-esm/types/deployment/index.d.ts +1 -0
- package/dist-esm/types/deployment/index.d.ts.map +1 -1
- package/dist-esm/types/deployment/index.js +1 -1
- package/dist-esm/types/deployment/index.js.map +1 -1
- package/package.json +1 -1
- package/src/plugins/templates/shared/auth.ts +16 -7
- package/src/plugins/templates/shared/openapi.ts +8 -0
- package/src/plugins/templates/snowflakecortex.ts +14 -1
- package/src/types/billing/billing.ts +4 -0
- package/src/types/billing/freeCreditsTier.test.ts +10 -0
- package/src/types/billing/freeCreditsTier.ts +12 -0
- package/src/types/billing/index.ts +1 -0
- package/src/types/datasource/auth.test.ts +75 -1
- package/src/types/datasource/auth.ts +14 -2
- package/src/types/deployment/deployQueueStatus.ts +9 -0
- package/src/types/deployment/index.ts +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/billing/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/billing/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/billing/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/billing/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ function getClientId(authType, config, integrationId, integrationConfigurationId
|
|
|
39
39
|
case GoogleSheetsAuthType.OAUTH2_CODE: {
|
|
40
40
|
const oauthConfig = config;
|
|
41
41
|
let apiId;
|
|
42
|
-
if (oauthConfig.tokenScope === TokenScope.DATASOURCE) {
|
|
42
|
+
if (normalizeTokenScope(oauthConfig.tokenScope) === TokenScope.DATASOURCE) {
|
|
43
43
|
apiId = integrationConfigurationId;
|
|
44
44
|
}
|
|
45
45
|
else {
|
|
@@ -211,6 +211,21 @@ export var TokenType;
|
|
|
211
211
|
TokenType["ACCESS"] = "token";
|
|
212
212
|
TokenType["ID"] = "id-token";
|
|
213
213
|
})(TokenType || (TokenType = {}));
|
|
214
|
+
// normalizeTokenScope coerces a boolean tokenScope value (which can end up in the
|
|
215
|
+
// DB when the UI checkbox's mapBooleansTo mapping doesn't fire) to the correct
|
|
216
|
+
// TokenScope string enum. This prevents the orchestrator's protojson.Unmarshal
|
|
217
|
+
// from rejecting a boolean for the proto string field token_scope.
|
|
218
|
+
function normalizeTokenScope(value) {
|
|
219
|
+
if (value === true || value === TokenScope.DATASOURCE)
|
|
220
|
+
return TokenScope.DATASOURCE;
|
|
221
|
+
if (value === false || value === TokenScope.USER)
|
|
222
|
+
return TokenScope.USER;
|
|
223
|
+
if (value === undefined || value === null)
|
|
224
|
+
return undefined;
|
|
225
|
+
if (typeof value === 'string' && Object.values(TokenScope).includes(value))
|
|
226
|
+
return value;
|
|
227
|
+
return undefined;
|
|
228
|
+
}
|
|
214
229
|
export const extractPublic = (authType, authConfig) => {
|
|
215
230
|
switch (authType) {
|
|
216
231
|
case IntegrationAuthType.BASIC:
|
|
@@ -232,7 +247,7 @@ export const extractPublic = (authType, authConfig) => {
|
|
|
232
247
|
audience: authConfig?.audience,
|
|
233
248
|
refreshTokenFromServer: authConfig?.refreshTokenFromServer,
|
|
234
249
|
hasToken: authConfig?.hasToken,
|
|
235
|
-
tokenScope: authConfig?.tokenScope,
|
|
250
|
+
tokenScope: normalizeTokenScope(authConfig?.tokenScope),
|
|
236
251
|
promptType: authConfig?.promptType,
|
|
237
252
|
sendOAuthState: authConfig?.sendOAuthState
|
|
238
253
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAMjC,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAIpD,gFAAgF;AAChF,4BAA4B;AAC5B,2EAA2E;AAC3E,mBAAmB;AACnB,MAAM,UAAU,SAAS,CACvB,QAA8B,EAC9B,UAAkC,EAClC,aAAsB,EACtB,0BAAmC;IAEnC,OAAO,GAAG,QAAQ,IAAI,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,0BAA0B,CAAC,EAAE,CAAC;AACvG,CAAC;AAED,SAAS,WAAW,CAClB,QAA8B,EAC9B,MAA8B,EAC9B,aAAsB,EACtB,0BAAmC;IAEnC,MAAM,aAAa,GAAG,gBAAgB,CAAC;IACvC,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,mBAAmB,GAAG,GAAuB,EAAE;QACnD,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,mBAAmB,CAAC,KAAK;gBAC5B,OAAO,aAAa,IAAI,EAAE,CAAC;YAC7B,KAAK,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAClC,MAAM,cAAc,GAAG,MAA4B,CAAC;gBACpD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;oBAC3B,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAClD,OAAO,MAAM,CAAC,SAAS,CAAC;gBAC1B,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,KAAK,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;gBACzC,OAAQ,MAAsB,CAAC,QAAQ,CAAC;YAC1C,CAAC;YACD,KAAK,mBAAmB,CAAC,mBAAmB,CAAC;YAC7C,KAAK,mBAAmB,CAAC,WAAW,CAAC;YACrC,KAAK,mBAAmB,CAAC,eAAe,CAAC;YACzC,KAAK,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,MAAqB,CAAC;gBAC1C,IAAI,KAAK,CAAC;gBACV,IAAI,WAAW,CAAC,UAAU,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { describe, test, expect } from 'vitest';
|
|
2
|
-
import { IntegrationAuthType, getDisplayName, extractPublic, getAuthId } from './auth.js';
|
|
2
|
+
import { IntegrationAuthType, getDisplayName, extractPublic, getAuthId, TokenScope } from './auth.js';
|
|
3
3
|
describe('getDisplayName', () => {
|
|
4
4
|
test('returns "IdP Token Passthrough" for OAUTH2_IDP_TOKEN_PASSTHROUGH', () => {
|
|
5
5
|
expect(getDisplayName(IntegrationAuthType.OAUTH2_IDP_TOKEN_PASSTHROUGH)).toBe('IdP Token Passthrough');
|
|
@@ -42,6 +42,74 @@ describe('extractPublic', () => {
|
|
|
42
42
|
expect(() => extractPublic('totally-unknown-type', {})).toThrow('unknown auth type');
|
|
43
43
|
});
|
|
44
44
|
});
|
|
45
|
+
describe('extractPublic normalizes boolean tokenScope for OAUTH2_CODE', () => {
|
|
46
|
+
test('normalizes boolean true tokenScope to TokenScope.DATASOURCE', () => {
|
|
47
|
+
const authConfig = {
|
|
48
|
+
clientId: 'my-client',
|
|
49
|
+
authorizationUrl: 'https://auth.example.com',
|
|
50
|
+
tokenUrl: 'https://token.example.com',
|
|
51
|
+
scope: 'read',
|
|
52
|
+
tokenScope: true
|
|
53
|
+
};
|
|
54
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
55
|
+
expect(result.tokenScope).toBe(TokenScope.DATASOURCE);
|
|
56
|
+
});
|
|
57
|
+
test('normalizes boolean false tokenScope to TokenScope.USER', () => {
|
|
58
|
+
const authConfig = {
|
|
59
|
+
clientId: 'my-client',
|
|
60
|
+
authorizationUrl: 'https://auth.example.com',
|
|
61
|
+
tokenUrl: 'https://token.example.com',
|
|
62
|
+
scope: 'read',
|
|
63
|
+
tokenScope: false
|
|
64
|
+
};
|
|
65
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
66
|
+
expect(result.tokenScope).toBe(TokenScope.USER);
|
|
67
|
+
});
|
|
68
|
+
test('passes through valid string TokenScope unchanged', () => {
|
|
69
|
+
const authConfig = {
|
|
70
|
+
clientId: 'my-client',
|
|
71
|
+
authorizationUrl: 'https://auth.example.com',
|
|
72
|
+
tokenUrl: 'https://token.example.com',
|
|
73
|
+
scope: 'read',
|
|
74
|
+
tokenScope: TokenScope.DATASOURCE
|
|
75
|
+
};
|
|
76
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
77
|
+
expect(result.tokenScope).toBe(TokenScope.DATASOURCE);
|
|
78
|
+
});
|
|
79
|
+
test('returns undefined for unknown string tokenScope values', () => {
|
|
80
|
+
const authConfig = {
|
|
81
|
+
clientId: 'my-client',
|
|
82
|
+
authorizationUrl: 'https://auth.example.com',
|
|
83
|
+
tokenUrl: 'https://token.example.com',
|
|
84
|
+
scope: 'read',
|
|
85
|
+
tokenScope: 'INVALID'
|
|
86
|
+
};
|
|
87
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
88
|
+
expect(result.tokenScope).toBeUndefined();
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
describe('getAuthId normalizes boolean tokenScope in getClientId', () => {
|
|
92
|
+
test('uses integrationConfigurationId when tokenScope is boolean true (datasource)', () => {
|
|
93
|
+
const authConfig = {
|
|
94
|
+
clientId: 'my-client',
|
|
95
|
+
tokenScope: true,
|
|
96
|
+
scope: 'read'
|
|
97
|
+
};
|
|
98
|
+
const result = getAuthId(IntegrationAuthType.OAUTH2_CODE, authConfig, 'int-1', 'cfg-1');
|
|
99
|
+
// When tokenScope is datasource, getClientId uses integrationConfigurationId (cfg-1)
|
|
100
|
+
expect(result).toMatch(/^oauth-code\.cfg-1/);
|
|
101
|
+
});
|
|
102
|
+
test('uses clientId when tokenScope is boolean false (user)', () => {
|
|
103
|
+
const authConfig = {
|
|
104
|
+
clientId: 'my-client',
|
|
105
|
+
tokenScope: false,
|
|
106
|
+
scope: 'read'
|
|
107
|
+
};
|
|
108
|
+
const result = getAuthId(IntegrationAuthType.OAUTH2_CODE, authConfig, 'int-1', 'cfg-1');
|
|
109
|
+
// When tokenScope is user, getClientId uses clientId (my-client)
|
|
110
|
+
expect(result).toMatch(/^oauth-code\.my-client/);
|
|
111
|
+
});
|
|
112
|
+
});
|
|
45
113
|
describe('getAuthId', () => {
|
|
46
114
|
test('uses unknown-client for OAUTH2_IDP_TOKEN_PASSTHROUGH (no client identity)', () => {
|
|
47
115
|
const authId = getAuthId(IntegrationAuthType.OAUTH2_IDP_TOKEN_PASSTHROUGH, {}, 'int-1', 'cfg-1');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare enum DeployQueueStatus {
|
|
2
|
+
QUEUED = "QUEUED",
|
|
3
|
+
DEPLOYING = "DEPLOYING",
|
|
4
|
+
DEPLOYED = "DEPLOYED",
|
|
5
|
+
FAILED = "FAILED"
|
|
6
|
+
}
|
|
7
|
+
/** Status returned by the deploy-status polling endpoint. "none" means no queue entry exists. */
|
|
8
|
+
export type DeployStatusResponseStatus = 'none' | DeployQueueStatus;
|
|
9
|
+
//# sourceMappingURL=deployQueueStatus.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deployQueueStatus.d.ts","sourceRoot":"","sources":["../../../src/types/deployment/deployQueueStatus.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AAED,iGAAiG;AACjG,MAAM,MAAM,0BAA0B,GAAG,MAAM,GAAG,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export var DeployQueueStatus;
|
|
2
|
+
(function (DeployQueueStatus) {
|
|
3
|
+
DeployQueueStatus["QUEUED"] = "QUEUED";
|
|
4
|
+
DeployQueueStatus["DEPLOYING"] = "DEPLOYING";
|
|
5
|
+
DeployQueueStatus["DEPLOYED"] = "DEPLOYED";
|
|
6
|
+
DeployQueueStatus["FAILED"] = "FAILED";
|
|
7
|
+
})(DeployQueueStatus || (DeployQueueStatus = {}));
|
|
8
|
+
//# sourceMappingURL=deployQueueStatus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deployQueueStatus.js","sourceRoot":"","sources":["../../../src/types/deployment/deployQueueStatus.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,iBAKX;AALD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,4CAAuB,CAAA;IACvB,0CAAqB,CAAA;IACrB,sCAAiB,CAAA;AACnB,CAAC,EALW,iBAAiB,KAAjB,iBAAiB,QAK5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/deployment/index.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/deployment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,KAAK,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAE5F,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export { DeployQueueStatus } from './deployQueueStatus.js';
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/deployment/index.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/deployment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAmC,MAAM,wBAAwB,CAAC"}
|
package/package.json
CHANGED
|
@@ -29,6 +29,7 @@ type ApiKeyFormItem = {
|
|
|
29
29
|
key: string; // Unique key for the form
|
|
30
30
|
required?: boolean; // Whether the field is required
|
|
31
31
|
valuePrefix?: string; // A string that should be prefixed to the value
|
|
32
|
+
tooltip?: { markdownText: string }; // Optional tooltip with markdown text
|
|
32
33
|
};
|
|
33
34
|
|
|
34
35
|
type BasicAuthConfig = {
|
|
@@ -37,8 +38,9 @@ type BasicAuthConfig = {
|
|
|
37
38
|
};
|
|
38
39
|
|
|
39
40
|
export enum ClientAuthMethod {
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
BASIC = 'BASIC',
|
|
42
|
+
BEARER = 'BEARER',
|
|
43
|
+
POST = 'POST'
|
|
42
44
|
}
|
|
43
45
|
|
|
44
46
|
export type AuthMethods = {
|
|
@@ -48,6 +50,7 @@ export type AuthMethods = {
|
|
|
48
50
|
bearer?: boolean;
|
|
49
51
|
apiKey?: boolean;
|
|
50
52
|
apiKeyForm?: ApiKeyFormItem[];
|
|
53
|
+
apiKeyFormDisplayName?: string;
|
|
51
54
|
tokenPrefixed?: boolean | { prefix: string };
|
|
52
55
|
oauth2BringYourOwn?: OAuth2Config;
|
|
53
56
|
oauth2SuperblocksClient?: OAuth2HostedClientConfig;
|
|
@@ -120,9 +123,12 @@ export const authSections = ({
|
|
|
120
123
|
isProto?: boolean;
|
|
121
124
|
prependItems?: FormItem[];
|
|
122
125
|
}): FormSection[] => {
|
|
123
|
-
//
|
|
126
|
+
// Extract display name override before filtering methods
|
|
127
|
+
const apiKeyFormDisplayName = enabledMethods.apiKeyFormDisplayName;
|
|
128
|
+
|
|
129
|
+
// Filter out any disabled methods (exclude non-method keys like apiKeyFormDisplayName)
|
|
124
130
|
enabledMethods = Object.keys(enabledMethods).reduce((acc: AuthMethods, key: string) => {
|
|
125
|
-
if (enabledMethods[key]) {
|
|
131
|
+
if (enabledMethods[key] && key !== 'apiKeyFormDisplayName') {
|
|
126
132
|
acc[key] = enabledMethods[key];
|
|
127
133
|
}
|
|
128
134
|
return acc;
|
|
@@ -166,7 +172,7 @@ export const authSections = ({
|
|
|
166
172
|
startVersion: startVersion,
|
|
167
173
|
componentType: FormComponentType.DROPDOWN,
|
|
168
174
|
initialValue: authTypeInitialValue,
|
|
169
|
-
options: authTypeOptions({ enabledMethods, allowNone, isProto }),
|
|
175
|
+
options: authTypeOptions({ enabledMethods, allowNone, isProto, apiKeyFormDisplayName }),
|
|
170
176
|
disabled: !allowNone && enabledMethodKeys.length === 1
|
|
171
177
|
}
|
|
172
178
|
],
|
|
@@ -393,6 +399,7 @@ export const authSections = ({
|
|
|
393
399
|
message: `${apiKey.label} is required`
|
|
394
400
|
}
|
|
395
401
|
],
|
|
402
|
+
...(apiKey.tooltip ? { tooltip: apiKey.tooltip } : {}),
|
|
396
403
|
display: {
|
|
397
404
|
show: {
|
|
398
405
|
authType: [IntegrationAuthType.API_KEY_FORM]
|
|
@@ -1457,11 +1464,13 @@ function apiKeyAuthOptions(pluginId: ExtendedIntegrationPluginId): DropdownOptio
|
|
|
1457
1464
|
function authTypeOptions({
|
|
1458
1465
|
enabledMethods,
|
|
1459
1466
|
allowNone = true,
|
|
1460
|
-
isProto = false
|
|
1467
|
+
isProto = false,
|
|
1468
|
+
apiKeyFormDisplayName
|
|
1461
1469
|
}: {
|
|
1462
1470
|
enabledMethods: AuthMethods;
|
|
1463
1471
|
allowNone?: boolean;
|
|
1464
1472
|
isProto?: boolean;
|
|
1473
|
+
apiKeyFormDisplayName?: string;
|
|
1465
1474
|
}): DropdownOption[] {
|
|
1466
1475
|
const options: DropdownOption[] = allowNone
|
|
1467
1476
|
? [
|
|
@@ -1495,7 +1504,7 @@ function authTypeOptions({
|
|
|
1495
1504
|
}
|
|
1496
1505
|
if (enabledMethods.apiKeyForm) {
|
|
1497
1506
|
options.push({
|
|
1498
|
-
displayName: getDisplayName(IntegrationAuthType.API_KEY_FORM),
|
|
1507
|
+
displayName: apiKeyFormDisplayName ?? getDisplayName(IntegrationAuthType.API_KEY_FORM),
|
|
1499
1508
|
value: IntegrationAuthType.API_KEY_FORM,
|
|
1500
1509
|
key: IntegrationAuthType.API_KEY_FORM
|
|
1501
1510
|
});
|
|
@@ -26,6 +26,11 @@ import { PUBLIC_INTEGRATIONS_CDN_URL, PUBLIC_INTEGRATIONS_LOGO_URL, DOCS_BASE_UR
|
|
|
26
26
|
import { AuthMethods, authSections } from './auth.js';
|
|
27
27
|
import { RestApiIntegrationPluginMergedFieldNames, RestApiIntegrationPluginVersions } from './restapiintegration.js';
|
|
28
28
|
|
|
29
|
+
// Automatically populated when getNativeOpenApiPlugin is called with
|
|
30
|
+
// authMethods.oauth2BringYourOwn. Used by the server to validate that
|
|
31
|
+
// PLUGIN_REVOCATION_CONFIG covers all known oauth2BringYourOwn plugins.
|
|
32
|
+
export const oauth2BringYourOwnPluginIds = new Set<string>();
|
|
33
|
+
|
|
29
34
|
export const getNativeOpenApiPlugin = ({
|
|
30
35
|
id,
|
|
31
36
|
name,
|
|
@@ -49,6 +54,9 @@ export const getNativeOpenApiPlugin = ({
|
|
|
49
54
|
tenantInput?: TenantInput;
|
|
50
55
|
isStreamable?: boolean;
|
|
51
56
|
}): Plugin => {
|
|
57
|
+
if (authMethods.oauth2BringYourOwn) {
|
|
58
|
+
oauth2BringYourOwnPluginIds.add(id);
|
|
59
|
+
}
|
|
52
60
|
const mainSectionItems: FormItem[] = [
|
|
53
61
|
{
|
|
54
62
|
label: 'Display name',
|
|
@@ -9,7 +9,20 @@ export const SnowflakeCortexPlugin: Plugin = getNativeOpenApiPlugin({
|
|
|
9
9
|
openApiSpecURL: `${PUBLIC_INTEGRATIONS_CDN_URL}/openapi/snowflake-cortex.yaml`,
|
|
10
10
|
logoURL: `${PUBLIC_INTEGRATIONS_LOGO_URL}/snowflake.png`,
|
|
11
11
|
authMethods: {
|
|
12
|
-
|
|
12
|
+
apiKeyFormDisplayName: 'Programmatic Access Token',
|
|
13
|
+
apiKeyForm: [
|
|
14
|
+
{
|
|
15
|
+
label: 'Programmatic Access Token',
|
|
16
|
+
header: 'Authorization',
|
|
17
|
+
key: 'api-key',
|
|
18
|
+
required: true,
|
|
19
|
+
valuePrefix: 'Bearer ',
|
|
20
|
+
tooltip: {
|
|
21
|
+
markdownText:
|
|
22
|
+
'A Programmatic Access Token (PAT) is used for authentication. [Learn how to generate one](https://docs.snowflake.com/en/user-guide/programmatic-access-tokens).'
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
]
|
|
13
26
|
},
|
|
14
27
|
isStreamable: true,
|
|
15
28
|
serverURL: 'https://{SUPERBLOCKS_OPENAPI_TENANT_NAME}.snowflakecomputing.com',
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { FreeCreditsTier } from './freeCreditsTier.js';
|
|
2
|
+
|
|
1
3
|
export enum BillingPlan {
|
|
2
4
|
TRIAL = 'TRIAL',
|
|
3
5
|
/** @deprecated Legacy v1 plan — no longer issued to new organizations. */
|
|
@@ -38,4 +40,6 @@ export type Billing = {
|
|
|
38
40
|
cancelAt?: Date | null;
|
|
39
41
|
stripeSubStatus?: string | null;
|
|
40
42
|
showCcGateIfTrial?: boolean;
|
|
43
|
+
/** Set at signup; used for LD targeting (`freeCreditsTier`). */
|
|
44
|
+
freeCreditsTier?: FreeCreditsTier;
|
|
41
45
|
};
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
|
|
3
|
+
import { FreeCreditsTierEnum } from './freeCreditsTier.js';
|
|
4
|
+
|
|
5
|
+
describe('FreeCreditsTierEnum', () => {
|
|
6
|
+
it('uses stable string values for LaunchDarkly targeting', () => {
|
|
7
|
+
expect(FreeCreditsTierEnum.HIGH).toBe('high');
|
|
8
|
+
expect(FreeCreditsTierEnum.LOW).toBe('low');
|
|
9
|
+
});
|
|
10
|
+
});
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Free-credits entitlement level persisted on `billing.free_credits_tier` and sent to
|
|
3
|
+
* LaunchDarkly as `freeCreditsTier` for flag targeting (e.g. trial credit limits).
|
|
4
|
+
*
|
|
5
|
+
* Values match the PostgreSQL `free_credits_tier_enum`.
|
|
6
|
+
*/
|
|
7
|
+
export enum FreeCreditsTierEnum {
|
|
8
|
+
HIGH = 'high',
|
|
9
|
+
LOW = 'low'
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export type FreeCreditsTier = `${FreeCreditsTierEnum}`;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { describe, test, expect } from 'vitest';
|
|
2
2
|
|
|
3
|
-
import { IntegrationAuthType, getDisplayName, extractPublic, getAuthId } from './auth.js';
|
|
3
|
+
import { IntegrationAuthType, getDisplayName, extractPublic, getAuthId, TokenScope } from './auth.js';
|
|
4
4
|
|
|
5
5
|
describe('getDisplayName', () => {
|
|
6
6
|
test('returns "IdP Token Passthrough" for OAUTH2_IDP_TOKEN_PASSTHROUGH', () => {
|
|
@@ -50,6 +50,80 @@ describe('extractPublic', () => {
|
|
|
50
50
|
});
|
|
51
51
|
});
|
|
52
52
|
|
|
53
|
+
describe('extractPublic normalizes boolean tokenScope for OAUTH2_CODE', () => {
|
|
54
|
+
test('normalizes boolean true tokenScope to TokenScope.DATASOURCE', () => {
|
|
55
|
+
const authConfig = {
|
|
56
|
+
clientId: 'my-client',
|
|
57
|
+
authorizationUrl: 'https://auth.example.com',
|
|
58
|
+
tokenUrl: 'https://token.example.com',
|
|
59
|
+
scope: 'read',
|
|
60
|
+
tokenScope: true as unknown as TokenScope
|
|
61
|
+
};
|
|
62
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
63
|
+
expect(result.tokenScope).toBe(TokenScope.DATASOURCE);
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
test('normalizes boolean false tokenScope to TokenScope.USER', () => {
|
|
67
|
+
const authConfig = {
|
|
68
|
+
clientId: 'my-client',
|
|
69
|
+
authorizationUrl: 'https://auth.example.com',
|
|
70
|
+
tokenUrl: 'https://token.example.com',
|
|
71
|
+
scope: 'read',
|
|
72
|
+
tokenScope: false as unknown as TokenScope
|
|
73
|
+
};
|
|
74
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
75
|
+
expect(result.tokenScope).toBe(TokenScope.USER);
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
test('passes through valid string TokenScope unchanged', () => {
|
|
79
|
+
const authConfig = {
|
|
80
|
+
clientId: 'my-client',
|
|
81
|
+
authorizationUrl: 'https://auth.example.com',
|
|
82
|
+
tokenUrl: 'https://token.example.com',
|
|
83
|
+
scope: 'read',
|
|
84
|
+
tokenScope: TokenScope.DATASOURCE
|
|
85
|
+
};
|
|
86
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
87
|
+
expect(result.tokenScope).toBe(TokenScope.DATASOURCE);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test('returns undefined for unknown string tokenScope values', () => {
|
|
91
|
+
const authConfig = {
|
|
92
|
+
clientId: 'my-client',
|
|
93
|
+
authorizationUrl: 'https://auth.example.com',
|
|
94
|
+
tokenUrl: 'https://token.example.com',
|
|
95
|
+
scope: 'read',
|
|
96
|
+
tokenScope: 'INVALID' as unknown as TokenScope
|
|
97
|
+
};
|
|
98
|
+
const result = extractPublic(IntegrationAuthType.OAUTH2_CODE, authConfig);
|
|
99
|
+
expect(result.tokenScope).toBeUndefined();
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
describe('getAuthId normalizes boolean tokenScope in getClientId', () => {
|
|
104
|
+
test('uses integrationConfigurationId when tokenScope is boolean true (datasource)', () => {
|
|
105
|
+
const authConfig = {
|
|
106
|
+
clientId: 'my-client',
|
|
107
|
+
tokenScope: true as unknown as TokenScope,
|
|
108
|
+
scope: 'read'
|
|
109
|
+
};
|
|
110
|
+
const result = getAuthId(IntegrationAuthType.OAUTH2_CODE, authConfig, 'int-1', 'cfg-1');
|
|
111
|
+
// When tokenScope is datasource, getClientId uses integrationConfigurationId (cfg-1)
|
|
112
|
+
expect(result).toMatch(/^oauth-code\.cfg-1/);
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
test('uses clientId when tokenScope is boolean false (user)', () => {
|
|
116
|
+
const authConfig = {
|
|
117
|
+
clientId: 'my-client',
|
|
118
|
+
tokenScope: false as unknown as TokenScope,
|
|
119
|
+
scope: 'read'
|
|
120
|
+
};
|
|
121
|
+
const result = getAuthId(IntegrationAuthType.OAUTH2_CODE, authConfig, 'int-1', 'cfg-1');
|
|
122
|
+
// When tokenScope is user, getClientId uses clientId (my-client)
|
|
123
|
+
expect(result).toMatch(/^oauth-code\.my-client/);
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
|
|
53
127
|
describe('getAuthId', () => {
|
|
54
128
|
test('uses unknown-client for OAUTH2_IDP_TOKEN_PASSTHROUGH (no client identity)', () => {
|
|
55
129
|
const authId = getAuthId(IntegrationAuthType.OAUTH2_IDP_TOKEN_PASSTHROUGH, {}, 'int-1', 'cfg-1');
|
|
@@ -58,7 +58,7 @@ function getClientId(
|
|
|
58
58
|
case GoogleSheetsAuthType.OAUTH2_CODE: {
|
|
59
59
|
const oauthConfig = config as OAuthConfig;
|
|
60
60
|
let apiId;
|
|
61
|
-
if (oauthConfig.tokenScope === TokenScope.DATASOURCE) {
|
|
61
|
+
if (normalizeTokenScope(oauthConfig.tokenScope) === TokenScope.DATASOURCE) {
|
|
62
62
|
apiId = integrationConfigurationId;
|
|
63
63
|
} else {
|
|
64
64
|
apiId = config.clientId;
|
|
@@ -372,6 +372,18 @@ type ApiKeyAuthConfig = {
|
|
|
372
372
|
method?: ApiKeyMethod;
|
|
373
373
|
};
|
|
374
374
|
|
|
375
|
+
// normalizeTokenScope coerces a boolean tokenScope value (which can end up in the
|
|
376
|
+
// DB when the UI checkbox's mapBooleansTo mapping doesn't fire) to the correct
|
|
377
|
+
// TokenScope string enum. This prevents the orchestrator's protojson.Unmarshal
|
|
378
|
+
// from rejecting a boolean for the proto string field token_scope.
|
|
379
|
+
function normalizeTokenScope(value: unknown): TokenScope | undefined {
|
|
380
|
+
if (value === true || value === TokenScope.DATASOURCE) return TokenScope.DATASOURCE;
|
|
381
|
+
if (value === false || value === TokenScope.USER) return TokenScope.USER;
|
|
382
|
+
if (value === undefined || value === null) return undefined;
|
|
383
|
+
if (typeof value === 'string' && Object.values(TokenScope).includes(value as TokenScope)) return value as TokenScope;
|
|
384
|
+
return undefined;
|
|
385
|
+
}
|
|
386
|
+
|
|
375
387
|
export const extractPublic = (authType: AuthType | undefined, authConfig: AuthConfig | undefined): PublicAuthConfig => {
|
|
376
388
|
switch (authType) {
|
|
377
389
|
case IntegrationAuthType.BASIC:
|
|
@@ -393,7 +405,7 @@ export const extractPublic = (authType: AuthType | undefined, authConfig: AuthCo
|
|
|
393
405
|
audience: authConfig?.audience,
|
|
394
406
|
refreshTokenFromServer: authConfig?.refreshTokenFromServer,
|
|
395
407
|
hasToken: authConfig?.hasToken,
|
|
396
|
-
tokenScope: authConfig?.tokenScope,
|
|
408
|
+
tokenScope: normalizeTokenScope(authConfig?.tokenScope),
|
|
397
409
|
promptType: authConfig?.promptType,
|
|
398
410
|
sendOAuthState: authConfig?.sendOAuthState
|
|
399
411
|
};
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export enum DeployQueueStatus {
|
|
2
|
+
QUEUED = 'QUEUED',
|
|
3
|
+
DEPLOYING = 'DEPLOYING',
|
|
4
|
+
DEPLOYED = 'DEPLOYED',
|
|
5
|
+
FAILED = 'FAILED'
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
/** Status returned by the deploy-status polling endpoint. "none" means no queue entry exists. */
|
|
9
|
+
export type DeployStatusResponseStatus = 'none' | DeployQueueStatus;
|