propro-utils 1.3.11 → 1.3.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/server/index.js +2 -6
package/package.json
CHANGED
package/src/server/index.js
CHANGED
|
@@ -18,30 +18,26 @@ function proproAuthMiddleware(options = {}) {
|
|
|
18
18
|
} = options;
|
|
19
19
|
|
|
20
20
|
return async (req, res, next) => {
|
|
21
|
-
console.log("req.cookies", req.cookies);
|
|
22
21
|
try {
|
|
23
|
-
// Try to get the token from the Authorization header
|
|
24
22
|
let token;
|
|
25
23
|
if (req.headers.authorization?.startsWith("Bearer ")) {
|
|
26
24
|
token = req.headers.authorization.split(" ")[1];
|
|
27
25
|
} else if (req.cookies && req.cookies['x-access-token']) {
|
|
28
|
-
// If not present in Authorization header, try to get it from cookies
|
|
29
26
|
token = req.cookies['x-access-token'];
|
|
30
27
|
}
|
|
31
28
|
|
|
32
29
|
if (token) {
|
|
33
30
|
console.log("verifying access token", token);
|
|
34
|
-
const verifiedToken = await verifyJWT(token
|
|
31
|
+
const verifiedToken = await verifyJWT(token);
|
|
32
|
+
console.log("verifiedToken", verifiedToken);
|
|
35
33
|
if (verifiedToken) {
|
|
36
34
|
req.account = verifiedToken;
|
|
37
35
|
return next();
|
|
38
36
|
} else if (req.cookies && req.cookies['x-refresh-token']) {
|
|
39
|
-
// If token is invalid or expired, try to refresh it
|
|
40
37
|
const refreshToken = req.cookies['x-refresh-token'];
|
|
41
38
|
if (refreshToken) {
|
|
42
39
|
const newTokenData = await refreshTokenMiddleware(req, res, next);
|
|
43
40
|
if (newTokenData) {
|
|
44
|
-
// Set the new tokens in the cookies
|
|
45
41
|
res.cookie("x-refresh-token", newTokenData.tokens.refresh.token, {
|
|
46
42
|
httpOnly: true,
|
|
47
43
|
secure: process.env.NODE_ENV === "production",
|