Sign up to event

src/fetching/deleteEventResponse.ts

@@ -1,26 +1,20 @@
 import apiUrl from '../utils/apiUrl';
-
 import { ZetkinMembership } from '../types/zetkin';
 
-function defaultFetch(path : string, init? : RequestInit) {
-    const url = apiUrl(path);
-    return fetch(url, init);
-}
-
 interface MutationVariables {
     eventId: number;
     orgId: number;
 }
 
-export default function deleteEventResponse(fetch = defaultFetch) {
+export default function deleteEventResponse() {
     return async ({ eventId, orgId } : MutationVariables) : Promise<void> => {
-        const mRes = await fetch('/users/me/memberships');
+        const mRes = await fetch(apiUrl('/users/me/memberships'));
         const mData = await mRes.json();
         //TODO: Memberships should be cached.
         const orgMembership = mData.data.find((m : ZetkinMembership ) => m.organization.id === orgId);
 
         if (orgMembership) {
-            await fetch(`/orgs/${orgId}/actions/${eventId}/responses/${orgMembership.profile.id}`, {
+            await fetch(apiUrl(`/orgs/${orgId}/actions/${eventId}/responses/${orgMembership.profile.id}`), {
                 method: 'DELETE',
             });
         }

src/fetching/getEvent.ts

@@ -1,11 +1,6 @@
-import apiUrl from '../utils/apiUrl';
+import { defaultFetch } from '.';
 import { ZetkinEvent } from '../interfaces/ZetkinEvent';
 
-function defaultFetch(path : string, init? : RequestInit) {
-    const url = apiUrl(path);
-    return fetch(url, init);
-}
-
 export default function getEvent(orgId : string, eventId : string, fetch = defaultFetch) {
     return async () : Promise<ZetkinEvent> => {
         const cRes = await fetch(`/orgs/${orgId}/campaigns`);

src/fetching/getEventResponses.ts

@@ -1,12 +1,6 @@
-import apiUrl from '../utils/apiUrl';
-
+import { defaultFetch } from '.';
 import { ZetkinEventResponse } from '../types/zetkin';
 
-function defaultFetch(path : string, init? : RequestInit) {
-    const url = apiUrl(path);
-    return fetch(url, init);
-}
-
 export default function getEventResponses(fetch = defaultFetch) {
     return async () : Promise<ZetkinEventResponse[]> => {
         const rRes = await fetch('/users/me/action_responses');

src/fetching/getEvents.ts

@@ -1,11 +1,6 @@
-import apiUrl from '../utils/apiUrl';
+import { defaultFetch } from '.';
 import { ZetkinEvent } from '../interfaces/ZetkinEvent';
 
-function defaultFetch(path : string, init? : RequestInit) {
-    const url = apiUrl(path);
-    return fetch(url, init);
-}
-
 export default function getEvents(orgId : string, fetch = defaultFetch) {
     return async () : Promise<ZetkinEvent[]> => {
         const cRes = await fetch(`/orgs/${orgId}/campaigns`);

src/fetching/getOrg.ts

@@ -1,12 +1,6 @@
-import apiUrl from '../utils/apiUrl';
-
+import { defaultFetch } from '.';
 import { ZetkinOrganization } from '../interfaces/ZetkinOrganization';
 
-function defaultFetch(path : string, init? : RequestInit) {
-    const url = apiUrl(path);
-    return fetch(url, init);
-}
-
 export default function getOrg(orgId : string, fetch = defaultFetch) {
     return async () : Promise<ZetkinOrganization> => {
         const oRes = await fetch(`/orgs/${orgId}`);

src/fetching/index.ts

@@ -0,0 +1,6 @@
+import apiUrl from '../utils/apiUrl';
+
+export function defaultFetch(path : string, init? : RequestInit) : Promise<Response> {
+    const url = apiUrl(path);
+    return fetch(url, init);
+}

src/fetching/putEventResponse.ts

@@ -1,26 +1,20 @@
 import apiUrl from '../utils/apiUrl';
-
 import { ZetkinEventResponse, ZetkinMembership } from '../types/zetkin';
 
-function defaultFetch(path : string, init? : RequestInit) {
-    const url = apiUrl(path);
-    return fetch(url, init);
-}
-
 interface MutationVariables {
     eventId: number;
     orgId: number;
 }
 
-export default function putEventResponse(fetch = defaultFetch) {
+export default function putEventResponse() {
     return async ({ eventId, orgId } : MutationVariables) : Promise<ZetkinEventResponse> => {
-        const mRes = await fetch('/users/me/memberships');
+        const mRes = await fetch(apiUrl('/users/me/memberships'));
         const mData = await mRes.json();
         //TODO: Memberships should be cached.
         const orgMembership = mData.data.find((m : ZetkinMembership ) => m.organization.id === orgId);
 
         if (orgMembership) {
-            const eventRes = await fetch(`/orgs/${orgId}/actions/${eventId}/responses/${orgMembership.profile.id}`, {
+            const eventRes = await fetch(apiUrl(`/orgs/${orgId}/actions/${eventId}/responses/${orgMembership.profile.id}`), {
                 method: 'PUT',
             });
             const eventResData = await eventRes.json();

src/utils/next.ts

@@ -7,7 +7,7 @@ import { AppSession } from '../types';
 import { getMessages } from './locale';
 import stringToBool from './stringToBool';
 import { ZetkinUser } from '../interfaces/ZetkinUser';
-import { ZetkinZ, ZetkinZResult } from '../types/sdk';
+import { ZetkinZ } from '../types/sdk';
 
 //TODO: Create module definition and revert to import.
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -26,7 +26,7 @@ export type ScaffoldedProps = RegularProps & {
 
 export type ScaffoldedContext = GetServerSidePropsContext & {
     apiFetch: (path : string, init? : RequestInit) => Promise<Response>;
-    user: ZetkinZResult | null;
+    user: unknown;
     z: ZetkinZ;
 };
 
@@ -76,7 +76,8 @@ export const scaffold = (wrapped : ScaffoldedGetServerSideProps, options? : Scaf
         }
 
         try {
-            ctx.user = await ctx.z.resource('users', 'me').get();
+            const user = await ctx.z.resource('users', 'me').get();
+            ctx.user = user.data.data;
         }
         catch (error) {
             ctx.user = null;
@@ -104,8 +105,7 @@ export const scaffold = (wrapped : ScaffoldedGetServerSideProps, options? : Scaf
         };
 
         try {
-            const user = await ctx.z.resource('users', 'me').get();
-            augmentProps(user.data.data as ZetkinUser);
+            augmentProps(ctx.user as ZetkinUser);
         }
         catch (error) {
             augmentProps(null);