Skip to content

Remove tightly coupling with backend #21

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
BayajidAlam merged 1 commit into from
Apr 19, 2026
Merged

Remove tightly coupling with backend #21

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
6 changes: 6 additions & 0 deletions .github/workflows/cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ jobs:

cd "$APP_DIR"

if [ -d .git ]; then
git fetch --all --prune
git checkout main
git reset --hard ${{ github.sha }}
fi

printf '%s' "${{ secrets.SERVER_ENV_PRODUCTION }}" > server/.env.production

export REGISTRY=docker.io
Expand Down
31 changes: 13 additions & 18 deletions client/src/proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { NextRequest, NextResponse } from "next/server";
import { getDefaultDashboardRoute, getRouteOwner, isAuthRoute, UserRole } from "./lib/authUtils";
import { jwtUtils } from "./lib/jwtUtils";
import { isTokenExpiringSoon } from "./lib/tokenUtils";
import { getNewTokensWithRefreshToken, getUserInfo } from "./services/auth.services";

Expand All @@ -20,26 +19,24 @@ async function refreshTokenMiddleware (refreshToken : string) : Promise<boolean>

export async function proxy (request : NextRequest) {
try {
const accessTokenSecret = process.env.JWT_ACCESS_SECRET || process.env.ACCESS_TOKEN_SECRET;

if(!accessTokenSecret){
console.error("Missing JWT_ACCESS_SECRET/ACCESS_TOKEN_SECRET in ph-client runtime environment");
}

const { pathname } = request.nextUrl; // eg /dashboard, /admin/dashboard, /doctor/dashboard
const pathWithQuery = `${pathname}${request.nextUrl.search}`;
const accessToken = request.cookies.get("accessToken")?.value;
const refreshToken = request.cookies.get("refreshToken")?.value;

const decodedAccessToken = accessToken && accessTokenSecret && jwtUtils.verifyToken(accessToken, accessTokenSecret).data;
let isValidAccessToken = Boolean(accessToken);
let userRole: UserRole | null = null;
let userInfo = null;

const isValidAccessToken = Boolean(accessToken && accessTokenSecret && jwtUtils.verifyToken(accessToken, accessTokenSecret).success);
// Validate auth state against backend session instead of local JWT verification.
if (isValidAccessToken) {
userInfo = await getUserInfo();
isValidAccessToken = Boolean(userInfo);

let userRole: UserRole | null = null;

if(decodedAccessToken){
userRole = decodedAccessToken.role as UserRole;
}
if (userInfo?.role) {
userRole = userInfo.role as UserRole;
}
}

const routerOwner = getRouteOwner(pathname);

Expand Down Expand Up @@ -139,10 +136,8 @@ export async function proxy (request : NextRequest) {

//Rule - Enforcing user to stay in reset password or verify email page if their needPasswordChange or isEmailVerified flags are not satisfied respectively

if(accessToken){
const userInfo = await getUserInfo();

if(userInfo){
if(accessToken){
if(userInfo){
// need email verification scenario
if(userInfo.emailVerified === false){
if(pathname !== "/verify-email"){
Expand Down