upgrade deps; restructure tests

Author: omar2205

deps.ts

@@ -1,15 +1,17 @@
 export {
-  encode as b64Encode,
   decode as b64Decode,
-} from 'https://deno.land/std@0.152.0/encoding/base64.ts'
+  encode as b64Encode,
+} from 'https://deno.land/std@0.181.0/encoding/base64.ts'
 
 export {
-  encode as safeEncode,
   decode as safeDecode,
-} from 'https://esm.sh/url-safe-base64@1.2.0'
+  encode as safeEncode,
+} from 'https://esm.sh/url-safe-base64@1.3.0'
 
 export {
+  type Cookie,
   getCookies,
   setCookie,
-  type Cookie,
-} from 'https://deno.land/std@0.150.0/http/cookie.ts'
+} from 'https://deno.land/std@0.181.0/http/cookie.ts'
+
+export { assertEquals } from 'https://deno.land/std@0.181.0/testing/asserts.ts'

index.ts

@@ -1,4 +1,4 @@
-import { type Cookie, setCookie, getCookies } from './deps.ts'
+import { type Cookie, getCookies, setCookie } from './deps.ts'
 import { createKey, sign, verify } from './utils.ts'
 
 /**
@@ -31,15 +31,11 @@ const cookieVerify = async (input: string, secret: string) => {
   // get the signature and raw data
   try {
     const inputArr = input.split('.')
-    let data, signature = ''
 
-    // if we have more '.'
-    if (inputArr.length !== 3) {
-      data = inputArr.slice(0, -2).join('.')
-      signature = inputArr.at(-2)!
-    } else {
-      [data, signature] = inputArr
-    }
+    const data = inputArr.slice(0, -1).join('.')
+    const signature = inputArr.at(-1)
+
+    if (!signature) throw Error('Invalid input: Bad data')
 
     return await verify(key, signature, data)
   } catch (_err) {
@@ -62,7 +58,7 @@ const createSignedCookie = async (
   cookie_name: string,
   cookie_value: string,
   secret: string,
-  opts: CookieOptions
+  opts: CookieOptions = { path: '/' }
 ) => {
   const value = await cookieSign(cookie_value, secret)
 
@@ -93,7 +89,7 @@ const verifySignedCookie = async (
 ) => {
   const cookie = getCookies(headers)[cookie_name]
 
-  if (cookie && await cookieVerify(cookie, secret)) {
+  if (cookie && (await cookieVerify(cookie, secret))) {
     return cookie
   }
   return false

tests/index.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from 'https://deno.land/std@0.152.0/testing/asserts.ts'
+import { assertEquals } from '../deps.ts'
 import {
   cookieSign,
   cookieVerify,
@@ -8,9 +8,9 @@ import {
 
 // holds all cookie operations results
 const cookies_res = {
-  hello_super_secret: 'hello.gsSaKanhysk-CuNkIJhUWsHItAOcFZbrNNTa95qCfAE.',
-  id_1_super_secret: '1.GA7yYwRpQqUvy5YbaBCGljYgC-s2VCguiN6jhjPJDNo.',
-  id_1_extra_super_secret: 'id=1.GA7yYwRpQqUvy5YbaBCGljYgC-s2VCguiN6jhjPJDNo.; HttpOnly; Path=/',
+  hello_super_secret: await cookieSign('hello', 'super_secret'),
+  id_1_super_secret: await cookieSign('1', 'super_secret'),
+  id_1_extra_super_secret: `id=${await cookieSign('1', 'super_secret')}; HttpOnly; Path=/`,
 }
 
 Deno.test('cookie testing', async (t) => {