chore: remove AuthorizationHeader

jason71708 · May 19, 2023 · 338ffcc · 338ffcc
1 parent eab556d
commit 338ffcc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 51 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -21,8 +21,8 @@ function App() {
   return (
     <BrowserRouter basename={
       process.env.NODE_ENV === 'production' ?
-      '/F2E2021-taiwan-tourist-attractions' :
-      '/'
+        process.env.REACT_APP_GITHUB_PAGE_PATH :
+        '/'
     }>
       <AppWrapper>
         <MainHeader />
@@ -31,7 +31,7 @@ function App() {
           <Route path={Paths.ScenicSpots} element={<ScenicSpotsPage />}></Route>
           <Route path={Paths.Accommodations} element={<RestaurantsPage />}></Route>
           {/* <Route path={Paths.Traffic} element={<div>3</div>}></Route> */}
-          <Route path="*" element={<ProblemPlaceholder problem={Problems.PageNotFound}/>} />
+          <Route path="*" element={<ProblemPlaceholder problem={Problems.PageNotFound} />} />
         </Routes>
         <Footer />
       </AppWrapper>

diff --git a/src/api/utils.ts b/src/api/utils.ts
@@ -1,26 +1,11 @@
-import jsSHA from 'jssha'
 import { TDXAPIParameters } from './types'
 
-export const getAuthorizationHeader = () => {
-  const UTCTime = new Date().toUTCString()
-  const ShaObj = new jsSHA('SHA-1', 'TEXT')
-  ShaObj.setHMACKey(process.env.REACT_APP_TDX_APP_KEY || '', 'TEXT')
-  ShaObj.update('x-date: ' + UTCTime)
-  let HMAC = ShaObj.getHMAC('B64')
-  let Authorization = 'hmac username="' + process.env.REACT_APP_TDX_APP_ID + '", algorithm="hmac-sha1", headers="x-date", signature="' + HMAC + '"'
-  return {
-    Authorization,
-    'X-Date': UTCTime
-  } 
-}
-
 // Force to have `Name` and `Picture.PictureUrl1` fields
 export const getPathWithQueryString = (path: string, { limit = 600, keywords, city }: TDXAPIParameters, nameField: string) => {
-  const filter = `Picture/PictureUrl1 ne null and ${nameField} ne null${
-    keywords
+  const filter = `Picture/PictureUrl1 ne null and ${nameField} ne null${keywords
       ? ` and (contains(${nameField}, '${keywords}') or contains(Description, '${keywords}'))`
       : ""
-  }`;
+    }`;
   const top = `&$top=${limit}`
   return `${path}${city ? '/' + city : ''}?$filter=${filter}${top}&$format=JSON`
 }
diff --git a/src/store/sagas/activitiesSaga.ts b/src/store/sagas/activitiesSaga.ts
@@ -8,13 +8,8 @@ import {
 import { activityTypes } from '../actions/activities/type'
 import { TDXAPIParameters } from '../../api/types'
 import { getPathWithQueryString } from '../../api/utils'
-import { getAuthorizationHeader } from '../../api/utils'
 
-const fetchActivities = (parameters: TDXAPIParameters) => (
-  tdxAPI.get<ActivityTourismInfo>(getPathWithQueryString('/v2/Tourism/Activity', parameters, 'ActivityName'), {
-    headers: getAuthorizationHeader()
-  })
-)
+const fetchActivities = (parameters: TDXAPIParameters) => tdxAPI.get<ActivityTourismInfo>(getPathWithQueryString('/v2/Tourism/Activity', parameters, 'ActivityName'))
 
 function* fetchActivitiesSaga(parameters: TDXAPIParameters) {
   try {

diff --git a/src/store/sagas/hotelsSaga.ts b/src/store/sagas/hotelsSaga.ts
@@ -8,15 +8,8 @@ import {
 import { hotelTypes } from '../actions/hotels/type'
 import { TDXAPIParameters } from '../../api/types'
 import { getPathWithQueryString } from '../../api/utils'
-import { getAuthorizationHeader } from '../../api/utils'
 
-const fetchHotels = (parameters: TDXAPIParameters) =>
-  tdxAPI.get<HotelTourismInfo>(
-    getPathWithQueryString('/v2/Tourism/Hotel', parameters, 'HotelName'),
-    {
-      headers: getAuthorizationHeader(),
-    }
-  );
+const fetchHotels = (parameters: TDXAPIParameters) => tdxAPI.get<HotelTourismInfo>(getPathWithQueryString('/v2/Tourism/Hotel', parameters, 'HotelName'));
 
 function* fetchHotelsSaga(parameters: TDXAPIParameters) {
   try {

diff --git a/src/store/sagas/restaurantsSaga.ts b/src/store/sagas/restaurantsSaga.ts
@@ -8,15 +8,8 @@ import {
 import { restaurantTypes } from '../actions/restaurants/type'
 import { TDXAPIParameters } from '../../api/types'
 import { getPathWithQueryString } from '../../api/utils'
-import { getAuthorizationHeader } from '../../api/utils'
 
-const fetchRestaurants = (parameters: TDXAPIParameters) =>
-  tdxAPI.get<RestaurantTourismInfo>(
-    getPathWithQueryString('/v2/Tourism/Restaurant', parameters, 'RestaurantName'),
-    {
-      headers: getAuthorizationHeader(),
-    }
-  );
+const fetchRestaurants = (parameters: TDXAPIParameters) => tdxAPI.get<RestaurantTourismInfo>(getPathWithQueryString('/v2/Tourism/Restaurant', parameters, 'RestaurantName'));
 
 function* fetchRestaurantsSaga(parameters: TDXAPIParameters) {
   try {

diff --git a/src/store/sagas/scenicSpotsSaga.ts b/src/store/sagas/scenicSpotsSaga.ts
@@ -8,16 +8,8 @@ import {
 import { scenicSpotTypes } from '../actions/scenicSpots/type'
 import { TDXAPIParameters } from '../../api/types'
 import { getPathWithQueryString } from '../../api/utils'
-import { getAuthorizationHeader } from '../../api/utils'
 
-const fetchScenicSpots = (parameters: TDXAPIParameters) => {
-  return tdxAPI.get<ScenicSpotTourismInfo>(
-    getPathWithQueryString('/v2/Tourism/ScenicSpot', parameters, 'ScenicSpotName'),
-    {
-      headers: getAuthorizationHeader(),
-    }
-  );
-}
+const fetchScenicSpots = (parameters: TDXAPIParameters) => tdxAPI.get<ScenicSpotTourismInfo>(getPathWithQueryString('/v2/Tourism/ScenicSpot', parameters, 'ScenicSpotName'));
 
 function* fetchScenicSpotsSaga(parameters: TDXAPIParameters) {
   try {