Skip to content

PR fixes#513

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

Open
mzhang0213 wants to merge 1 commit into
base:dev
Choose a base branch
from
Open

PR fixes #513

Show file tree
Hide file tree
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
12 changes: 10 additions & 2 deletions apps/app-portal/src/app/(landing)/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

const session = await getSession();
if (session?.user) {
redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
}

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
return (
<div className="relative w-[100vw] h-[100vh] overflow-hidden">
<TiledBackground />
Expand Down
11 changes: 9 additions & 2 deletions apps/app-portal/src/app/auth/signin/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
searchParams,
}: {
searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
// read cookie - see if valid session in DB - if so, automatically redir user to logged in part
const session = await getSession();
if (session?.user) {
redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
}

return <SignInForm />;
// callbackUrl is only present when middleware bounced an unauthed user here
// from a protected route. The form uses it both to prompt "sign in first" and
// as the post-sign-in destination baked into the magic link.
return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}
33 changes: 25 additions & 8 deletions apps/app-portal/src/components/auth/SignInForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
callbackUrl,
}: {
callbackUrl?: string;
}) {
const [dotCount, setDotCount] = useState(1);
const [email, setEmail] = useState("");
const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
return () => clearInterval(id);
}, []);

// Prompt users who were bounced here from a protected route (callbackUrl set).
useEffect(() => {
if (callbackUrl) {
// stable id so StrictMode's double-invoke shows one toast, not two
toast.info("Sign in before accessing the portal!", { id: "auth-required" });
}
}, [callbackUrl]);

async function handleSignIn() {
// invalid email -> inline error, no request sent
if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
try {
// signIn() handles CSRF, form-encoding, and the redirect for us.
// redirect:false → we drive the UI state ourselves instead of navigating.
// The callbackUrl is baked into the magic link; the admin layout
// re-checks the role server-side, so this is routing, not authorization.
// The callbackUrl is baked into the magic link. If the user was bounced
// here from a protected route, send them back to it; otherwise fall back
// to their default landing. The admin layout re-checks the role
// server-side, so this is routing, not authorization.
const res = await signIn("email", {
email: email.trim(),
redirect: false,
callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
});

if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
setEmail(e.target.value);
if (emailError) setEmailError(null);
}}
onKeyDown={(e)=>{
if (e.key === "Enter") document.getElementById("submit")?.click()
}}
className={"w-full p-1 mt-4 border-2 rounded-md"}
/>
{/*confirm*/}
<button
id={"submit"}
className={
"w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
}
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
{/*status / error message*/}
<div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
{emailError ? (
<p className={"w-full text-[#FF0000] text-end text-[12px]"}>
<p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
{emailError}
</p> //todo: change the red
</p>
) : status === "loading" ? (
<p className={"w-full text-[#AAAAAA] text-end"}>
Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
) : status === "sent" ? (
<p
className={
"w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
"w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
}
>
{/*todo: change the green*/}
Check your email for a sign-in link!
</p>
) : null}
Expand Down
5 changes: 5 additions & 0 deletions apps/app-portal/src/lib/auth/config.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
}
return session;
},
async redirect({ url, baseUrl }) {
if (url.startsWith("/")) return `${baseUrl}${url}`
else if (new URL(url).origin === baseUrl) return url
return baseUrl
}
},
};
21 changes: 16 additions & 5 deletions apps/app-portal/src/middleware.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
return NextResponse.next();
}
export default withAuth({
callbacks: {
authorized({ req }) {
return Boolean(
req.cookies.get("next-auth.session-token") ??
req.cookies.get("__Secure-next-auth.session-token"),
);
},
},
pages: {
signIn: "/auth/signin",
error: "/auth/error",
},
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
* - the landing page "/" and /login public entry points
* Add any other public path to this negative lookahead as you build it.
*/
"/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
"/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
],
};
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
PR fixes by mzhang0213 · Pull Request #513 · HackBeanpot/core · GitHub
Skip to content
PR fixes#513

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

 Open

mzhang0213
wants to merge
1
commit into

base:dev
Choose a base branch

from

 Open


PR fixes
#513
Show file tree
Hide file tree
 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


12 changes: 10 additions & 2 deletions
apps/app-portal/src/app/(landing)/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
 return (
 <div className="relative w-[100vw] h-[100vh] overflow-hidden">
 <TiledBackground />
Expand Down

11 changes: 9 additions & 2 deletions
apps/app-portal/src/app/auth/signin/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
 searchParams,
}: {
 searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
 // read cookie - see if valid session in DB - if so, automatically redir user to logged in part
 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

 return <SignInForm />;
 // callbackUrl is only present when middleware bounced an unauthed user here
 // from a protected route. The form uses it both to prompt "sign in first" and
 // as the post-sign-in destination baked into the magic link.
 return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}

33 changes: 25 additions & 8 deletions
apps/app-portal/src/components/auth/SignInForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
 callbackUrl,
}: {
 callbackUrl?: string;
}) {
 const [dotCount, setDotCount] = useState(1);
 const [email, setEmail] = useState("");
 const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
 return () => clearInterval(id);
 }, []);

 // Prompt users who were bounced here from a protected route (callbackUrl set).
 useEffect(() => {
 if (callbackUrl) {
 // stable id so StrictMode's double-invoke shows one toast, not two
 toast.info("Sign in before accessing the portal!", { id: "auth-required" });
 }
 }, [callbackUrl]);

 async function handleSignIn() {
 // invalid email -> inline error, no request sent
 if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
 try {
 // signIn() handles CSRF, form-encoding, and the redirect for us.
 // redirect:false → we drive the UI state ourselves instead of navigating.
 // The callbackUrl is baked into the magic link; the admin layout
 // re-checks the role server-side, so this is routing, not authorization.
 // The callbackUrl is baked into the magic link. If the user was bounced
 // here from a protected route, send them back to it; otherwise fall back
 // to their default landing. The admin layout re-checks the role
 // server-side, so this is routing, not authorization.
 const res = await signIn("email", {
 email: email.trim(),
 redirect: false,
 callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
 callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
 });

 if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
 setEmail(e.target.value);
 if (emailError) setEmailError(null);
 }}
 onKeyDown={(e)=>{
 if (e.key === "Enter") document.getElementById("submit")?.click()
 }}
 className={"w-full p-1 mt-4 border-2 rounded-md"}
 />
 {/*confirm*/}
 <button
 id={"submit"}
 className={
 "w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
 }
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
 {/*status / error message*/}
 <div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
 {emailError ? (
 <p className={"w-full text-[#FF0000] text-end text-[12px]"}>
 <p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
 {emailError}
 </p> //todo: change the red
 </p>
 ) : status === "loading" ? (
 <p className={"w-full text-[#AAAAAA] text-end"}>
 Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
 ) : status === "sent" ? (
 <p
 className={
 "w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
 "w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
 }
 >
 {/*todo: change the green*/}
 Check your email for a sign-in link!
 </p>
 ) : null}
Expand Down

5 changes: 5 additions & 0 deletions
apps/app-portal/src/lib/auth/config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
 }
 return session;
 },
 async redirect({ url, baseUrl }) {
 if (url.startsWith("/")) return `${baseUrl}${url}`
 else if (new URL(url).origin === baseUrl) return url
 return baseUrl
 }
 },
};

21 changes: 16 additions & 5 deletions
apps/app-portal/src/middleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
 return NextResponse.next();
}
export default withAuth({
 callbacks: {
 authorized({ req }) {
 return Boolean(
 req.cookies.get("next-auth.session-token") ??
 req.cookies.get("__Secure-next-auth.session-token"),
 );
 },
 },
 pages: {
 signIn: "/auth/signin",
 error: "/auth/error",
 },
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
 * - the landing page "/" and /login public entry points
 * Add any other public path to this negative lookahead as you build it.
 */
 "/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 "/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 ],
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR fixes by mzhang0213 · Pull Request #513 · HackBeanpot/core · GitHub
Skip to content
PR fixes#513

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

 Open

mzhang0213
wants to merge
1
commit into

base:dev
Choose a base branch

from

 Open


PR fixes
#513
Show file tree
Hide file tree
 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


12 changes: 10 additions & 2 deletions
apps/app-portal/src/app/(landing)/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
 return (
 <div className="relative w-[100vw] h-[100vh] overflow-hidden">
 <TiledBackground />
Expand Down

11 changes: 9 additions & 2 deletions
apps/app-portal/src/app/auth/signin/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
 searchParams,
}: {
 searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
 // read cookie - see if valid session in DB - if so, automatically redir user to logged in part
 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

 return <SignInForm />;
 // callbackUrl is only present when middleware bounced an unauthed user here
 // from a protected route. The form uses it both to prompt "sign in first" and
 // as the post-sign-in destination baked into the magic link.
 return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}

33 changes: 25 additions & 8 deletions
apps/app-portal/src/components/auth/SignInForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
 callbackUrl,
}: {
 callbackUrl?: string;
}) {
 const [dotCount, setDotCount] = useState(1);
 const [email, setEmail] = useState("");
 const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
 return () => clearInterval(id);
 }, []);

 // Prompt users who were bounced here from a protected route (callbackUrl set).
 useEffect(() => {
 if (callbackUrl) {
 // stable id so StrictMode's double-invoke shows one toast, not two
 toast.info("Sign in before accessing the portal!", { id: "auth-required" });
 }
 }, [callbackUrl]);

 async function handleSignIn() {
 // invalid email -> inline error, no request sent
 if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
 try {
 // signIn() handles CSRF, form-encoding, and the redirect for us.
 // redirect:false → we drive the UI state ourselves instead of navigating.
 // The callbackUrl is baked into the magic link; the admin layout
 // re-checks the role server-side, so this is routing, not authorization.
 // The callbackUrl is baked into the magic link. If the user was bounced
 // here from a protected route, send them back to it; otherwise fall back
 // to their default landing. The admin layout re-checks the role
 // server-side, so this is routing, not authorization.
 const res = await signIn("email", {
 email: email.trim(),
 redirect: false,
 callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
 callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
 });

 if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
 setEmail(e.target.value);
 if (emailError) setEmailError(null);
 }}
 onKeyDown={(e)=>{
 if (e.key === "Enter") document.getElementById("submit")?.click()
 }}
 className={"w-full p-1 mt-4 border-2 rounded-md"}
 />
 {/*confirm*/}
 <button
 id={"submit"}
 className={
 "w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
 }
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
 {/*status / error message*/}
 <div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
 {emailError ? (
 <p className={"w-full text-[#FF0000] text-end text-[12px]"}>
 <p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
 {emailError}
 </p> //todo: change the red
 </p>
 ) : status === "loading" ? (
 <p className={"w-full text-[#AAAAAA] text-end"}>
 Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
 ) : status === "sent" ? (
 <p
 className={
 "w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
 "w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
 }
 >
 {/*todo: change the green*/}
 Check your email for a sign-in link!
 </p>
 ) : null}
Expand Down

5 changes: 5 additions & 0 deletions
apps/app-portal/src/lib/auth/config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
 }
 return session;
 },
 async redirect({ url, baseUrl }) {
 if (url.startsWith("/")) return `${baseUrl}${url}`
 else if (new URL(url).origin === baseUrl) return url
 return baseUrl
 }
 },
};

21 changes: 16 additions & 5 deletions
apps/app-portal/src/middleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
 return NextResponse.next();
}
export default withAuth({
 callbacks: {
 authorized({ req }) {
 return Boolean(
 req.cookies.get("next-auth.session-token") ??
 req.cookies.get("__Secure-next-auth.session-token"),
 );
 },
 },
 pages: {
 signIn: "/auth/signin",
 error: "/auth/error",
 },
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
 * - the landing page "/" and /login public entry points
 * Add any other public path to this negative lookahead as you build it.
 */
 "/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 "/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 ],
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR fixes by mzhang0213 · Pull Request #513 · HackBeanpot/core · GitHub
Skip to content
PR fixes#513

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

 Open

mzhang0213
wants to merge
1
commit into

base:dev
Choose a base branch

from

 Open


PR fixes
#513
Show file tree
Hide file tree
 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


12 changes: 10 additions & 2 deletions
apps/app-portal/src/app/(landing)/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
 return (
 <div className="relative w-[100vw] h-[100vh] overflow-hidden">
 <TiledBackground />
Expand Down

11 changes: 9 additions & 2 deletions
apps/app-portal/src/app/auth/signin/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
 searchParams,
}: {
 searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
 // read cookie - see if valid session in DB - if so, automatically redir user to logged in part
 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

 return <SignInForm />;
 // callbackUrl is only present when middleware bounced an unauthed user here
 // from a protected route. The form uses it both to prompt "sign in first" and
 // as the post-sign-in destination baked into the magic link.
 return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}

33 changes: 25 additions & 8 deletions
apps/app-portal/src/components/auth/SignInForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
 callbackUrl,
}: {
 callbackUrl?: string;
}) {
 const [dotCount, setDotCount] = useState(1);
 const [email, setEmail] = useState("");
 const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
 return () => clearInterval(id);
 }, []);

 // Prompt users who were bounced here from a protected route (callbackUrl set).
 useEffect(() => {
 if (callbackUrl) {
 // stable id so StrictMode's double-invoke shows one toast, not two
 toast.info("Sign in before accessing the portal!", { id: "auth-required" });
 }
 }, [callbackUrl]);

 async function handleSignIn() {
 // invalid email -> inline error, no request sent
 if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
 try {
 // signIn() handles CSRF, form-encoding, and the redirect for us.
 // redirect:false → we drive the UI state ourselves instead of navigating.
 // The callbackUrl is baked into the magic link; the admin layout
 // re-checks the role server-side, so this is routing, not authorization.
 // The callbackUrl is baked into the magic link. If the user was bounced
 // here from a protected route, send them back to it; otherwise fall back
 // to their default landing. The admin layout re-checks the role
 // server-side, so this is routing, not authorization.
 const res = await signIn("email", {
 email: email.trim(),
 redirect: false,
 callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
 callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
 });

 if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
 setEmail(e.target.value);
 if (emailError) setEmailError(null);
 }}
 onKeyDown={(e)=>{
 if (e.key === "Enter") document.getElementById("submit")?.click()
 }}
 className={"w-full p-1 mt-4 border-2 rounded-md"}
 />
 {/*confirm*/}
 <button
 id={"submit"}
 className={
 "w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
 }
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
 {/*status / error message*/}
 <div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
 {emailError ? (
 <p className={"w-full text-[#FF0000] text-end text-[12px]"}>
 <p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
 {emailError}
 </p> //todo: change the red
 </p>
 ) : status === "loading" ? (
 <p className={"w-full text-[#AAAAAA] text-end"}>
 Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
 ) : status === "sent" ? (
 <p
 className={
 "w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
 "w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
 }
 >
 {/*todo: change the green*/}
 Check your email for a sign-in link!
 </p>
 ) : null}
Expand Down

5 changes: 5 additions & 0 deletions
apps/app-portal/src/lib/auth/config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
 }
 return session;
 },
 async redirect({ url, baseUrl }) {
 if (url.startsWith("/")) return `${baseUrl}${url}`
 else if (new URL(url).origin === baseUrl) return url
 return baseUrl
 }
 },
};

21 changes: 16 additions & 5 deletions
apps/app-portal/src/middleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
 return NextResponse.next();
}
export default withAuth({
 callbacks: {
 authorized({ req }) {
 return Boolean(
 req.cookies.get("next-auth.session-token") ??
 req.cookies.get("__Secure-next-auth.session-token"),
 );
 },
 },
 pages: {
 signIn: "/auth/signin",
 error: "/auth/error",
 },
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
 * - the landing page "/" and /login public entry points
 * Add any other public path to this negative lookahead as you build it.
 */
 "/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 "/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 ],
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
PR fixes by mzhang0213 · Pull Request #513 · HackBeanpot/core · GitHub
Skip to content
PR fixes#513

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

 Open

mzhang0213
wants to merge
1
commit into

base:dev
Choose a base branch

from

 Open


PR fixes
#513
Show file tree
Hide file tree
 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


12 changes: 10 additions & 2 deletions
apps/app-portal/src/app/(landing)/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
 return (
 <div className="relative w-[100vw] h-[100vh] overflow-hidden">
 <TiledBackground />
Expand Down

11 changes: 9 additions & 2 deletions
apps/app-portal/src/app/auth/signin/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
 searchParams,
}: {
 searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
 // read cookie - see if valid session in DB - if so, automatically redir user to logged in part
 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

 return <SignInForm />;
 // callbackUrl is only present when middleware bounced an unauthed user here
 // from a protected route. The form uses it both to prompt "sign in first" and
 // as the post-sign-in destination baked into the magic link.
 return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}

33 changes: 25 additions & 8 deletions
apps/app-portal/src/components/auth/SignInForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
 callbackUrl,
}: {
 callbackUrl?: string;
}) {
 const [dotCount, setDotCount] = useState(1);
 const [email, setEmail] = useState("");
 const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
 return () => clearInterval(id);
 }, []);

 // Prompt users who were bounced here from a protected route (callbackUrl set).
 useEffect(() => {
 if (callbackUrl) {
 // stable id so StrictMode's double-invoke shows one toast, not two
 toast.info("Sign in before accessing the portal!", { id: "auth-required" });
 }
 }, [callbackUrl]);

 async function handleSignIn() {
 // invalid email -> inline error, no request sent
 if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
 try {
 // signIn() handles CSRF, form-encoding, and the redirect for us.
 // redirect:false → we drive the UI state ourselves instead of navigating.
 // The callbackUrl is baked into the magic link; the admin layout
 // re-checks the role server-side, so this is routing, not authorization.
 // The callbackUrl is baked into the magic link. If the user was bounced
 // here from a protected route, send them back to it; otherwise fall back
 // to their default landing. The admin layout re-checks the role
 // server-side, so this is routing, not authorization.
 const res = await signIn("email", {
 email: email.trim(),
 redirect: false,
 callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
 callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
 });

 if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
 setEmail(e.target.value);
 if (emailError) setEmailError(null);
 }}
 onKeyDown={(e)=>{
 if (e.key === "Enter") document.getElementById("submit")?.click()
 }}
 className={"w-full p-1 mt-4 border-2 rounded-md"}
 />
 {/*confirm*/}
 <button
 id={"submit"}
 className={
 "w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
 }
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
 {/*status / error message*/}
 <div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
 {emailError ? (
 <p className={"w-full text-[#FF0000] text-end text-[12px]"}>
 <p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
 {emailError}
 </p> //todo: change the red
 </p>
 ) : status === "loading" ? (
 <p className={"w-full text-[#AAAAAA] text-end"}>
 Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
 ) : status === "sent" ? (
 <p
 className={
 "w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
 "w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
 }
 >
 {/*todo: change the green*/}
 Check your email for a sign-in link!
 </p>
 ) : null}
Expand Down

5 changes: 5 additions & 0 deletions
apps/app-portal/src/lib/auth/config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
 }
 return session;
 },
 async redirect({ url, baseUrl }) {
 if (url.startsWith("/")) return `${baseUrl}${url}`
 else if (new URL(url).origin === baseUrl) return url
 return baseUrl
 }
 },
};

21 changes: 16 additions & 5 deletions
apps/app-portal/src/middleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
 return NextResponse.next();
}
export default withAuth({
 callbacks: {
 authorized({ req }) {
 return Boolean(
 req.cookies.get("next-auth.session-token") ??
 req.cookies.get("__Secure-next-auth.session-token"),
 );
 },
 },
 pages: {
 signIn: "/auth/signin",
 error: "/auth/error",
 },
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
 * - the landing page "/" and /login public entry points
 * Add any other public path to this negative lookahead as you build it.
 */
 "/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 "/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 ],
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR fixes by mzhang0213 · Pull Request #513 · HackBeanpot/core · GitHub
Skip to content
PR fixes#513

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

 Open

mzhang0213
wants to merge
1
commit into

base:dev
Choose a base branch

from

 Open


PR fixes
#513
Show file tree
Hide file tree
 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


12 changes: 10 additions & 2 deletions
apps/app-portal/src/app/(landing)/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
 return (
 <div className="relative w-[100vw] h-[100vh] overflow-hidden">
 <TiledBackground />
Expand Down

11 changes: 9 additions & 2 deletions
apps/app-portal/src/app/auth/signin/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
 searchParams,
}: {
 searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
 // read cookie - see if valid session in DB - if so, automatically redir user to logged in part
 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

 return <SignInForm />;
 // callbackUrl is only present when middleware bounced an unauthed user here
 // from a protected route. The form uses it both to prompt "sign in first" and
 // as the post-sign-in destination baked into the magic link.
 return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}

33 changes: 25 additions & 8 deletions
apps/app-portal/src/components/auth/SignInForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
 callbackUrl,
}: {
 callbackUrl?: string;
}) {
 const [dotCount, setDotCount] = useState(1);
 const [email, setEmail] = useState("");
 const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
 return () => clearInterval(id);
 }, []);

 // Prompt users who were bounced here from a protected route (callbackUrl set).
 useEffect(() => {
 if (callbackUrl) {
 // stable id so StrictMode's double-invoke shows one toast, not two
 toast.info("Sign in before accessing the portal!", { id: "auth-required" });
 }
 }, [callbackUrl]);

 async function handleSignIn() {
 // invalid email -> inline error, no request sent
 if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
 try {
 // signIn() handles CSRF, form-encoding, and the redirect for us.
 // redirect:false → we drive the UI state ourselves instead of navigating.
 // The callbackUrl is baked into the magic link; the admin layout
 // re-checks the role server-side, so this is routing, not authorization.
 // The callbackUrl is baked into the magic link. If the user was bounced
 // here from a protected route, send them back to it; otherwise fall back
 // to their default landing. The admin layout re-checks the role
 // server-side, so this is routing, not authorization.
 const res = await signIn("email", {
 email: email.trim(),
 redirect: false,
 callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
 callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
 });

 if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
 setEmail(e.target.value);
 if (emailError) setEmailError(null);
 }}
 onKeyDown={(e)=>{
 if (e.key === "Enter") document.getElementById("submit")?.click()
 }}
 className={"w-full p-1 mt-4 border-2 rounded-md"}
 />
 {/*confirm*/}
 <button
 id={"submit"}
 className={
 "w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
 }
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
 {/*status / error message*/}
 <div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
 {emailError ? (
 <p className={"w-full text-[#FF0000] text-end text-[12px]"}>
 <p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
 {emailError}
 </p> //todo: change the red
 </p>
 ) : status === "loading" ? (
 <p className={"w-full text-[#AAAAAA] text-end"}>
 Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
 ) : status === "sent" ? (
 <p
 className={
 "w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
 "w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
 }
 >
 {/*todo: change the green*/}
 Check your email for a sign-in link!
 </p>
 ) : null}
Expand Down

5 changes: 5 additions & 0 deletions
apps/app-portal/src/lib/auth/config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
 }
 return session;
 },
 async redirect({ url, baseUrl }) {
 if (url.startsWith("/")) return `${baseUrl}${url}`
 else if (new URL(url).origin === baseUrl) return url
 return baseUrl
 }
 },
};

21 changes: 16 additions & 5 deletions
apps/app-portal/src/middleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
 return NextResponse.next();
}
export default withAuth({
 callbacks: {
 authorized({ req }) {
 return Boolean(
 req.cookies.get("next-auth.session-token") ??
 req.cookies.get("__Secure-next-auth.session-token"),
 );
 },
 },
 pages: {
 signIn: "/auth/signin",
 error: "/auth/error",
 },
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
 * - the landing page "/" and /login public entry points
 * Add any other public path to this negative lookahead as you build it.
 */
 "/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 "/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 ],
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR fixes by mzhang0213 · Pull Request #513 · HackBeanpot/core · GitHub
Skip to content
PR fixes#513

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

 Open

mzhang0213
wants to merge
1
commit into

base:dev
Choose a base branch

from

 Open


PR fixes
#513
Show file tree
Hide file tree
 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


12 changes: 10 additions & 2 deletions
apps/app-portal/src/app/(landing)/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
 return (
 <div className="relative w-[100vw] h-[100vh] overflow-hidden">
 <TiledBackground />
Expand Down

11 changes: 9 additions & 2 deletions
apps/app-portal/src/app/auth/signin/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
 searchParams,
}: {
 searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
 // read cookie - see if valid session in DB - if so, automatically redir user to logged in part
 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

 return <SignInForm />;
 // callbackUrl is only present when middleware bounced an unauthed user here
 // from a protected route. The form uses it both to prompt "sign in first" and
 // as the post-sign-in destination baked into the magic link.
 return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}

33 changes: 25 additions & 8 deletions
apps/app-portal/src/components/auth/SignInForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
 callbackUrl,
}: {
 callbackUrl?: string;
}) {
 const [dotCount, setDotCount] = useState(1);
 const [email, setEmail] = useState("");
 const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
 return () => clearInterval(id);
 }, []);

 // Prompt users who were bounced here from a protected route (callbackUrl set).
 useEffect(() => {
 if (callbackUrl) {
 // stable id so StrictMode's double-invoke shows one toast, not two
 toast.info("Sign in before accessing the portal!", { id: "auth-required" });
 }
 }, [callbackUrl]);

 async function handleSignIn() {
 // invalid email -> inline error, no request sent
 if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
 try {
 // signIn() handles CSRF, form-encoding, and the redirect for us.
 // redirect:false → we drive the UI state ourselves instead of navigating.
 // The callbackUrl is baked into the magic link; the admin layout
 // re-checks the role server-side, so this is routing, not authorization.
 // The callbackUrl is baked into the magic link. If the user was bounced
 // here from a protected route, send them back to it; otherwise fall back
 // to their default landing. The admin layout re-checks the role
 // server-side, so this is routing, not authorization.
 const res = await signIn("email", {
 email: email.trim(),
 redirect: false,
 callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
 callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
 });

 if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
 setEmail(e.target.value);
 if (emailError) setEmailError(null);
 }}
 onKeyDown={(e)=>{
 if (e.key === "Enter") document.getElementById("submit")?.click()
 }}
 className={"w-full p-1 mt-4 border-2 rounded-md"}
 />
 {/*confirm*/}
 <button
 id={"submit"}
 className={
 "w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
 }
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
 {/*status / error message*/}
 <div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
 {emailError ? (
 <p className={"w-full text-[#FF0000] text-end text-[12px]"}>
 <p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
 {emailError}
 </p> //todo: change the red
 </p>
 ) : status === "loading" ? (
 <p className={"w-full text-[#AAAAAA] text-end"}>
 Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
 ) : status === "sent" ? (
 <p
 className={
 "w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
 "w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
 }
 >
 {/*todo: change the green*/}
 Check your email for a sign-in link!
 </p>
 ) : null}
Expand Down

5 changes: 5 additions & 0 deletions
apps/app-portal/src/lib/auth/config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
 }
 return session;
 },
 async redirect({ url, baseUrl }) {
 if (url.startsWith("/")) return `${baseUrl}${url}`
 else if (new URL(url).origin === baseUrl) return url
 return baseUrl
 }
 },
};

21 changes: 16 additions & 5 deletions
apps/app-portal/src/middleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
 return NextResponse.next();
}
export default withAuth({
 callbacks: {
 authorized({ req }) {
 return Boolean(
 req.cookies.get("next-auth.session-token") ??
 req.cookies.get("__Secure-next-auth.session-token"),
 );
 },
 },
 pages: {
 signIn: "/auth/signin",
 error: "/auth/error",
 },
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
 * - the landing page "/" and /login public entry points
 * Add any other public path to this negative lookahead as you build it.
 */
 "/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 "/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 ],
};

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
PR fixes by mzhang0213 · Pull Request #513 · HackBeanpot/core · GitHub
Skip to content
PR fixes#513

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

 Open

mzhang0213
wants to merge
1
commit into

base:dev
Choose a base branch

from

 Open


PR fixes
#513
Show file tree
Hide file tree
 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


12 changes: 10 additions & 2 deletions
apps/app-portal/src/app/(landing)/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,17 @@ import Link from "next/link";
import Image from "next/image";
import icon from "@/app/icon.ico";
import TiledBackground from "@/components/ui/tiled-background";
import {redirect} from "next/navigation";
import {isAdminEmail} from "@/lib/auth/roles.ts";
import {getSession} from "@/lib/auth/session.ts";

export default async function Page(): Promise<JSX.Element> {

 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

//TODO: update to redirect authed users to /dashboard
export default function Page(): JSX.Element {
 return (
 <div className="relative w-[100vw] h-[100vh] overflow-hidden">
 <TiledBackground />
Expand Down

11 changes: 9 additions & 2 deletions
apps/app-portal/src/app/auth/signin/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,19 @@ import { getSession } from "@/lib/auth/session";
import { SignInForm } from "@/components/auth/SignInForm";
import {isAdminEmail} from "@/lib/auth/roles.ts";

export default async function Page(): Promise<JSX.Element> {
export default async function Page({
 searchParams,
}: {
 searchParams: { callbackUrl?: string };
}): Promise<JSX.Element> {
 // read cookie - see if valid session in DB - if so, automatically redir user to logged in part
 const session = await getSession();
 if (session?.user) {
 redirect(isAdminEmail(session.user.email) ? "/admin" : "/dashboard");
 }

 return <SignInForm />;
 // callbackUrl is only present when middleware bounced an unauthed user here
 // from a protected route. The form uses it both to prompt "sign in first" and
 // as the post-sign-in destination baked into the magic link.
 return <SignInForm callbackUrl={searchParams?.callbackUrl} />;
}

33 changes: 25 additions & 8 deletions
apps/app-portal/src/components/auth/SignInForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,11 @@ const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; //regex email checker

type Status = "idle" | "loading" | "sent";

export function SignInForm() {
export function SignInForm({
 callbackUrl,
}: {
 callbackUrl?: string;
}) {
 const [dotCount, setDotCount] = useState(1);
 const [email, setEmail] = useState("");
 const [status, setStatus] = useState<Status>("idle");
Expand All@@ -25,6 +29,14 @@ export function SignInForm() {
 return () => clearInterval(id);
 }, []);

 // Prompt users who were bounced here from a protected route (callbackUrl set).
 useEffect(() => {
 if (callbackUrl) {
 // stable id so StrictMode's double-invoke shows one toast, not two
 toast.info("Sign in before accessing the portal!", { id: "auth-required" });
 }
 }, [callbackUrl]);

 async function handleSignIn() {
 // invalid email -> inline error, no request sent
 if (!EMAIL_RE.test(email.trim())) {
Expand All@@ -37,12 +49,14 @@ export function SignInForm() {
 try {
 // signIn() handles CSRF, form-encoding, and the redirect for us.
 // redirect:false → we drive the UI state ourselves instead of navigating.
 // The callbackUrl is baked into the magic link; the admin layout
 // re-checks the role server-side, so this is routing, not authorization.
 // The callbackUrl is baked into the magic link. If the user was bounced
 // here from a protected route, send them back to it; otherwise fall back
 // to their default landing. The admin layout re-checks the role
 // server-side, so this is routing, not authorization.
 const res = await signIn("email", {
 email: email.trim(),
 redirect: false,
 callbackUrl: isAdminEmail(email) ? "/admin" : "/dashboard",
 callbackUrl: callbackUrl ?? (isAdminEmail(email) ? "/admin" : "/dashboard"),
 });

 if (res?.error) {
Expand DownExpand Up@@ -81,10 +95,14 @@ export function SignInForm() {
 setEmail(e.target.value);
 if (emailError) setEmailError(null);
 }}
 onKeyDown={(e)=>{
 if (e.key === "Enter") document.getElementById("submit")?.click()
 }}
 className={"w-full p-1 mt-4 border-2 rounded-md"}
 />
 {/*confirm*/}
 <button
 id={"submit"}
 className={
 "w-full bg-starlightBlueLight text-white p-1 px-5 mt-4 border-2 rounded-md disabled:opacity-50"
 }
Expand All@@ -97,9 +115,9 @@ export function SignInForm() {
 {/*status / error message*/}
 <div className={"w-full flex flex-row items-end min-h-[2rem] pb-2"}>
 {emailError ? (
 <p className={"w-full text-[#FF0000] text-end text-[12px]"}>
 <p className={"w-full text-[#bf3d3d] text-end text-[12px]"}>
 {emailError}
 </p> //todo: change the red
 </p>
 ) : status === "loading" ? (
 <p className={"w-full text-[#AAAAAA] text-end"}>
 Loading{".".repeat(dotCount)}
Expand All@@ -108,10 +126,9 @@ export function SignInForm() {
 ) : status === "sent" ? (
 <p
 className={
 "w-full text-[rgb(120,255,150)] text-end text-[12px] whitespace-nowrap"
 "w-full text-[#319948] text-end text-[12px] whitespace-nowrap"
 }
 >
 {/*todo: change the green*/}
 Check your email for a sign-in link!
 </p>
 ) : null}
Expand Down

5 changes: 5 additions & 0 deletions
apps/app-portal/src/lib/auth/config.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,10 @@ export const authOptions: NextAuthOptions = {
 }
 return session;
 },
 async redirect({ url, baseUrl }) {
 if (url.startsWith("/")) return `${baseUrl}${url}`
 else if (new URL(url).origin === baseUrl) return url
 return baseUrl
 }
 },
};

21 changes: 16 additions & 5 deletions
apps/app-portal/src/middleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@
// having needed to login in advance.
//Unauthenticated requests to matched routes are redirected to sign-in

import { NextResponse } from "next/server";
import { withAuth } from "next-auth/middleware";

export default function middleware() {
 return NextResponse.next();
}
export default withAuth({
 callbacks: {
 authorized({ req }) {
 return Boolean(
 req.cookies.get("next-auth.session-token") ??
 req.cookies.get("__Secure-next-auth.session-token"),
 );
 },
 },
 pages: {
 signIn: "/auth/signin",
 error: "/auth/error",
 },
});

//the matcher was written with assistance of AI
export const config = {
Expand All@@ -21,6 +32,6 @@ export const config = {
 * - the landing page "/" and /login public entry points
 * Add any other public path to this negative lookahead as you build it.
 */
 "/((?!auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 "/((?!api/auth|_next/static|_next/image|favicon.ico|login$|$).*)",
 ],
};