@superblocksteam/shared 0.9577.3 → 0.9578.0

package/src/types/datasource/auth.ts

@@ -58,7 +58,7 @@ function getClientId(
       case GoogleSheetsAuthType.OAUTH2_CODE: {
         const oauthConfig = config as OAuthConfig;
         let apiId;
-        if (oauthConfig.tokenScope === TokenScope.DATASOURCE) {
+        if (normalizeTokenScope(oauthConfig.tokenScope) === TokenScope.DATASOURCE) {
           apiId = integrationConfigurationId;
         } else {
           apiId = config.clientId;
@@ -372,6 +372,18 @@ type ApiKeyAuthConfig = {
   method?: ApiKeyMethod;
 };
 
+// normalizeTokenScope coerces a boolean tokenScope value (which can end up in the
+// DB when the UI checkbox's mapBooleansTo mapping doesn't fire) to the correct
+// TokenScope string enum. This prevents the orchestrator's protojson.Unmarshal
+// from rejecting a boolean for the proto string field token_scope.
+function normalizeTokenScope(value: unknown): TokenScope | undefined {
+  if (value === true || value === TokenScope.DATASOURCE) return TokenScope.DATASOURCE;
+  if (value === false || value === TokenScope.USER) return TokenScope.USER;
+  if (value === undefined || value === null) return undefined;
+  if (typeof value === 'string' && Object.values(TokenScope).includes(value as TokenScope)) return value as TokenScope;
+  return undefined;
+}
+
 export const extractPublic = (authType: AuthType | undefined, authConfig: AuthConfig | undefined): PublicAuthConfig => {
   switch (authType) {
     case IntegrationAuthType.BASIC:
@@ -393,7 +405,7 @@ export const extractPublic = (authType: AuthType | undefined, authConfig: AuthCo
         audience: authConfig?.audience,
         refreshTokenFromServer: authConfig?.refreshTokenFromServer,
         hasToken: authConfig?.hasToken,
-        tokenScope: authConfig?.tokenScope,
+        tokenScope: normalizeTokenScope(authConfig?.tokenScope),
         promptType: authConfig?.promptType,
         sendOAuthState: authConfig?.sendOAuthState
       };

package/src/types/deployment/deployQueueStatus.ts

@@ -0,0 +1,9 @@
+export enum DeployQueueStatus {
+  QUEUED = 'QUEUED',
+  DEPLOYING = 'DEPLOYING',
+  DEPLOYED = 'DEPLOYED',
+  FAILED = 'FAILED'
+}
+
+/** Status returned by the deploy-status polling endpoint. "none" means no queue entry exists. */
+export type DeployStatusResponseStatus = 'none' | DeployQueueStatus;

package/src/types/deployment/index.ts

@@ -1,3 +1,5 @@
+export { DeployQueueStatus, type DeployStatusResponseStatus } from './deployQueueStatus.js';
+
 export interface DeploymentDto {
   commitId: string | null;
   previousCommitId?: string | null;

package/src/types/integration/index.ts

@@ -185,6 +185,7 @@ export class IntegrationDto extends IntegrationBaseDto {
   configurations: IntegrationConfigurationDto[];
   slug?: string;
   ownerEmail?: string;
+  creator?: CreatorDto;
   enabledForV2?: boolean;
 
   constructor({
@@ -198,6 +199,7 @@ export class IntegrationDto extends IntegrationBaseDto {
     demoIntegrationId,
     isUserConfigured,
     ownerEmail,
+    creator,
     kind,
     slug,
     enabledForV2
@@ -212,6 +214,7 @@ export class IntegrationDto extends IntegrationBaseDto {
     demoIntegrationId?: string;
     isUserConfigured: boolean;
     ownerEmail?: string;
+    creator?: CreatorDto;
     kind: IntegrationKind;
     slug?: string;
     enabledForV2?: boolean;
@@ -227,6 +230,7 @@ export class IntegrationDto extends IntegrationBaseDto {
     this.configurations = configurations;
     this.isUserConfigured = isUserConfigured;
     this.ownerEmail = ownerEmail;
+    this.creator = creator;
     this.kind = kind;
     this.slug = slug;
     this.enabledForV2 = enabledForV2;