fix(typescript): Remove oauthTokenOverride config flag - always enable token override

generators/typescript-v2/ast/src/custom-config/TypescriptCustomConfigSchema.ts

@@ -58,9 +58,6 @@ export const TypescriptCustomConfigSchema = z.strictObject({
     useBrandedStringAliases: z.optional(z.boolean()),
     offsetSemantics: z.optional(z.enum(["item-index", "page-index"])),
 
-    // OAuth token override configuration
-    oauthTokenOverride: z.optional(z.boolean()),
-
     // beta (not in docs)
     includeContentHeadersOnFileDownloadResponse: z.optional(z.boolean()),
     includeUtilsOnUnionMembers: z.optional(z.boolean()),

generators/typescript/sdk/cli/src/SdkGeneratorCli.ts

@@ -96,8 +96,7 @@ export class SdkGeneratorCli extends AbstractGeneratorCli<SdkCustomConfig> {
             linter: parsed?.linter ?? "biome",
             formatter: parsed?.formatter ?? "biome",
             generateSubpackageExports: parsed?.generateSubpackageExports ?? false,
-            offsetSemantics: parsed?.offsetSemantics ?? "item-index",
-            oauthTokenOverride: parsed?.oauthTokenOverride ?? false
+            offsetSemantics: parsed?.offsetSemantics ?? "item-index"
         };
 
         if (parsed?.noSerdeLayer === false && typeof parsed?.enableInlineTypes === "undefined") {
@@ -243,8 +242,7 @@ export class SdkGeneratorCli extends AbstractGeneratorCli<SdkCustomConfig> {
                 formatter: customConfig.formatter,
                 linter: customConfig.linter,
                 generateSubpackageExports: customConfig.generateSubpackageExports ?? false,
-                offsetSemantics: customConfig.offsetSemantics,
-                oauthTokenOverride: customConfig.oauthTokenOverride ?? false
+                offsetSemantics: customConfig.offsetSemantics
             }
         });
         const typescriptProject = await sdkGenerator.generate();

generators/typescript/sdk/cli/src/custom-config/SdkCustomConfig.ts

@@ -60,5 +60,4 @@ export interface SdkCustomConfig {
     parameterNaming: "originalName" | "wireValue" | "camelCase" | "snakeCase" | "default";
     generateSubpackageExports: boolean | undefined;
     offsetSemantics: "item-index" | "page-index";
-    oauthTokenOverride: boolean | undefined;
 }

generators/typescript/sdk/client-class-generator/src/AuthProvidersGenerator.ts

@@ -19,19 +19,12 @@ export declare namespace AuthProvidersGenerator {
         authScheme: AuthScheme | { type: "any" };
         neverThrowErrors: boolean;
         includeSerdeLayer: boolean;
-        oauthTokenOverride: boolean;
     }
 }
 
 export class AuthProvidersGenerator implements GeneratedFile<SdkContext> {
     private readonly authProviderGenerator: AuthProviderGenerator | undefined;
-    constructor({
-        ir,
-        authScheme,
-        neverThrowErrors,
-        includeSerdeLayer,
-        oauthTokenOverride
-    }: AuthProvidersGenerator.Init) {
+    constructor({ ir, authScheme, neverThrowErrors, includeSerdeLayer }: AuthProvidersGenerator.Init) {
         this.authProviderGenerator = (() => {
             switch (authScheme.type) {
                 case "any":
@@ -64,8 +57,7 @@ export class AuthProvidersGenerator implements GeneratedFile<SdkContext> {
                         ir,
                         authScheme,
                         neverThrowErrors,
-                        includeSerdeLayer,
-                        oauthTokenOverride
+                        includeSerdeLayer
                     });
                 default:
                     assertNever(authScheme);

generators/typescript/sdk/client-class-generator/src/BaseClientTypeGenerator.ts

@@ -10,7 +10,6 @@ export declare namespace BaseClientTypeGenerator {
         generateIdempotentRequestOptions: boolean;
         ir: FernIr.IntermediateRepresentation;
         omitFernHeaders: boolean;
-        oauthTokenOverride: boolean;
     }
 }
 
@@ -21,18 +20,11 @@ export class BaseClientTypeGenerator {
     private readonly generateIdempotentRequestOptions: boolean;
     private readonly ir: FernIr.IntermediateRepresentation;
     private readonly omitFernHeaders: boolean;
-    private readonly oauthTokenOverride: boolean;
-
-    constructor({
-        generateIdempotentRequestOptions,
-        ir,
-        omitFernHeaders,
-        oauthTokenOverride
-    }: BaseClientTypeGenerator.Init) {
+
+    constructor({ generateIdempotentRequestOptions, ir, omitFernHeaders }: BaseClientTypeGenerator.Init) {
         this.generateIdempotentRequestOptions = generateIdempotentRequestOptions;
         this.ir = ir;
         this.omitFernHeaders = omitFernHeaders;
-        this.oauthTokenOverride = oauthTokenOverride;
     }
 
     public writeToFile(context: SdkContext): void {
@@ -281,10 +273,9 @@ export type NormalizedClientOptionsWithAuth<T extends BaseClientOptions> = Norma
                         namedImports: ["OAuthAuthProvider"]
                     });
                     providerImports.push("OAuthAuthProvider");
-                    const oauthCreation = this.oauthTokenOverride
-                        ? "if (OAuthAuthProvider.canCreate(normalizedWithNoOpAuthProvider)) { authProviders.push(OAuthAuthProvider.createInstance(normalizedWithNoOpAuthProvider)); }"
-                        : "if (OAuthAuthProvider.canCreate(normalizedWithNoOpAuthProvider)) { authProviders.push(new OAuthAuthProvider(normalizedWithNoOpAuthProvider)); }";
-                    providerInstantiations.push(oauthCreation);
+                    providerInstantiations.push(
+                        "if (OAuthAuthProvider.canCreate(normalizedWithNoOpAuthProvider)) { authProviders.push(OAuthAuthProvider.createInstance(normalizedWithNoOpAuthProvider)); }"
+                    );
                 }
             }
 
@@ -321,9 +312,7 @@ export type NormalizedClientOptionsWithAuth<T extends BaseClientOptions> = Norma
                         moduleSpecifier: "./auth/OAuthAuthProvider.js",
                         namedImports: ["OAuthAuthProvider"]
                     });
-                    authProviderCreation = this.oauthTokenOverride
-                        ? "OAuthAuthProvider.createInstance(normalizedWithNoOpAuthProvider)"
-                        : "new OAuthAuthProvider(normalizedWithNoOpAuthProvider)";
+                    authProviderCreation = "OAuthAuthProvider.createInstance(normalizedWithNoOpAuthProvider)";
                     break;
                 } else if (authScheme.type === "inferred") {
                     context.sourceFile.addImportDeclaration({

generators/typescript/sdk/client-class-generator/src/GeneratedSdkClientClassImpl.ts

@@ -93,7 +93,6 @@ export declare namespace GeneratedSdkClientClassImpl {
         generateEndpointMetadata: boolean;
         parameterNaming: "originalName" | "wireValue" | "camelCase" | "snakeCase" | "default";
         offsetSemantics: "item-index" | "page-index";
-        oauthTokenOverride: boolean;
     }
 }
 
@@ -137,7 +136,6 @@ export class GeneratedSdkClientClassImpl implements GeneratedSdkClientClass {
     private readonly anyEndpointWithAuth: boolean;
     private readonly generateEndpointMetadata: boolean;
     private readonly offsetSemantics: "item-index" | "page-index";
-    private readonly oauthTokenOverride: boolean;
 
     constructor({
         isRoot,
@@ -164,8 +162,7 @@ export class GeneratedSdkClientClassImpl implements GeneratedSdkClientClass {
         formDataSupport,
         generateEndpointMetadata,
         parameterNaming,
-        offsetSemantics,
-        oauthTokenOverride
+        offsetSemantics
     }: GeneratedSdkClientClassImpl.Init) {
         this.isRoot = isRoot;
         this.intermediateRepresentation = intermediateRepresentation;
@@ -185,7 +182,6 @@ export class GeneratedSdkClientClassImpl implements GeneratedSdkClientClass {
         this.generateEndpointMetadata = generateEndpointMetadata;
         this.parameterNaming = parameterNaming;
         this.offsetSemantics = offsetSemantics;
-        this.oauthTokenOverride = oauthTokenOverride;
 
         const package_ = packageResolver.resolvePackage(packageId);
         this.package_ = package_;

generators/typescript/sdk/client-class-generator/src/SdkClientClassGenerator.ts

@@ -31,7 +31,6 @@ export declare namespace SdkClientClassGenerator {
         generateEndpointMetadata: boolean;
         parameterNaming: "originalName" | "wireValue" | "camelCase" | "snakeCase" | "default";
         offsetSemantics: "item-index" | "page-index";
-        oauthTokenOverride: boolean;
     }
 
     export namespace generateService {
@@ -69,7 +68,6 @@ export class SdkClientClassGenerator {
     private readonly generateEndpointMetadata: boolean;
     private readonly parameterNaming: "originalName" | "wireValue" | "camelCase" | "snakeCase" | "default";
     private readonly offsetSemantics: "item-index" | "page-index";
-    private readonly oauthTokenOverride: boolean;
 
     constructor({
         intermediateRepresentation,
@@ -95,8 +93,7 @@ export class SdkClientClassGenerator {
         useDefaultRequestParameterValues,
         generateEndpointMetadata,
         parameterNaming,
-        offsetSemantics,
-        oauthTokenOverride
+        offsetSemantics
     }: SdkClientClassGenerator.Init) {
         this.intermediateRepresentation = intermediateRepresentation;
         this.errorResolver = errorResolver;
@@ -122,7 +119,6 @@ export class SdkClientClassGenerator {
         this.generateEndpointMetadata = generateEndpointMetadata;
         this.parameterNaming = parameterNaming;
         this.offsetSemantics = offsetSemantics;
-        this.oauthTokenOverride = oauthTokenOverride;
     }
 
     public generateService({
@@ -158,8 +154,7 @@ export class SdkClientClassGenerator {
             useDefaultRequestParameterValues: this.useDefaultRequestParameterValues,
             generateEndpointMetadata: this.generateEndpointMetadata,
             parameterNaming: this.parameterNaming,
-            offsetSemantics: this.offsetSemantics,
-            oauthTokenOverride: this.oauthTokenOverride
+            offsetSemantics: this.offsetSemantics
         });
     }
 }

generators/typescript/sdk/client-class-generator/src/auth-provider/OAuthAuthProviderGenerator.ts

@@ -11,7 +11,6 @@ export declare namespace OAuthAuthProviderGenerator {
         authScheme: FernIr.OAuthScheme;
         neverThrowErrors: boolean;
         includeSerdeLayer: boolean;
-        oauthTokenOverride: boolean;
     }
 }
 
@@ -42,14 +41,12 @@ export class OAuthAuthProviderGenerator implements AuthProviderGenerator {
     private readonly authScheme: FernIr.OAuthScheme;
     private readonly neverThrowErrors: boolean;
     private readonly includeSerdeLayer: boolean;
-    private readonly oauthTokenOverride: boolean;
 
     constructor(init: OAuthAuthProviderGenerator.Init) {
         this.ir = init.ir;
         this.authScheme = init.authScheme;
         this.neverThrowErrors = init.neverThrowErrors;
         this.includeSerdeLayer = init.includeSerdeLayer;
-        this.oauthTokenOverride = init.oauthTokenOverride;
     }
 
     public getFilePath(): ExportedFilePath {
@@ -134,7 +131,7 @@ export class OAuthAuthProviderGenerator implements AuthProviderGenerator {
     }
 
     public instantiate(constructorArgs: ts.Expression[]): ts.Expression {
-        const hasTokenOverride = this.oauthTokenOverride;
+        const hasTokenOverride = true;
         if (hasTokenOverride) {
             return ts.factory.createCallExpression(
                 ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(CLASS_NAME), "createInstance"),
@@ -146,7 +143,7 @@ export class OAuthAuthProviderGenerator implements AuthProviderGenerator {
     }
 
     public writeToFile(context: SdkContext): void {
-        const hasTokenOverride = this.oauthTokenOverride;
+        const hasTokenOverride = true;
         this.writeClass(context);
         if (hasTokenOverride) {
             this.writeTokenOverrideClass(context);
@@ -219,7 +216,7 @@ export class OAuthAuthProviderGenerator implements AuthProviderGenerator {
             context.genericAPISdkError.getReferenceToGenericAPISdkError().getExpression()
         );
 
-        const hasTokenOverride = this.oauthTokenOverride;
+        const hasTokenOverride = true;
 
         const constructorOptionsType = hasTokenOverride
             ? `${CLASS_NAME}.${OPTIONS_TYPE_NAME} & ${CLASS_NAME}.AuthOptions.ClientCredentials`
@@ -800,7 +797,7 @@ export class OAuthAuthProviderGenerator implements AuthProviderGenerator {
             return;
         }
 
-        const hasTokenOverride = this.oauthTokenOverride;
+        const hasTokenOverride = true;
 
         // Import BaseClientOptions for Options to extend
         // OAuthAuthProvider.Options needs to extend BaseClientOptions because it creates an AuthClient

generators/typescript/sdk/generator/src/SdkGenerator.ts

@@ -160,7 +160,6 @@ export declare namespace SdkGenerator {
         formatter: "prettier" | "biome" | "oxfmt";
         generateSubpackageExports: boolean;
         offsetSemantics: "item-index" | "page-index";
-        oauthTokenOverride: boolean;
     }
 }
 
@@ -378,8 +377,7 @@ export class SdkGenerator {
             requireDefaultEnvironment: config.requireDefaultEnvironment,
             retainOriginalCasing: config.retainOriginalCasing,
             parameterNaming: config.parameterNaming,
-            baseClientTypeDeclarationReferencer: this.baseClientTypeDeclarationReferencer,
-            oauthTokenOverride: config.oauthTokenOverride
+            baseClientTypeDeclarationReferencer: this.baseClientTypeDeclarationReferencer
         });
         this.genericAPISdkErrorDeclarationReferencer = new GenericAPISdkErrorDeclarationReferencer({
             containingDirectory: [],
@@ -473,14 +471,12 @@ export class SdkGenerator {
             useDefaultRequestParameterValues: config.useDefaultRequestParameterValues,
             generateEndpointMetadata: config.generateEndpointMetadata,
             parameterNaming: config.parameterNaming,
-            offsetSemantics: config.offsetSemantics,
-            oauthTokenOverride: config.oauthTokenOverride
+            offsetSemantics: config.offsetSemantics
         });
         this.baseClientTypeGenerator = new BaseClientTypeGenerator({
             ir: intermediateRepresentation,
             generateIdempotentRequestOptions: this.hasIdempotentEndpoints(),
-            omitFernHeaders: config.omitFernHeaders,
-            oauthTokenOverride: config.oauthTokenOverride
+            omitFernHeaders: config.omitFernHeaders
         });
         this.websocketGenerator = new WebsocketClassGenerator({
             intermediateRepresentation,
@@ -528,8 +524,7 @@ export class SdkGenerator {
                 endpointSnippets: this.endpointSnippets,
                 fileResponseType: this.config.fileResponseType,
                 fetchSupport: this.config.fetchSupport,
-                generateSubpackageExports: this.config.generateSubpackageExports,
-                oauthTokenOverride: this.config.oauthTokenOverride
+                generateSubpackageExports: this.config.generateSubpackageExports
             }),
             ir: intermediateRepresentation
         });
@@ -1396,8 +1391,7 @@ export class SdkGenerator {
                     ir: this.intermediateRepresentation,
                     authScheme,
                     neverThrowErrors: this.config.neverThrowErrors,
-                    includeSerdeLayer: this.config.includeSerdeLayer,
-                    oauthTokenOverride: this.config.oauthTokenOverride
+                    includeSerdeLayer: this.config.includeSerdeLayer
                 });
                 if (!authProvidersGenerator.shouldWriteFile()) {
                     continue;
@@ -1416,8 +1410,7 @@ export class SdkGenerator {
                 ir: this.intermediateRepresentation,
                 authScheme: { type: "any" },
                 neverThrowErrors: this.config.neverThrowErrors,
-                includeSerdeLayer: this.config.includeSerdeLayer,
-                oauthTokenOverride: this.config.oauthTokenOverride
+                includeSerdeLayer: this.config.includeSerdeLayer
             });
             this.withSourceFile({
                 filepath: anyAuthProvidersGenerator.getFilePath(),
@@ -1433,8 +1426,7 @@ export class SdkGenerator {
                     ir: this.intermediateRepresentation,
                     authScheme,
                     neverThrowErrors: this.config.neverThrowErrors,
-                    includeSerdeLayer: this.config.includeSerdeLayer,
-                    oauthTokenOverride: this.config.oauthTokenOverride
+                    includeSerdeLayer: this.config.includeSerdeLayer
                 });
                 if (!authProvidersGenerator.shouldWriteFile()) {
                     continue;

generators/typescript/sdk/generator/src/contexts/base-client/BaseClientContextImpl.ts

@@ -22,7 +22,6 @@ export declare namespace BaseClientContextImpl {
         generateIdempotentRequestOptions: boolean;
         parameterNaming: "originalName" | "wireValue" | "camelCase" | "snakeCase" | "default";
         baseClientTypeDeclarationReferencer: BaseClientTypeDeclarationReferencer;
-        oauthTokenOverride: boolean;
     }
 }
 const OPTIONS_INTERFACE_NAME = "BaseClientOptions";
@@ -43,7 +42,6 @@ export class BaseClientContextImpl implements BaseClientContext {
     private readonly parameterNaming: "originalName" | "wireValue" | "camelCase" | "snakeCase" | "default";
     private readonly generateIdempotentRequestOptions: boolean;
     private readonly baseClientTypeDeclarationReferencer: BaseClientTypeDeclarationReferencer;
-    private readonly oauthTokenOverride: boolean;
 
     public static readonly OPTIONS_INTERFACE_NAME = OPTIONS_INTERFACE_NAME;
 
@@ -68,8 +66,7 @@ export class BaseClientContextImpl implements BaseClientContext {
         retainOriginalCasing,
         generateIdempotentRequestOptions,
         parameterNaming,
-        baseClientTypeDeclarationReferencer,
-        oauthTokenOverride
+        baseClientTypeDeclarationReferencer
     }: BaseClientContextImpl.Init) {
         this.intermediateRepresentation = intermediateRepresentation;
         this.allowCustomFetcher = allowCustomFetcher;
@@ -78,7 +75,6 @@ export class BaseClientContextImpl implements BaseClientContext {
         this.generateIdempotentRequestOptions = generateIdempotentRequestOptions;
         this.parameterNaming = parameterNaming;
         this.baseClientTypeDeclarationReferencer = baseClientTypeDeclarationReferencer;
-        this.oauthTokenOverride = oauthTokenOverride;
 
         this.authHeaders = [];
         for (const authScheme of intermediateRepresentation.auth.schemes) {