Some small changes

Author: fatfingers23

app/composables/useAtproto.ts

@@ -1,7 +1,7 @@
 import { ERROR_NEED_REAUTH } from '#imports'
 import type { FetchError } from 'ofetch'
 import type { UserSession } from '#shared/schemas/userSession'
-import type { PackageLikes } from '~~/server/utils/atproto/utils/likes'
+import type { PackageLikes } from '#server/utils/atproto/utils/likes'
 
 export async function authRedirect(identifier: string, create: boolean = false) {
   let query = { handle: identifier } as {}

server/api/auth/social/like.delete.ts

@@ -1,7 +1,6 @@
 import { Client } from '@atproto/lex'
 import * as dev from '#shared/types/lexicons/dev'
-import { LIKES_SCOPE } from '~~/shared/utils/constants'
-import { checkOAuthScope } from '~~/server/utils/atproto/oauth'
+import { throwOnMissingOAuthScope } from '#server/utils/atproto/oauth'
 
 export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
   const loggedInUsersDid = oAuthSession?.did.toString()
@@ -10,6 +9,9 @@ export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
     throw createError({ statusCode: 401, statusMessage: 'Unauthorized' })
   }
 
+  //Checks if the user has a scope to like packages
+  await throwOnMissingOAuthScope(oAuthSession, LIKES_SCOPE)
+
   const body = await readBody<{ packageName: string }>(event)
 
   if (!body.packageName) {
@@ -25,9 +27,8 @@ export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
     body.packageName,
     loggedInUsersDid,
   )
+
   if (getTheUsersLikedRecord) {
-    //Checks if the user has a scope to like packages
-    await checkOAuthScope(oAuthSession, LIKES_SCOPE)
     const client = new Client(oAuthSession)
 
     await client.delete(dev.npmx.feed.like, {

server/api/auth/social/like.post.ts

@@ -1,8 +1,8 @@
 import { Client } from '@atproto/lex'
 import * as dev from '#shared/types/lexicons/dev'
 import type { UriString } from '@atproto/lex'
-import { LIKES_SCOPE } from '~~/shared/utils/constants'
-import { checkOAuthScope } from '~~/server/utils/atproto/oauth'
+import { LIKES_SCOPE } from '#shared/utils/constants'
+import { throwOnMissingOAuthScope } from '~~/server/utils/atproto/oauth'
 
 export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
   const loggedInUsersDid = oAuthSession?.did.toString()
@@ -11,6 +11,9 @@ export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
     throw createError({ statusCode: 401, statusMessage: 'Unauthorized' })
   }
 
+  //Checks if the user has a scope to like packages
+  await throwOnMissingOAuthScope(oAuthSession, LIKES_SCOPE)
+
   const body = await readBody<{ packageName: string }>(event)
 
   if (!body.packageName) {
@@ -30,9 +33,6 @@ export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
     })
   }
 
-  //Checks if the user has a scope to like packages
-  await checkOAuthScope(oAuthSession, LIKES_SCOPE)
-
   const subjectRef = PACKAGE_SUBJECT_REF(body.packageName)
   const client = new Client(oAuthSession)
 
@@ -49,5 +49,5 @@ export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
     })
   }
 
-  return await likesUtil.likeAPackageAndRetunLikes(body.packageName, loggedInUsersDid, result.uri)
+  return await likesUtil.likeAPackageAndReturnLikes(body.packageName, loggedInUsersDid, result.uri)
 })

server/utils/atproto/oauth.ts

@@ -61,12 +61,13 @@ async function getOAuthSession(event: H3Event): Promise<OAuthSession | undefined
 }
 
 /**
+ * Throws if the logged in OAuth Session does not have the required scopes.
  * As we add new scopes we need to check if the client has the ability to use it.
  * If not need to let the client know to redirect the user to the PDS to upgrade their scopes.
  * @param oAuthSession - The current OAuth session from the event
  * @param requiredScopes - The required scope you are checking if you can use
  */
-export async function checkOAuthScope(oAuthSession: OAuthSession, requiredScopes: string) {
+export async function throwOnMissingOAuthScope(oAuthSession: OAuthSession, requiredScopes: string) {
   const tokenInfo = await oAuthSession.getTokenInfo()
   if (!tokenInfo.scope.includes(requiredScopes)) {
     throw createError({

server/utils/atproto/utils/likes.ts

@@ -1,6 +1,6 @@
 import { getCacheAdatper } from '../../cache'
 import { $nsid as likeNsid } from '#shared/types/lexicons/dev/npmx/feed/like.defs'
-import type { Backlink } from '~~/shared/utils/constellation'
+import type { Backlink } from '#shared/utils/constellation'
 
 /**
  * Likes for a npm package on npmx
@@ -123,7 +123,7 @@ export class PackageLikesUtils {
     return {
       totalLikes: totalLikes,
       userHasLiked,
-    } as PackageLikes
+    }
   }
 
   /**
@@ -151,7 +151,7 @@ export class PackageLikesUtils {
    * @param usersDid
    * @param atUri - The URI of the like record
    */
-  async likeAPackageAndRetunLikes(
+  async likeAPackageAndReturnLikes(
     packageName: string,
     usersDid: string,
     atUri: string,
@@ -181,7 +181,7 @@ export class PackageLikesUtils {
     return {
       totalLikes: totalLikes,
       userHasLiked: true,
-    } as PackageLikes
+    }
   }
 
   /**
@@ -241,6 +241,6 @@ export class PackageLikesUtils {
     return {
       totalLikes: totalLikes,
       userHasLiked: false,
-    } as PackageLikes
+    }
   }
 }