@auth/dynamodb-adapter 1.0.12 → 1.0.14

package/README.md

@@ -25,4 +25,4 @@
 
 ---
 
-Check out the documentation at [authjs.dev](https://authjs.dev/reference/adapter/dynamodb).
+Check out the documentation at [authjs.dev](https://authjs.dev/reference/adapter/dynamodb).

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EACV,OAAO,EAKR,MAAM,qBAAqB,CAAA;AAE5B,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsII;AACJ,wBAAgB,eAAe,CAC7B,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAyST;AASD,QAAA,MAAM,MAAM;IACV,8EAA8E;eACnE,OAAO,MAAM,EAAE,GAAG,CAAC;IAY9B,sEAAsE;+CAC3B,OAAO,MAAM,EAAE,GAAG,CAAC;CAsB/D,CAAA;AAED,iBAAS,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAC9D,gBAAgB,EAAE,MAAM,CAAA;IACxB,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChD,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACnD,CAgBA;AAED,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EACV,OAAO,EAKR,MAAM,qBAAqB,CAAA;AAE5B,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsII;AACJ,wBAAgB,eAAe,CAC7B,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CA+ST;AASD,QAAA,MAAM,MAAM;IACV,8EAA8E;eACnE,OAAO,MAAM,EAAE,GAAG,CAAC;IAY9B,sEAAsE;+CAC3B,OAAO,MAAM,EAAE,GAAG,CAAC;CAsB/D,CAAA;AAED,iBAAS,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAC9D,gBAAgB,EAAE,MAAM,CAAA;IACxB,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChD,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACnD,CAgBA;AAED,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAA"}

package/index.js

@@ -377,11 +377,14 @@ export function DynamoDBAdapter(client, options) {
             });
             if (!data.Items?.length)
                 return null;
-            const { pk, sk } = data.Items[0];
+            const sessionRecord = data.Items[0];
             const { UpdateExpression, ExpressionAttributeNames, ExpressionAttributeValues, } = generateUpdateExpression(session);
             const res = await client.update({
                 TableName,
-                Key: { pk, sk },
+                Key: {
+                    [pk]: sessionRecord[pk],
+                    [sk]: sessionRecord[sk],
+                },
                 UpdateExpression,
                 ExpressionAttributeNames,
                 ExpressionAttributeValues,
@@ -405,10 +408,13 @@ export function DynamoDBAdapter(client, options) {
             });
             if (!data?.Items?.length)
                 return null;
-            const { pk, sk } = data.Items[0];
+            const sessionRecord = data.Items[0];
             const res = await client.delete({
                 TableName,
-                Key: { pk, sk },
+                Key: {
+                    [pk]: sessionRecord[pk],
+                    [sk]: sessionRecord[sk],
+                },
                 ReturnValues: "ALL_OLD",
             });
             return format.from(res.Attributes);

package/jest.config.js

@@ -1,9 +1,14 @@
+import config from "utils/adapter/jest-preset.js"
+import path from 'node:path'
+
+process.env.JEST_DYNAMODB_CONFIG = path.resolve('./jest-dynamodb-config.cjs');
+
 /*
  * For a detailed explanation regarding each configuration property and type check, visit:
  * https://jestjs.io/docs/en/configuration.html
  */
-module.exports = {
-  ...require("@next-auth/adapter-test/jest/jest-preset"),
+export default {
+  ...config,
   // // Indicates whether the coverage information should be collected while executing the test
   // collectCoverage: true,
   // // Indicates which provider should be used to instrument code for coverage

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@auth/dynamodb-adapter",
   "repository": "https://github.com/nextauthjs/next-auth",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "AWS DynamoDB adapter for next-auth.",
   "keywords": [
     "next-auth",
@@ -42,10 +42,10 @@
   "devDependencies": {
     "@aws-sdk/client-dynamodb": "^3.36.1",
     "@aws-sdk/lib-dynamodb": "^3.36.1",
-    "@shelf/jest-dynamodb": "^2.1.0"
+    "@shelf/jest-dynamodb": "^3.4.2"
   },
   "dependencies": {
-    "@auth/core": "0.19.0"
+    "@auth/core": "0.20.0"
   },
   "scripts": {
     "test:default": "jest",

package/src/index.ts

@@ -406,7 +406,7 @@ export function DynamoDBAdapter(
         },
       })
       if (!data.Items?.length) return null
-      const { pk, sk } = data.Items[0] as any
+      const sessionRecord = data.Items[0]
       const {
         UpdateExpression,
         ExpressionAttributeNames,
@@ -414,7 +414,10 @@ export function DynamoDBAdapter(
       } = generateUpdateExpression(session)
       const res = await client.update({
         TableName,
-        Key: { pk, sk },
+        Key: {
+          [pk]: sessionRecord[pk],
+          [sk]: sessionRecord[sk],
+        },
         UpdateExpression,
         ExpressionAttributeNames,
         ExpressionAttributeValues,
@@ -438,11 +441,14 @@ export function DynamoDBAdapter(
       })
       if (!data?.Items?.length) return null
 
-      const { pk, sk } = data.Items[0]
+      const sessionRecord = data.Items[0]
 
       const res = await client.delete({
         TableName,
-        Key: { pk, sk },
+        Key: {
+          [pk]: sessionRecord[pk],
+          [sk]: sessionRecord[sk],
+        },
         ReturnValues: "ALL_OLD",
       })
       return format.from<AdapterSession>(res.Attributes)

package/jest-dynamodb-config.js

@@ -1,41 +0,0 @@
-module.exports = {
-  tables: [
-    {
-      TableName: `next-auth`,
-      KeySchema: [
-        { AttributeName: "pk", KeyType: "HASH" },
-        { AttributeName: "sk", KeyType: "RANGE" },
-      ],
-      AttributeDefinitions: [
-        { AttributeName: "sk", AttributeType: "S" },
-        { AttributeName: "pk", AttributeType: "S" },
-        { AttributeName: "GSI1PK", AttributeType: "S" },
-        { AttributeName: "GSI1SK", AttributeType: "S" },
-      ],
-      GlobalSecondaryIndexes: [
-        {
-          IndexName: "GSI1",
-          KeySchema: [
-            { AttributeName: "GSI1PK", KeyType: "HASH" },
-            { AttributeName: "GSI1SK", KeyType: "RANGE" },
-          ],
-          Projection: {
-            ProjectionType: "ALL",
-          },
-          ProvisionedThroughput: {
-            ReadCapacityUnits: 1,
-            WriteCapacityUnits: 1,
-          },
-        },
-      ],
-      ProvisionedThroughput: { ReadCapacityUnits: 1, WriteCapacityUnits: 1 },
-    },
-    // etc
-  ],
-  port: 8000,
-  installerConfig: {
-    installPath: "./dynamodblocal-bin",
-    downloadUrl:
-      "https://s3.eu-central-1.amazonaws.com/dynamodb-local-frankfurt/dynamodb_local_latest.tar.gz",
-  },
-}