Skip to content

Commit

Permalink
fix: use SWA_EMU_AUTH_URI for all routes
Browse files Browse the repository at this point in the history
  • Loading branch information
manekinekko committed Jul 1, 2020
1 parent 53d1c85 commit 0054139
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 12 deletions.
3 changes: 2 additions & 1 deletion app_auth_login_provider/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
const { response } = require("../src/utils");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `//localhost:4242`;

module.exports = async function (context, req) {
const { provider } = context.bindingData;
const { post_login_redirect_uri } = req.query;

const location = `//localhost:4242/.redirect/${provider}?hostName=localhost&staticWebAppsAuthNonce=${context.invocationId}`;
const location = `${SWA_EMU_AUTH_URI}/.redirect/${provider}?hostName=localhost&staticWebAppsAuthNonce=${context.invocationId}`;
context.res = response({
context,
status: 302,
Expand Down
3 changes: 2 additions & 1 deletion app_auth_logout/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { response, validateCookie } = require("../src/utils");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `//localhost:4242`;

module.exports = async function (context, req) {
const cookie = req.headers.cookie;
Expand Down Expand Up @@ -26,7 +27,7 @@ module.exports = async function (context, req) {
},
],
headers: {
location: `//localhost:4242/.redirect/logout?hostName=localhost`,
location: `${SWA_EMU_AUTH_URI}/.redirect/logout?hostName=localhost`,
},
});
};
5 changes: 3 additions & 2 deletions identity_auth_login_done/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { response } = require("../src/utils");
const jwt = require("jsonwebtoken");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `//localhost:4242`;

const jwtKey = "123";
const jwtExpirySeconds = 300;
Expand Down Expand Up @@ -32,15 +33,15 @@ module.exports = async function (context, req) {
value: "deleted",
path: "/",
domain: "localhost",
}
},
],
headers: {
"Content-Type": "text/html",
status: 200,
},
body: `
<title>Working...</title>
<form id="f" method="POST" action="http://localhost:4242/app/.auth/complete">
<form id="f" method="POST" action="${SWA_EMU_AUTH_URI}/app/.auth/complete">
<input type="hidden" name="user_login_jwt" value="${user_login_jwt}" />
<noscript>
<p>Script is disabled.Click Submit to continue.</p>
Expand Down
5 changes: 2 additions & 3 deletions identity_auth_login_provider/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
const { response } = require("../src/utils");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `http://localhost:4242`;

module.exports = async function (context, req) {
const { provider } = context.bindingData;
const { post_login_redirect_uri } = req.query;

const redirect_uri = `http://localhost:4242/.auth/login/${provider}/callback&state=${encodeURIComponent(
`redir=${post_login_redirect_uri}&nonce=${context.invocationId}`
)}`;
const redirect_uri = `${SWA_EMU_AUTH_URI}/.auth/login/${provider}/callback&state=${encodeURIComponent(`redir=${post_login_redirect_uri}&nonce=${context.invocationId}`)}`;

const client_id = process.env.GITHUB_CLIENT_ID;
const location = `https://github.com/login/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}`;
Expand Down
3 changes: 2 additions & 1 deletion identity_auth_login_provider_callback/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { response } = require("../src/utils");
const { default: fetch } = require("node-fetch");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `//localhost:4242`;

module.exports = async function (context, req) {
let { state, code } = req.query;
Expand All @@ -19,7 +20,7 @@ module.exports = async function (context, req) {
const token = await githubOauthResponse.json();
console.log(JSON.stringify(token));

const location = "//localhost:4242/.auth/login/done";
const location = `${SWA_EMU_AUTH_URI}/.auth/login/done`;
context.res = response({
context,
status: 302,
Expand Down
3 changes: 2 additions & 1 deletion identity_auth_logout/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { response } = require("../src/utils");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `http://localhost:4242`;

module.exports = async function (context, req) {
context.res = response({
Expand All @@ -15,7 +16,7 @@ module.exports = async function (context, req) {
},
],
headers: {
location: `http://localhost:4242/.auth/logout/complete`,
location: `${SWA_EMU_AUTH_URI}/.auth/logout/complete`,
},
});
};
3 changes: 2 additions & 1 deletion identity_auth_logout_complete/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const { response } = require("../src/utils");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `//localhost:4242`;

module.exports = async function (context, req) {
const location = `//localhost:4242/app/.auth/logout/complete`;
const location = `${SWA_EMU_AUTH_URI}/app/.auth/logout/complete`;

context.res = response({
context,
Expand Down
3 changes: 2 additions & 1 deletion identity_redirect_logout/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const { response } = require("../src/utils");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `//localhost:4242`;

module.exports = async function (context, req) {
const { hostName, post_logout_redirect_uri = "/" } = req.query;

const location = `//localhost:4242/.auth/logout?post_login_redirect_uri=${post_logout_redirect_uri}`;
const location = `${SWA_EMU_AUTH_URI}/.auth/logout?post_login_redirect_uri=${post_logout_redirect_uri}`;

context.res = response({
context,
Expand Down
3 changes: 2 additions & 1 deletion identity_redirect_provider/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
const { response } = require("../src/utils");
const SWA_EMU_AUTH_URI = process.env.SWA_EMU_AUTH_URI || `//localhost:4242`;

module.exports = async function (context, req) {
const { provider } = context.bindingData;
const { hostName, post_login_redirect_uri = "/.auth/login/done" } = req.query;

const location = `//localhost:4242/.auth/login/${provider}?post_login_redirect_uri=${post_login_redirect_uri}`;
const location = `${SWA_EMU_AUTH_URI}/.auth/login/${provider}?post_login_redirect_uri=${post_login_redirect_uri}`;

context.res = response({
context,
Expand Down

0 comments on commit 0054139

Please sign in to comment.