fix: await async generateToken in auth service

- Add await to all generateToken() calls
- Fixes empty token issue in login/register responses
- Token now properly includes user role for admin access
This commit is contained in:
dwindown
2025-10-11 18:08:01 +07:00
parent 1c28e51b53
commit ddca073610
12 changed files with 17 additions and 17 deletions

0
-H Normal file
View File

0
-d Normal file
View File

BIN
.DS_Store vendored

Binary file not shown.

BIN
apps/.DS_Store vendored

Binary file not shown.

BIN
apps/api/.DS_Store vendored

Binary file not shown.

View File

@@ -21,7 +21,7 @@ export declare class AuthController {
avatarUrl: string | null; avatarUrl: string | null;
emailVerified: boolean; emailVerified: boolean;
}; };
token: Promise<string>; token: string;
}>; }>;
login(body: { login(body: {
email: string; email: string;
@@ -44,7 +44,7 @@ export declare class AuthController {
avatarUrl: string | null; avatarUrl: string | null;
emailVerified: boolean; emailVerified: boolean;
}; };
token: Promise<string>; token: string;
requiresOtp?: undefined; requiresOtp?: undefined;
availableMethods?: undefined; availableMethods?: undefined;
tempToken?: undefined; tempToken?: undefined;
@@ -61,7 +61,7 @@ export declare class AuthController {
avatarUrl: string | null; avatarUrl: string | null;
emailVerified: boolean; emailVerified: boolean;
}; };
token: Promise<string>; token: string;
}>; }>;
googleAuth(): Promise<void>; googleAuth(): Promise<void>;
googleAuthCallback(req: any, res: Response): Promise<void>; googleAuthCallback(req: any, res: Response): Promise<void>;

View File

@@ -14,7 +14,7 @@ export declare class AuthService {
avatarUrl: string | null; avatarUrl: string | null;
emailVerified: boolean; emailVerified: boolean;
}; };
token: Promise<string>; token: string;
}>; }>;
login(email: string, password: string): Promise<{ login(email: string, password: string): Promise<{
requiresOtp: boolean; requiresOtp: boolean;
@@ -34,7 +34,7 @@ export declare class AuthService {
avatarUrl: string | null; avatarUrl: string | null;
emailVerified: boolean; emailVerified: boolean;
}; };
token: Promise<string>; token: string;
requiresOtp?: undefined; requiresOtp?: undefined;
availableMethods?: undefined; availableMethods?: undefined;
tempToken?: undefined; tempToken?: undefined;
@@ -62,7 +62,7 @@ export declare class AuthService {
avatarUrl: string | null; avatarUrl: string | null;
emailVerified: boolean; emailVerified: boolean;
}; };
token: Promise<string>; token: string;
requiresOtp?: undefined; requiresOtp?: undefined;
availableMethods?: undefined; availableMethods?: undefined;
tempToken?: undefined; tempToken?: undefined;
@@ -75,7 +75,7 @@ export declare class AuthService {
avatarUrl: string | null; avatarUrl: string | null;
emailVerified: boolean; emailVerified: boolean;
}; };
token: Promise<string>; token: string;
}>; }>;
private generateToken; private generateToken;
private generateTempToken; private generateTempToken;

View File

@@ -80,7 +80,7 @@ let AuthService = class AuthService {
emailVerified: false, emailVerified: false,
}, },
}); });
const token = this.generateToken(user.id, user.email); const token = await this.generateToken(user.id, user.email);
return { return {
user: { user: {
id: user.id, id: user.id,
@@ -142,7 +142,7 @@ let AuthService = class AuthService {
tempToken: this.generateTempToken(user.id, user.email), tempToken: this.generateTempToken(user.id, user.email),
}; };
} }
const token = this.generateToken(user.id, user.email); const token = await this.generateToken(user.id, user.email);
return { return {
user: { user: {
id: user.id, id: user.id,
@@ -246,7 +246,7 @@ let AuthService = class AuthService {
tempToken: this.generateTempToken(user.id, user.email), tempToken: this.generateTempToken(user.id, user.email),
}; };
} }
const token = this.generateToken(user.id, user.email); const token = await this.generateToken(user.id, user.email);
return { return {
user: { user: {
id: user.id, id: user.id,
@@ -305,7 +305,7 @@ let AuthService = class AuthService {
throw new common_1.UnauthorizedException('Invalid TOTP code'); throw new common_1.UnauthorizedException('Invalid TOTP code');
} }
} }
const token = this.generateToken(userId, email); const token = await this.generateToken(userId, email);
return { return {
user: { user: {
id: user.id, id: user.id,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

BIN
apps/api/src/.DS_Store vendored Normal file

Binary file not shown.

View File

@@ -44,7 +44,7 @@ export class AuthService {
}); });
// Generate JWT token // Generate JWT token
const token = this.generateToken(user.id, user.email); const token = await this.generateToken(user.id, user.email);
return { return {
user: { user: {
@@ -123,7 +123,7 @@ export class AuthService {
} }
// Generate full JWT token // Generate full JWT token
const token = this.generateToken(user.id, user.email); const token = await this.generateToken(user.id, user.email);
return { return {
user: { user: {
@@ -259,7 +259,7 @@ export class AuthService {
} }
// Generate JWT token // Generate JWT token
const token = this.generateToken(user.id, user.email); const token = await this.generateToken(user.id, user.email);
return { return {
user: { user: {
@@ -345,7 +345,7 @@ export class AuthService {
} }
// Generate full JWT token // Generate full JWT token
const token = this.generateToken(userId, email); const token = await this.generateToken(userId, email);
return { return {
user: { user: {