Skip to content

encode state in /callback #2

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

Merged
merged 1 commit into from
May 7, 2025
Merged

encode state in /callback #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Props } from './utils';
import { parseRedirectApproval, renderApprovalDialog } from './oauth-manager/oauth-utils';
import { renderTokenCallback } from './oauth-manager/token-utils';
import { any } from 'zod';
import { encodeBase64, decodeBase64 } from 'hono/utils/encode';


const app = new Hono<{ Bindings: Env & { OAUTH_PROVIDER: OAuthHelpers } }>()
Expand Down Expand Up @@ -54,7 +55,8 @@ app.post("/authorize", async (c) => {
// The callback endpoint will get the encrypted token and decrypt it to get the user's access token.
const targetURLPath = new URL("/callback", c.req.url);
targetURLPath.searchParams.append('instanceUrl', instanceUrl);
targetURLPath.searchParams.append('oauthReqInfo', JSON.stringify(state.oauthReqInfo));
const encodedState = btoa(JSON.stringify(state.oauthReqInfo));
targetURLPath.searchParams.append('oauthReqInfo', encodedState);
redirectUrl.searchParams.append('targetURLPath', targetURLPath.href);
console.log("redirectUrl", redirectUrl.toString());

Expand All @@ -63,15 +65,15 @@ app.post("/authorize", async (c) => {

app.get("/callback", async (c) => {
const instanceUrl = c.req.query('instanceUrl');
const oauthReqInfo = c.req.query('oauthReqInfo');
const encodedOauthReqInfo = c.req.query('oauthReqInfo');
if (!instanceUrl) {
return c.text('Missing instance URL', 400);
}
if (!oauthReqInfo) {
if (!encodedOauthReqInfo) {
return c.text('Missing OAuth request info', 400);
}

return new Response(renderTokenCallback(instanceUrl, oauthReqInfo), {
const decodedOAuthReqInfo = JSON.parse(atob(encodedOauthReqInfo));
return new Response(renderTokenCallback(instanceUrl, decodedOAuthReqInfo), {
headers: {
'Content-Type': 'text/html',
},
Expand All @@ -84,8 +86,6 @@ app.post("/store-token", async (c) => {
return c.text('Missing token or OAuth request info or instanceUrl', 400);
}

console.log('Token received and stored', token);

// Complete the authorization with the provided information
const { redirectTo } = await c.env.OAUTH_PROVIDER.completeAuthorization({
request: oauthReqInfo,
Expand All @@ -95,7 +95,7 @@ app.post("/store-token", async (c) => {
},
scope: oauthReqInfo.scope,
props: {
accessToken: token.token,
accessToken: token.data.token,
instanceUrl: instanceUrl,
} as Props,
});
Expand Down