Skip to content

Commit b9539e5

Browse files
author
DylanBulmer
committed
update auth; trying to fix auth error
1 parent 9d6f9ed commit b9539e5

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@codrjs/core",
3-
"version": "1.0.6-patch1",
3+
"version": "1.0.6-patch2",
44
"description": "An open-sourced customizable annotation tool",
55
"main": "index.js",
66
"repository": "git@github.com:CodrJS/Core.git",

src/services/auth.ts

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import App from "./app.js";
77
import Mail from "./mail/index.js";
88
import Email from "../classes/Email.js";
99
import SigninTemplate from "../classes/Mail/Template/Signin.js";
10-
import User from "../models/User.js";
10+
import User, { IUser } from "../models/User.js";
1111
import Response from "../classes/Response.js";
1212
import { generateToken } from "../classes/JWT.js";
1313
import Error from "../classes/Error.js";
@@ -90,32 +90,36 @@ class Authentication {
9090
// * the token was created less than 5 minutes ago
9191
// * and the token is not expired (has not been used already)
9292
if (accessToken.isValid(token)) {
93-
// generate JWT token
94-
const token = generateToken(user);
9593

96-
// update access code
94+
// update access token
9795
accessToken.use();
9896

99-
// update user
100-
return user
101-
.updateOne({
102-
accessToken: accessToken.encode(),
103-
refreshToken: new AccessToken(uuidv4()).encode(),
104-
})
105-
.then(() => {
106-
return new Response<{ token: string }>({
107-
message: `Login successful.`,
108-
details: { token },
109-
});
110-
})
111-
.catch(e => {
112-
throw new Error({
113-
status: 500,
114-
message:
115-
e?.message ||
116-
"An unexpected error occured while updating a user.",
117-
});
97+
// init user update
98+
const update = {
99+
accessToken: accessToken.encode(),
100+
refreshToken: new AccessToken(uuidv4()).encode(),
101+
};
102+
103+
try {
104+
// update user
105+
await user.updateOne(update);
106+
107+
// generate JWT token
108+
const token = generateToken({ ...user, ...update } as IUser);
109+
110+
// send response
111+
return new Response<{ token: string }>({
112+
message: `Login successful.`,
113+
details: { token },
114+
});
115+
} catch (e: any) {
116+
throw new Error({
117+
status: 500,
118+
message:
119+
e?.message ||
120+
"An unexpected error occured while updating a user.",
118121
});
122+
}
119123
} else
120124
throw new Error({
121125
status: 500,

0 commit comments

Comments
 (0)