Skip to content

Tcd/ui shell test #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Tcd/ui shell test #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb9100f
miscellaneous tweaks to support the ui-shell-service implementation; not
timdoherty Nov 22, 2019
eaa7849
use env variable for auth redirect; use env vars for token redirect when
timdoherty Nov 23, 2019
346e688
remove router test; reformat redirect
timdoherty Nov 23, 2019
46dde1f
add more robust check for localhost on auth token redirect
timdoherty Nov 25, 2019
d92fb0b
checkpoint
timdoherty Feb 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM node:12.13.0-alpine as builder
RUN apk add yarn
RUN apk add git
WORKDIR /app
COPY . ./
RUN yarn --pure-lockfile

CMD yarn start

4 changes: 0 additions & 4 deletions packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
"format": "prettier --config ./../../prettier.config.js --write **/*.{js,jsx}"
},
"dependencies": {
"@hapi/cookie": "10.1.2",
"@hapi/hapi": "18.4.0",
"@hapi/inert": "5.2.2",
"@hapi/vision": "5.5.4",
"@procore/js-sdk": "2.3.0",
"cookie-parser": "1.4.4",
"cookie-session": "1.3.3",
Expand Down
63 changes: 45 additions & 18 deletions packages/server/src/routes/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,60 @@ export const authRouter = Router();

authRouter.get('/', (_req, res) => {
return res.redirect(
authorize({
clientId: process.env.CLIENT_ID,
uri: process.env.REDIRECT_URL,
})
authorize(
{
clientId: process.env.CLIENT_ID,
uri: process.env.REDIRECT_URL,
},
process.env.PROCORE_SERVER
)
);
});

authRouter.get('/callback', async (req, res) => {
const account = await token({
id: process.env.CLIENT_ID,
secret: process.env.CLIENT_SECRET,
uri: process.env.REDIRECT_URL,
code: req.query.code,
});
console.log({ callBackHeaders: req.headers });
const account = await token(
{
id: process.env.CLIENT_ID,
secret: process.env.CLIENT_SECRET,
uri: process.env.REDIRECT_URL,
code: req.query.code,
},
process.env.PROCORE_SERVER
);
console.log({ account });
req.session.accessToken = account.access_token;
req.session.refreshToken = account.refresh_token;
return res.redirect('/');
let redirect = '/';
const isLocalhost = Boolean(
process.env.HOSTNAME === 'localhost' ||
// [::1] is the IPv6 localhost address.
process.env.HOSTNAME === '[::1]' ||
// 127.0.0.0/8 are considered localhost for IPv4.
process.env.HOSTNAME.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
);
if (!isLocalhost) {
const protocol = process.env.PROTOCOL || 'http';
const host = process.env.HOSTNAME;
const path = process.env.ROOT_PATH || '/';
redirect = `${protocol}://${host}${path}`;
}
return res.redirect(redirect);
});

authRouter.post('/refresh', async (req, res) => {
const account = await refresh({
id: process.env.CLIENT_ID,
secret: process.env.CLIENT_SECRET,
uri: process.env.REDIRECT_URL,
token: req.session.accessToken,
refresh: req.session.refreshToken,
});
const account = await refresh(
{
id: process.env.CLIENT_ID,
secret: process.env.CLIENT_SECRET,
uri: process.env.REDIRECT_URL,
token: req.session.accessToken,
refresh: req.session.refreshToken,
},
process.env.PROCORE_SERVER
);
req.session.accessToken = account.access_token;
req.session.refreshToken = account.refresh_token;
res.json(account);
Expand Down
Loading