Merge pull request #6 from appirio-tech/feature/jwt-token-middleware

Feature/jwt token middleware

Author: vikasrohit

src/components/AuthenticatedComponent.jsx

@@ -20,7 +20,8 @@ export function requiresAuthentication(Component) {
     checkAuth() {
       getFreshToken().then(() => {
         this.setState({isLoggedIn: true})
-      }).catch(() => {
+      }).catch((error) => {
+        console.log(error)
         // FIXME should we include hash, search etc
         const redirectBackToUrl = window.location.origin + '/' + this.props.location.pathname
         const newLocation = ACCOUNTS_APP_LOGIN_URL + '?retUrl=' + redirectBackToUrl

src/config/store.js

@@ -1,7 +1,7 @@
 import thunk from 'redux-thunk'
 import { createStore, applyMiddleware, compose } from 'redux'
 import reducers from '../reducers'
-import apiMiddleware from './apiMiddleware'
+import apiMiddleware from '../middleware/apiMiddleware'
 // import jwt from '../middleware/jwt'
 
 

src/config/apiMiddleware.js src/middleware/apiMiddleware.jssrc/config/apiMiddleware.js renamed to src/middleware/apiMiddleware.js

@@ -1,13 +1,13 @@
 function apiMiddleware({ dispatch, getState }) {
   return next => action => {
     console.log(dispatch)
-    console.log(next)
+    // console.log(next)
     const {
       API_CALL
       // payload = {}
     } = action
     if (!API_CALL) {
-      return //next(action)
+      return next(action)
     }
 
     // const config = action[API_CALL]

src/projects/list/actions/loadProjects.js

@@ -15,7 +15,10 @@ export function loadProjects(searchTerm) {
       api : projectService,
       method: 'getProjects',
       args: {searchTerm},
-      success : () => { console.log('dispatch success action') },
+      success : (resp) => {
+        console.log('dispatch success action')
+        console.log(resp)
+      },
       failure : () => { console.log('dispatch failure action') }
     }
   }
@@ -53,4 +56,4 @@ export function projectSuggestions(searchTerm) {
     })
 
   })
-}
+}

src/services/baseService.js

@@ -0,0 +1,25 @@
+class BaseService {
+  constructor() {
+    this.token = null
+  }
+
+  setToken(token) {
+    this.token = token
+  }
+
+  getToken() {
+    return this.token
+  }
+
+  getOptions(requiresAuth) {
+    const options = {}
+    const myHeaders = new Headers()
+    if (requiresAuth) {
+      myHeaders.append('Authorization', 'Basic ' + this.token) //TODO use constants
+    }
+    options.headers = myHeaders
+    return options
+  }
+}
+
+export default BaseService

src/services/projectService.js

@@ -1,10 +1,11 @@
-// import _ from 'lodash'
+import BaseService from './baseService'
 import { fetchJSON } from '../helpers'
 
-class ProjectService {
+class ProjectService extends BaseService {
   constructor() {
-    this.token = null
-    // this.getProjects = getProjects.bind(this)
+    super()
+    this.getProjects = this.getProjects.bind(this)
+    this.getOptions = this.getOptions.bind(this)
   }
 
   requiresAuth(methodName) {
@@ -14,29 +15,12 @@ class ProjectService {
     return false
   }
 
-  setToken(token) {
-    this.token = token
-  }
-
-  getToken() {
-    return this.token
-  }
-
   getProjects(searchTerm) {
-    const options = this.getOptions()
+    console.log(searchTerm)
+    const options = this.getOptions(true)
     options.method = 'GET' //TODO use constants
-    return fetchJSON('http://api.topcoder-dev.com/v4/projects?q=' + searchTerm, options)
-  }
-
-  getOptions(requiresAuth) {
-    const options = {}
-    const myHeaders = new Headers()
-    if (requiresAuth) {
-      myHeaders.append('Authorization', 'Basic ' + this.token) //TODO use constants
-    }
-    options.headers = myHeaders
-    return options
+    return fetchJSON('https://api.topcoder-dev.com/v3/challenges/', options)
   }
 }
 
-export default new ProjectService()
+export default new ProjectService()