From 20036807334f44d693a565b0fd33cabeec5b1c12 Mon Sep 17 00:00:00 2001
From: Trezy <tre@trezy.com>
Date: Mon, 11 May 2026 13:50:31 -0500
Subject: [PATCH] fix: restore SDK scopes types after bad conflict resolution

Signed-off-by: Trezy <tre@trezy.com>
---
 packages/oauth-client/src/client.ts  | 6 +++---
 packages/oauth-client/src/session.ts | 6 +++---
 packages/oauth-client/src/types.ts   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/oauth-client/src/client.ts b/packages/oauth-client/src/client.ts
index d4ba498..97bd304 100644
--- a/packages/oauth-client/src/client.ts
+++ b/packages/oauth-client/src/client.ts
@@ -164,7 +164,7 @@ export class HappyViewOAuthClient {
       accessToken: params.accessToken,
       clientKey: this.clientKey,
       instanceUrl: this.instanceUrl,
-      scopes: data.scopes,
+      scopes: params.scopes,
       pdsUrl: params.pdsUrl,
       issuer: params.issuer,
     };
@@ -180,7 +180,7 @@ export class HappyViewOAuthClient {
       accessToken: params.accessToken,
       clientKey: this.clientKey,
       instanceUrl: this.instanceUrl,
-      scopes: data.scopes,
+      scopes: params.scopes,
       pdsUrl: params.pdsUrl,
       issuer: params.issuer,
       fetch: this._fetch,
@@ -232,7 +232,7 @@ export class HappyViewOAuthClient {
       accessToken: data.accessToken,
       clientKey: data.clientKey,
       instanceUrl: data.instanceUrl,
-      scopes: data.scopes ?? [],
+      scopes: data.scopes,
       pdsUrl: data.pdsUrl,
       issuer: data.issuer,
       fetch: this._fetch,
diff --git a/packages/oauth-client/src/session.ts b/packages/oauth-client/src/session.ts
index 53bcbc3..b1e5aa6 100644
--- a/packages/oauth-client/src/session.ts
+++ b/packages/oauth-client/src/session.ts
@@ -7,7 +7,7 @@ export interface HappyViewSessionOptions {
   accessToken: string;
   clientKey: string;
   instanceUrl: string;
-  scopes: string[];
+  scopes?: string;
   pdsUrl?: string;
   issuer?: string;
   fetch?: typeof globalThis.fetch;
@@ -48,12 +48,12 @@ export class HappyViewSession {
 
   constructor(options: HappyViewSessionOptions) {
     this.did = options.did;
-    this.scopes = options.scopes;
+    this.scopes = options.scopes ? options.scopes.split(" ") : [];
     this.dpopKey = options.dpopKey;
     this.accessToken = options.accessToken;
     this.clientKey = options.clientKey;
     this.instanceUrl = options.instanceUrl.replace(/\/+$/, "");
-    this._scopes = options.scopes.join(" ") || undefined;
+    this._scopes = options.scopes;
     this._pdsUrl = options.pdsUrl;
     this._issuer = options.issuer;
     this._fetch = options.fetch ?? ((input: RequestInfo | URL, init?: RequestInit) => fetch(input, init)) as typeof globalThis.fetch;
diff --git a/packages/oauth-client/src/types.ts b/packages/oauth-client/src/types.ts
index 9d1eec9..c893969 100644
--- a/packages/oauth-client/src/types.ts
+++ b/packages/oauth-client/src/types.ts
@@ -46,7 +46,7 @@ export interface StoredSession {
   accessToken: string;
   clientKey: string;
   instanceUrl: string;
-  scopes: string[];
+  scopes?: string;
   pdsUrl?: string;
   issuer?: string;
 }
-- 
2.51.2