Merge pull request #282 from EATSTEAK/dev

0.10.3
Twinsteak · Sep 11, 2022 · bde33e7 · bde33e7
2 parents d823d51 + a5f2a65
commit bde33e7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lockerweb",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "SSU IT Collage Locker system.",
   "private": true,
   "scripts": {

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "scripts": {
     "dev": "cross-env VITE_BASE_URL=http://localhost:3000 vite dev --port 5002 --host 0.0.0.0",
     "build": "vite build",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Backend Lambda script for lockerweb",
   "license": "MIT",
   "scripts": {

diff --git a/packages/server/src/locker/data.ts b/packages/server/src/locker/data.ts
@@ -44,7 +44,9 @@ export const claimLocker = async function (
 		TableName,
 		Key: { type: { S: 'user' }, id: { S: id } },
 		UpdateExpression: 'SET #lockerId = :lockerId, cU = :claimedUntil',
-		ConditionExpression: `#aT = :token${condition ? ` AND ((${condition}) OR iA = :true)` : ''}`,
+		ConditionExpression: `#aT = :token${
+			id !== adminId && condition ? ` AND ((${condition}) OR iA = :true)` : ''
+		}`,
 		ExpressionAttributeNames: {
 			'#lockerId': 'lockerId',
 			'#aT': 'aT'
@@ -91,7 +93,9 @@ export const unclaimLocker = async function (
 		TableName,
 		Key: { type: { S: 'user' }, id: { S: id } },
 		UpdateExpression: 'REMOVE #lockerId',
-		ConditionExpression: `#aT = :token ${condition ? ` AND ((${condition}) OR iA = :true)` : ''}`,
+		ConditionExpression: `#aT = :token ${
+			id !== adminId && condition ? ` AND ((${condition}) OR iA = :true)` : ''
+		}`,
 		ExpressionAttributeNames: {
 			'#lockerId': 'lockerId',
 			'#aT': 'aT'

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@types/lockerweb",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "types": "index.d.ts",
   "license": "MIT",
   "dependencies": {