Skip to content
Merged

added #620

Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 29 additions & 10 deletions middleware/clerkAuth.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
const { ClerkExpressRequireAuth } = require('@clerk/clerk-sdk-node');
const { ClerkExpressRequireAuth, clerkClient } = require('@clerk/clerk-sdk-node');

// Simple authentication middleware
const requireAuth = ClerkExpressRequireAuth({
onError: (error) => {
console.error('Clerk auth error:', error);
return {
status: 401,
message: 'Authentication required. Please sign in.'
};
// Robust Clerk authentication middleware
// Uses ClerkExpressRequireAuth with proper error handling
const requireAuth = async (req, res, next) => {
try {
// Use ClerkExpressRequireAuth internally
const clerkMiddleware = ClerkExpressRequireAuth();

await new Promise((resolve, reject) => {
clerkMiddleware(req, res, (err) => {
if (err) reject(err);
else resolve();
});
});

// Verify we got a userId
if (!req.auth?.userId) {
return res.status(401).json({
error: 'Authentication required. Please sign in.'
});
}

next();
} catch (error) {
console.error('Clerk auth error:', error.message || error);
return res.status(401).json({
error: 'Authentication required. Please sign in.'
});
}
});
};

// Extract user ID from request
const getUserId = (req) => {
Expand Down
11 changes: 11 additions & 0 deletions models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,17 @@ const userSchema = new mongoose.Schema({
type:String,
default:null
},
phone:{
type:String,
trim:true,
default:null
},
bio:{
type:String,
trim:true,
maxlength:500,
default:null
},
role:{
type:String,
enum:["user","admin"],
Expand Down
Loading