From 54bfb3cd6f16d8689523b64c378eb1deb3fd1721 Mon Sep 17 00:00:00 2001
From: Alan Bridgeman <a.bridgeman@hotmail.com>
Date: Fri, 3 Apr 2026 06:55:03 -0500
Subject: [PATCH] Modified OAuthApp to properly handle additional scopes not
 defined in the auth Scopes enum

---
 src/oauth/OAuthApp.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/oauth/OAuthApp.ts b/src/oauth/OAuthApp.ts
index e928203..ddaa69d 100644
--- a/src/oauth/OAuthApp.ts
+++ b/src/oauth/OAuthApp.ts
@@ -14,7 +14,7 @@ import { HealthCheckableRequestClient } from '../utils/HealthCheckableRequestCli
 
 import type { BridgemanAccessibleAppClaims } from './types/BridgemanAccessibleAppClaims.js';
 
-interface BasicOAuthAppOptions {
+interface BasicOAuthAppOptions<TScopes extends string> {
     // ------------------
     // Basic app metadata
     // ------------------
@@ -39,7 +39,7 @@ interface BasicOAuthAppOptions {
     contacts?: string[],
 
     /** The "available" scopes (scopes an app token COULD ask for - token scopes would have to ask for this or a subset of this list) */
-    scopes?: Scopes[],
+    scopes?: (TScopes | Scopes)[],
 
     // -----------------------------------------------------
     // Optional Mechanical Details (how the OAuth app works)
@@ -98,16 +98,16 @@ interface BasicOAuthAppOptions {
     //addons?: Addon[],
 };
 
-type OAuthAppOptions<T extends BridgemanAccessibleAppClaims> = T & BasicOAuthAppOptions;
+type OAuthAppOptions<T extends BridgemanAccessibleAppClaims, TScopes extends string> = T & BasicOAuthAppOptions<TScopes>;
 
-export class OAuthApp<TCustomClaims extends BridgemanAccessibleAppClaims> extends App {
+export class OAuthApp<TCustomClaims extends BridgemanAccessibleAppClaims, TScopes extends string> extends App {
     private onAuth: OnAuthCallback;
     private saveSecret: (secret: string) => void | Promise<void>;
     private getSecret: () => Promise<string>;
 
-    private options: OAuthAppOptions<TCustomClaims>;
+    private options: OAuthAppOptions<TCustomClaims, TScopes>;
 
-    private client: Client<TCustomClaims>;
+    private client: Client<TCustomClaims, TScopes>;
 
     /**
      * Create a new OAuth app
@@ -158,17 +158,17 @@ export class OAuthApp<TCustomClaims extends BridgemanAccessibleAppClaims> extend
         onAuth: OnAuthCallback, 
         saveSecret: (secret: string) => void | Promise<void>, 
         getSecret: () => Promise<string>,
-        options?: OAuthAppOptions<TCustomClaims>
+        options?: OAuthAppOptions<TCustomClaims, TScopes>
     ) {
         super();
         this.onAuth = onAuth;
         this.saveSecret = saveSecret;
         this.getSecret = getSecret;
-        this.options = options ?? {} as OAuthAppOptions<TCustomClaims>;
+        this.options = options ?? {} as OAuthAppOptions<TCustomClaims, TScopes>;
     }
 
     /** Returns the OAuthApp's Client instance (which is useful for managing keys, creating resource request, etc...) */
-    getClient(): Client<TCustomClaims> {
+    getClient(): Client<TCustomClaims, TScopes> {
         return this.client;
     }
 
@@ -200,7 +200,7 @@ export class OAuthApp<TCustomClaims extends BridgemanAccessibleAppClaims> extend
             .getRouter()
             .addOutsideFrameworkRoute(BaseKeystore.WELL_KNOWN_URI);
 
-        this.client = await Client.setup<TCustomClaims>(
+        this.client = await Client.setup<TCustomClaims, TScopes>(
             app.getExpressApp(), 
             baseAppUrl, 
             this.onAuth, 
@@ -322,7 +322,7 @@ export class OAuthApp<TCustomClaims extends BridgemanAccessibleAppClaims> extend
      * 
      * @param app The Express app object (that is now listening)
      */
-    private async onStart(app: App, callback?: (app: OAuthApp<TCustomClaims>) => void | Promise<void>) {
+    private async onStart(app: App, callback?: (app: OAuthApp<TCustomClaims, TScopes>) => void | Promise<void>) {
         try {
             // Setup the OAuth client.
             // This is done here because we need the client to be serving/listening for requests for the auth library stuff to work 
@@ -350,7 +350,7 @@ export class OAuthApp<TCustomClaims extends BridgemanAccessibleAppClaims> extend
      * And doesn't have to worry about the OAuth details to make this work.
      * Though it does provide tweaking the OAuth details via options provided to the constructor.
      */
-    async run<T extends Initializer>(initializer?: T, callback?: (app: OAuthApp<TCustomClaims>) => void | Promise<void>) {
+    async run<T extends Initializer>(initializer?: T, callback?: (app: OAuthApp<TCustomClaims, TScopes>) => void | Promise<void>) {
         await super.run(initializer, async (app: App) => this.onStart(app, callback));
     }
 }
\ No newline at end of file