Fixing env variable NAMESPACE on server and change axios base url on client

Author: Anavas09

actions/index.js

@@ -4,7 +4,7 @@ const CancelToken = axios.CancelToken;
 const source = CancelToken.source();
 
 const axiosInstance = axios.create({
-  baseURL: 'http://localhost:3000/api/v1',
+  baseURL: `${process.env.BASE_URL}/api/v1`,
   cancelToken: source.token
 })
 

pages/callback.js

@@ -11,7 +11,7 @@ function CallBack(props) {
   })
 
   return (
-    <BaseLayout>
+    <BaseLayout title="Redirecting...">
       <BasePage>
         <p>VERIFYING DATA ...</p>
       </BasePage>

pages/portfolioNew.js

@@ -44,10 +44,10 @@ function portfolioNew(props) {
         })
         .catch(err => {
           setSubmitting(false);
-          setError(err.message);
+          setError(err);
           Swal.fire(
             'Failed',
-            err.message,
+            err,
             'error'
           );
         });

server/config/prod.js

@@ -3,5 +3,6 @@
 // }
 
 module.exports = {
-    DB_URI : process.env.DB_URI
+    DB_URI : process.env.DB_URI,
+    NAMESPACE: 'https://anavas.herokuapp.com'
 }

server/middlewares/auth.js

@@ -2,7 +2,9 @@ const jwt = require('express-jwt');
 const { expressJwtSecret } = require('jwks-rsa');
 const jwtAuthz = require('express-jwt-authz');
 
-const namespace = process.env.NAMESPACE;
+const config = require('../config');
+
+const namespace = config.NAMESPACE;
 
 //Web token validado
 exports.jwtCheck = jwt({
@@ -23,7 +25,7 @@ exports.checkScopes = jwtAuthz(['read:portfolios'])
 //Check Role
 exports.checkRole = role => (req, res, next) => {
   const user = req.user
-  if(user && (user[`${namespace}/role`] === role)) {
+  if(user && user[`${namespace}/role`] && (user[`${namespace}/role`] === role)) {
     next();
   }else {
     return res.status(401).send({title: 'Not Authorized', detail: 'You are not authorized to access to this data'})