Roll back AuthManager change so "auth-success" event gets a dictionar…

…y passed
crowbartools · Jan 2, 2025 · a08f0f2 · a08f0f2
1 parent f0ad816
commit a08f0f2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/backend/auth/auth-manager.ts b/src/backend/auth/auth-manager.ts
@@ -207,7 +207,7 @@ class AuthManager extends TypedEmitter<AuthManagerEvents> {
     }
 
     successfulAuth(providerId: string, tokenData: AuthDetails): void {
-        this.emit("auth-success", providerId, tokenData);
+        this.emit("auth-success", { "providerId": providerId, "tokenData": tokenData});
     }
 }
 

diff --git a/src/backend/auth/auth.d.ts b/src/backend/auth/auth.d.ts
@@ -74,7 +74,7 @@ export interface AuthDetails {
 }
 
 export interface AuthManagerEvents {
-    "auth-success": (providerId: string, tokenData: AuthDetails) => void
+    "auth-success": (data: { providerId: string, tokenData: AuthDetails }) => void
 }
 
 export declare class AuthManager extends TypedEmitter<AuthManagerEvents> {

diff --git a/src/backend/auth/twitch-auth.ts b/src/backend/auth/twitch-auth.ts
@@ -151,7 +151,7 @@ async function getUserCurrent(accessToken: string) {
     return null;
 }
 
-authManager.on("auth-success", async (providerId, tokenData) => {
+authManager.on("auth-success", async ({providerId, tokenData}) => {
 
     if (providerId === twitchAuthProviders.streamerAccountProviderId
         || providerId === twitchAuthProviders.botAccountProviderId) {

diff --git a/src/backend/integrations/integration-manager.ts b/src/backend/integrations/integration-manager.ts
@@ -22,7 +22,7 @@ class IntegrationManager extends TypedEmitter<IntegrationManagerEvents> {
 
     constructor() {
         super();
-        authManager.on("auth-success", (providerId, tokenData) => {
+        authManager.on("auth-success", ({providerId, tokenData}) => {
             const int = this._integrations.find(i => i.definition.linkType === "auth" &&
                 i.definition.authProviderDetails.id === providerId);
             if (int != null) {
@@ -469,8 +469,6 @@ frontEndCommunicator.on("integrationUserSettingsUpdate", (integrationData: Integ
     }
 });
 
-// TODO: The day the frontend is moved to typescript, this arguments list needs to be flattened
-// Having a dict here allows to tell the frontend what goes where for now
 frontEndCommunicator.onAsync<[{ integrationId: string, accountId: string }]>("enteredIntegrationAccountId", async (idData) => {
     const { integrationId, accountId } = idData;
     const int = integrationManager.getIntegrationById(integrationId);
-Original file line number
+Diff line change
@@ Expand Up / @@ -207,7 +207,7 @@ class AuthManager extends TypedEmitter<AuthManagerEvents> { @@
         }
         successfulAuth(providerId: string, tokenData: AuthDetails): void {
-            this.emit("auth-success", providerId, tokenData);
+            this.emit("auth-success", { "providerId": providerId, "tokenData": tokenData});
         }
     }
@@ Expand Down @@