diff --git a/api/src/api.ts b/api/src/api.ts index d0aa0ff..d88324d 100644 --- a/api/src/api.ts +++ b/api/src/api.ts @@ -104,11 +104,11 @@ export default function createApi(log: Log, pg: Pg, discogs) { }); } - app.use(cors({ origin: false, credentials: true })); + app.use(cors({ credentials: true })); app.use(bodyParser()) app.keys = [SECRET]; - app.use(session(app)); + app.use(session({ sameSite: 'None' }, app)); const { authRouter, passport } = routerAuth(log, pg); app.use(passport.initialize()); @@ -120,7 +120,6 @@ export default function createApi(log: Log, pg: Pg, discogs) { }); async function requireAuth(ctx, next) { - log.warn(ctx.isAuthenticated()); await next(); } diff --git a/client/src/actions.ts b/client/src/actions.ts index d054e4e..048e938 100644 --- a/client/src/actions.ts +++ b/client/src/actions.ts @@ -1,25 +1,36 @@ import axios from 'axios'; -const API_URL = 'http://localhost:41337'; - -axios.defaults.withCredentials = true; -axios.defaults.crossDomain = true; +const api = axios.create({ + baseURL: 'http://localhost:41337', + withCredentials: true +}); const actions = { getBundles: async () => { - const { data: bundles } = await axios.get(`${API_URL}/bundles`); + const res = await api.get('/bundles'); + const { data: bundles } = res; + console.log(res); return bundles; }, getUserOffers: async (state, userId) => { - const { data: offers } = await axios.get(`${API_URL}/user/${userId}/offers`); + const { data: offers } = await api.get(`/user/${userId}/offers`); return offers; }, getOffers: async (userId) => { - const { data } = await axios.get(`${API_URL}/user/${userId}/offers`); + const { data } = await api.get(`/user/${userId}/offers`); return data; }, + + postLogin: async (email, password) => { + const res = await api.post('/auth/login', { + email, + password, + }); + + return res.data; + }, }; export default actions; diff --git a/client/src/routes/login.tsx b/client/src/routes/login.tsx index cf699b4..cb39bd9 100644 --- a/client/src/routes/login.tsx +++ b/client/src/routes/login.tsx @@ -1,17 +1,13 @@ import { h } from 'preact'; import { useState, useEffect } from 'preact/hooks'; -import axios from 'axios'; +import actions from './../actions'; const Register = () => { const [email, setEmail] = useState('') const [password, setPassword] = useState(''); async function postLogin() { - const { data } = await axios.post(`http://localhost:41337/auth/login`, { - email, - password, - }); - console.log(data); + actions.postLogin(email, password); } function handleSubmit(e) { diff --git a/docker-compose.yaml b/docker-compose.yaml index f57a271..783dcc4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,6 +12,15 @@ services: volumes: - "./db:/var/lib/postgresql/data" + pg-test: + image: postgres:latest + environment: + POSTGRES_USER: 'mcrates' + POSTGRES_DB: 'test' + POSTGRES_PASSWORD: 'digdeep' + ports: + - '55432:5432' + # api: # image: node:16 # working_dir: /opt/mcrates/api