Fix: Remove data property from spammer and participation plugin response object (#103)

Author: brancoder

src/app/components/plugins/Participation.tsx

@@ -413,21 +413,16 @@ class Participation extends AsyncComponent<unknown, ParticipationState> {
      */
     private async fetchEvents(): Promise<void> {
         try {
-            const response = await FetchHelper.json<unknown, {
-                data?: IParticipationEvents;
-                error?: {
-                    message: string;
-                };
-            }>(
+            const response = await FetchHelper.json<unknown, IParticipationEvents>(
                 `${window.location.protocol}//${window.location.host}`,
                 "/api/plugins/participation/v1/events",
                 "get",
                 undefined,
                 Participation.buildAuthHeaders());
 
-            if (response?.data?.eventIds) {
+            if (response?.eventIds) {
                 this.setState({
-                    eventIds: response.data.eventIds
+                    eventIds: response.eventIds
                 });
             } else {
                 console.log(response.error);
@@ -443,23 +438,18 @@ class Participation extends AsyncComponent<unknown, ParticipationState> {
      */
     private async fetchEventInfo(id: string): Promise<void> {
         try {
-            const response = await FetchHelper.json<unknown, {
-                data?: IParticipationEventInfo;
-                error?: {
-                    message: string;
-                };
-            }>(
+            const response = await FetchHelper.json<unknown, IParticipationEventInfo>(
                 `${window.location.protocol}//${window.location.host}`,
                 `/api/plugins/participation/v1/events/${id}`,
                 "get",
                 undefined,
                 Participation.buildAuthHeaders());
 
-            if (response.data) {
+            if (!response?.error) {
                 this.setState(prevState => ({
                     events: {
                         ...prevState.events,
-                        [id]: response.data as IParticipationEventInfo
+                        [id]: response
                     }
                 }));
             } else {
@@ -476,27 +466,22 @@ class Participation extends AsyncComponent<unknown, ParticipationState> {
      */
     private async fetchEventStatus(id: string): Promise<void> {
         try {
-            const response = await FetchHelper.json<unknown, {
-                data?: IParticipationEventStatus;
-                error?: {
-                    message: string;
-                };
-            }>(
+            const response = await FetchHelper.json<unknown, IParticipationEventStatus>(
                 `${window.location.protocol}//${window.location.host}`,
                 `/api/plugins/participation/v1/events/${id}/status`,
                 "get",
                 undefined,
                 Participation.buildAuthHeaders());
 
-            if (response.data) {
+            if (!response?.error) {
                 if (this.state.events[id]) {
                     this.setState(prevState => ({
                         ...prevState,
                         events: {
                             ...prevState.events,
                             [id]: {
                                 ...prevState.events[id],
-                                status: response.data
+                                status: response
                             }
                         }
                     }));
@@ -546,20 +531,15 @@ class Participation extends AsyncComponent<unknown, ParticipationState> {
             dialogStatus: "Adding event, please wait..."
         }, async () => {
             try {
-                const response = await FetchHelper.json<unknown, {
-                    data?: IParticipationEvent;
-                    error?: {
-                        message: string;
-                    };
-                }>(
+                const response = await FetchHelper.json<unknown, IParticipationEvent>(
                     `${window.location.protocol}//${window.location.host}`,
                     "/api/plugins/participation/v1/admin/events",
                     "post",
                     eventInfo,
                     Participation.buildAuthHeaders());
 
-                if (response.data) {
-                    const id = response.data.eventId;
+                if (response.eventId) {
+                    const id = response.eventId;
                     this.setState(prevState => ({
                         eventIds: [
                             id,
@@ -640,30 +620,20 @@ class Participation extends AsyncComponent<unknown, ParticipationState> {
      */
     private async fetchEventJsonConfig(url: URL): Promise<IParticipationEventInfo | undefined> {
         try {
-            const response = await FetchHelper.json<unknown, {
-                data?: IParticipationEventInfo;
-                error?: {
-                    message: string;
-                };
-            }>(
+            const response = await FetchHelper.json<unknown, IParticipationEventInfo>(
                 url.origin,
                 url.pathname,
                 "get");
 
-                return (response.data) ? response.data : response as IParticipationEventInfo;
+                return response;
         } catch {
             try {
-                const response = await FetchHelper.text<unknown, {
-                    data?: IParticipationEventInfo;
-                    error?: {
-                        message: string;
-                    };
-                }>(
+                const response = await FetchHelper.text<unknown, IParticipationEventInfo>(
                     url.origin,
                     url.pathname,
                     "get");
 
-                    return (response.data) ? response.data : response as IParticipationEventInfo;
+                    return response;
             } catch (error) {
                 if (error instanceof Error) {
                     this.setState({

src/app/components/plugins/Spammer.tsx

@@ -191,28 +191,24 @@ class Spammer extends AsyncComponent<unknown, SpammerState> {
      */
     private async pluginStatus(): Promise<void> {
         try {
-            const response = await FetchHelper.json<unknown, {
-                data?: ISpammerSettings;
-                error?: {
-                    message: string;
-                };
-            }>(
-                `${window.location.protocol}//${window.location.host}`,
-                "/api/plugins/spammer/v1/status",
-                "get",
-                undefined,
-                Spammer.buildAuthHeaders());
+            const response = await FetchHelper.json<unknown, ISpammerSettings>(
+                    `${window.location.protocol}//${window.location.host}`,
+                    "/api/plugins/spammer/v1/status",
+                    "get",
+                    undefined,
+                    Spammer.buildAuthHeaders()
+                );
 
-            if (response.data) {
+            if (!response?.error) {
                 this.setState({
-                    isRunning: response.data.running,
-                    bps: response.data.bpsRateLimit.toString(),
-                    cpu: (response.data.cpuMaxUsage * 100).toString(),
-                    workers: response.data.spammerWorkers.toString(),
-                    workersMax: response.data.spammerWorkersMax
+                    isRunning: response.running,
+                    bps: response.bpsRateLimit.toString(),
+                    cpu: (response.cpuMaxUsage * 100).toString(),
+                    workers: response.spammerWorkers.toString(),
+                    workersMax: response.spammerWorkersMax
                 });
             } else {
-                console.log(response.error);
+                console.log("loging eror", response.error);
             }
         } catch (err) {
             console.log(err);
@@ -248,12 +244,7 @@ class Spammer extends AsyncComponent<unknown, SpammerState> {
      */
     private async pluginStart(): Promise<void> {
         try {
-            await FetchHelper.json<unknown, {
-                data?: ISpammerSettings;
-                error?: {
-                    message: string;
-                };
-            }>(
+            await FetchHelper.json<unknown, ISpammerSettings>(
                 `${window.location.protocol}//${window.location.host}`,
                 "/api/plugins/spammer/v1/start",
                 "post",
@@ -275,12 +266,7 @@ class Spammer extends AsyncComponent<unknown, SpammerState> {
      */
     private async pluginStop(): Promise<void> {
         try {
-            await FetchHelper.json<unknown, {
-                data?: ISpammerSettings;
-                error?: {
-                    message: string;
-                };
-            }>(
+            await FetchHelper.json<unknown, ISpammerSettings>(
                 `${window.location.protocol}//${window.location.host}`,
                 "/api/plugins/spammer/v1/stop",
                 "post",

src/models/plugins/ISpammerSettings.ts

@@ -23,4 +23,11 @@ export interface ISpammerSettings {
      * The max number of spam workers.
      */
     spammerWorkersMax: number;
+
+    /**
+     * The error messsage.
+     */
+    error?: {
+        message: string;
+    };
 }

src/models/plugins/participation/IParticipationEvent.ts

@@ -3,4 +3,11 @@ export interface IParticipationEvent {
      * The hex encoded ID of the created participation event.
      */
     eventId: string;
+
+    /**
+     * The error message.
+     */
+    error?: {
+        message: string;
+    };
 }

src/models/plugins/participation/IParticipationEventInfo.ts

@@ -37,4 +37,11 @@ export interface IParticipationEventInfo {
      */
     status?: IParticipationEventStatus;
 
+
+    /**
+     * The error message.
+     */
+    error?: {
+        message: string;
+    };
 }

src/models/plugins/participation/IParticipationEventStatus.ts

@@ -23,6 +23,13 @@ export interface IParticipationEventStatus {
      * The SHA256 checksum of all the question and answer status or the staking amount and
      * rewards calculated for this MilestoneIndex.
      */
-     checksum: string;
+    checksum: string;
+
+    /**
+     * The error message.
+     */
+    error?: {
+        message: string;
+    };
 }
 

src/models/plugins/participation/IParticipationEvents.ts

@@ -3,4 +3,11 @@ export interface IParticipationEvents {
      * The hex encoded IDs of the found events.
      */
     eventIds: string[];
+
+    /**
+     * The error message.
+     */
+    error?: {
+        message: string;
+    };
 }