feat: update decodeJWT

src/auth/auth.service.ts

@@ -15,7 +15,7 @@ import { RegisterInput } from './dtos/register.input'
 import { ValidateTOTPInput } from './dtos/validate-totp.input'
 import { ChangePasswordInput } from './dtos/change-password.input'
 import { TOTP_ENCODE, IP_STACK_URL } from '../shared/constants'
-import { generateQRCode, generateRecoveryCodes, decodeJwt, encryptPassword } from '../shared/utils'
+import { generateQRCode, generateRecoveryCodes, decodeJWT, encryptPassword } from '../shared/utils'
 
 @Injectable()
 export class AuthService {
@@ -73,7 +73,7 @@ export class AuthService {
   }
 
   public async createTOTP(token: string) {
-    const { email } = decodeJwt(token)
+    const { email } = decodeJWT(token)
     const { base32, otpauth_url } = speakeasy.generateSecret({
       name: email,
     })
@@ -83,7 +83,7 @@ export class AuthService {
   }
 
   public async validateTOTP(input: ValidateTOTPInput, token: string) {
-    const { sub: userId } = decodeJwt(token)
+    const { sub: userId } = decodeJWT(token)
     const { key, code } = input
 
     const verified = speakeasy.totp.verify({
@@ -101,7 +101,7 @@ export class AuthService {
   }
 
   public async createRecoveryCodes(token: string) {
-    const { sub: userId } = decodeJwt(token)
+    const { sub: userId } = decodeJWT(token)
 
     const codes = generateRecoveryCodes()
     const res = await this.usersService.updateUser({ id: userId, recoveryCodes: codes })
@@ -110,7 +110,7 @@ export class AuthService {
   }
 
   public async validateRecoveryCode(input: ValidateTOTPInput, token: string) {
-    const { sub: userId } = decodeJwt(token)
+    const { sub: userId } = decodeJWT(token)
 
     const { code } = input
     const { recoveryCodes } = await this.usersService.findOneById(userId)
@@ -131,7 +131,7 @@ export class AuthService {
 
   public async changePassword(input: ChangePasswordInput, token: string) {
     const { oldPassword, newPassword } = input
-    const { sub: userId } = decodeJwt(token)
+    const { sub: userId } = decodeJWT(token)
     const user = await this.usersService.findOneById(userId)
 
     if (user && user.isValidPassword(oldPassword, user.password)) {
@@ -149,7 +149,7 @@ export class AuthService {
     const IP_STACK_ACCESS_KEY = this.configService.getIpStackAccessKey()
     const token = req.headers.authorization
     const userAgent = req.headers['user-agent']
-    const { sub: userId } = decodeJwt(token)
+    const { sub: userId } = decodeJWT(token)
     const ip = requestIP.getClientIp(req)
 
     const network = {

src/global-setting/global-setting.resolver.ts

@@ -12,7 +12,6 @@ export class GlobalSettingResolver {
   }
 
   @Query(() => GlobalSettingModel)
-  @UseGuards(GqlAuthGuard)
   public async getGlobalSetting() {
     return this.globalSettingService.findOne()
   }

src/shared/utils.ts

@@ -27,6 +27,6 @@ export const generateRecoveryCodes = () => {
   return codes
 }
 
-export const decodeJwt = (token: string) => jwt.decode(token.slice(7)) as Payload
+export const decodeJWT = (token: string) => jwt.decode(token.slice(7)) as Payload
 
 export const encryptPassword = (password: string) => bcrypt.hashSync(password, 10)

src/sms/sms.service.ts

@@ -10,7 +10,7 @@ import { UsersService } from '../users/users.service'
 import { SMS, AliSMSParams } from './interfaces/sms.interface'
 import { ValidateSMSInput } from './dtos/validateSMS.input'
 import { ALI_SMS_END_POINT, ALI_SMS_API_VERSION, ALI_SMS_REGION } from '../shared/constants'
-import { decodeJwt } from '../shared/utils'
+import { decodeJWT } from '../shared/utils'
 
 @Injectable()
 export class SMSService {
@@ -78,7 +78,7 @@ export class SMSService {
   }
 
   public async validateSMSVerificationCode(input: ValidateSMSInput, token: string) {
-    const { sub: userId } = decodeJwt(token)
+    const { sub: userId } = decodeJWT(token)
 
     const { phoneNumber, smsCode } = input
 

src/users/users.resolver.ts

@@ -6,7 +6,7 @@ import { UserModel } from './models/user.model'
 import { UpdateUserInput } from './dtos/update-user.input'
 import { GqlAuthGuard } from '../shared/guard/gqlAuth.guard'
 import { ReqDecorator } from '../shared/decorators/req.decorator'
-import { decodeJwt } from '../shared/utils'
+import { decodeJWT } from '../shared/utils'
 
 @Resolver(() => UserModel)
 export class UserResolver {
@@ -17,7 +17,7 @@ export class UserResolver {
   @Mutation(() => UserModel)
   @UseGuards(GqlAuthGuard)
   public async updateUser(@Args('input') input: UpdateUserInput, @ReqDecorator() req: Request) {
-    const { sub: userId } = decodeJwt(req.headers.authorization)
+    const { sub: userId } = decodeJWT(req.headers.authorization)
     return this.usersService.updateUser({ ...input, id: userId })
   }
 

src/users/users.service.ts

@@ -6,7 +6,7 @@ import { ForbiddenError } from 'apollo-server-express'
 import { User } from './interfaces/user.interface'
 import { UpdateUserInput } from './dtos/update-user.input'
 import { RegisterInput } from '../auth/dtos/register.input'
-import { decodeJwt } from '../shared/utils'
+import { decodeJWT } from '../shared/utils'
 
 @Injectable()
 export class UsersService {
@@ -43,7 +43,7 @@ export class UsersService {
   }
 
   public async updateUserName(username: string, req: Request): Promise<User> {
-    const { sub: id } = decodeJwt(req.headers.authorization)
+    const { sub: id } = decodeJWT(req.headers.authorization)
     const user = await this.findOneByUserName(username)
 
     if (!user) {
@@ -54,7 +54,7 @@ export class UsersService {
   }
 
   public async updateEmail(email: string, req: Request): Promise<User> {
-    const { sub: id } = decodeJwt(req.headers.authorization)
+    const { sub: id } = decodeJWT(req.headers.authorization)
     const user = await this.findOneByEmail(email)
 
     if (!user) {
@@ -64,7 +64,7 @@ export class UsersService {
   }
 
   public async deleteOneById(req: Request): Promise<User> {
-    const { sub: id } = decodeJwt(req.headers.authorization)
+    const { sub: id } = decodeJWT(req.headers.authorization)
     return this.UserModel.findByIdAndDelete(id)
   }
 }