Fix API key not passing through bug

theLAZYmd · Apr 11, 2021 · 214937f · 214937f
1 parent a3d0762
commit 214937f
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 18 deletions.
diff --git a/build/hooks/useEvents.d.ts b/build/hooks/useEvents.d.ts
@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import { CalendarEvent } from '../Event';
 interface EventHookProps {
     calendars: {
@@ -10,6 +11,8 @@ interface EventHookProps {
     events?: {
         [timestamp: number]: CalendarEvent[];
     };
+    APIkey?: string;
+    onError?: (e: AxiosError) => void;
 }
 export default function useEvents(props: EventHookProps): {
     colors: {

diff --git a/build/index.d.ts b/build/index.d.ts
@@ -1,6 +1,7 @@
 import { CalendarSettings } from './interfaces';
 import { CalendarFrameProps } from './Frame';
 import { CalendarEvent } from './Event';
+import { AxiosError } from 'axios';
 export * from './interfaces';
 export * from './Event';
 export * from './Key';
@@ -26,6 +27,7 @@ export interface CalendarProps {
     finish?: Date;
     title?: string;
     timeZone?: string;
+    onError?: (e: AxiosError) => void;
     classNames?: {
         [key: string]: string;
     };

diff --git a/build/index.es.js b/build/index.es.js
diff --git a/build/index.es.js.map b/build/index.es.js.map
diff --git a/lib/hooks/useEvents.d.ts b/lib/hooks/useEvents.d.ts
@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import { CalendarEvent } from '../Event';
 interface EventHookProps {
     calendars: {
@@ -10,6 +11,8 @@ interface EventHookProps {
     events?: {
         [timestamp: number]: CalendarEvent[];
     };
+    APIkey?: string;
+    onError?: (e: AxiosError) => void;
 }
 export default function useEvents(props: EventHookProps): {
     colors: {

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -1,6 +1,7 @@
 import { CalendarSettings } from './interfaces';
 import { CalendarFrameProps } from './Frame';
 import { CalendarEvent } from './Event';
+import { AxiosError } from 'axios';
 export * from './interfaces';
 export * from './Event';
 export * from './Key';
@@ -26,6 +27,7 @@ export interface CalendarProps {
     finish?: Date;
     title?: string;
     timeZone?: string;
+    onError?: (e: AxiosError) => void;
     classNames?: {
         [key: string]: string;
     };

diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactjs-google-calendar",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "A functional calendar renderer for events from a google calendar",
   "main": "./lib/index.js",
   "module": "build/index.es.js",

diff --git a/src/hooks/useEvents.ts b/src/hooks/useEvents.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosResponse } from 'axios';
+import axios, { AxiosError, AxiosResponse } from 'axios';
 import { CalendarSettingsContext } from '../contexts';
 import { CalendarEvent } from '../Event';
 import { useCallback, useContext, useEffect, useState } from 'react';
@@ -16,6 +16,8 @@ interface EventHookProps {
   events?: {
     [timestamp: number]: CalendarEvent[]
   }
+  APIkey?: string
+  onError?: (e: AxiosError) => void
 }
 
 export default function useEvents(props: EventHookProps) {
@@ -40,8 +42,11 @@ export default function useEvents(props: EventHookProps) {
         sanitizeHtml: true,
         timeMin: new Date(props.start).toISOString(), //'2019-10-27T00:00:00Z',
         timeMax: new Date(props.finish || Date.now()).toISOString(), //'2019-12-01T00:00:00Z',
-        key: settings.APIkey
+        key: props.APIkey
       }
+    }).catch((e) => {
+      if (props.onError) props.onError(e);
+      else throw e;
     }) as AxiosResponse<GoogleCalendar>;
     let { data } = res;
     let calendarName = data.summary;

diff --git a/src/index.tsx b/src/index.tsx
@@ -11,6 +11,7 @@ import { useEffect } from 'react';
 import { getEventDate, updateHash } from './utils';
 import { CalendarEvent } from './Event';
 import { useMemo } from 'react';
+import { AxiosError } from 'axios';
 
 export * from './interfaces';
 export * from './Event';
@@ -32,6 +33,7 @@ export interface CalendarProps {
   finish?: Date
   title?: string
   timeZone?: string
+  onError?: (e: AxiosError) => void
 
   classNames?: {[key: string]: string}
   noUpdateHash?: boolean
@@ -77,7 +79,9 @@ export default function Calendar(props: CalendarProps &
     start: props.start,
     finish: props.finish,
     timeZone: props.timeZone,
-    events: props.events
+    events: props.events,
+    APIkey: props.settings?.APIkey,
+    onError: props.onError
   });
 
   return (