@galadrim/galadmin 0.1.232 → 0.1.233

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.232",
+  "version": "0.1.233",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -16,8 +16,9 @@
     "@google-cloud/storage": "^7.17.2",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
+    "@aws-sdk/client-s3": "^3.1114.0",
+    "@aws-sdk/s3-request-presigner": "^3.1114.0",
     "argon2": "^0.31.2",
-    "aws-sdk": "^2.958.0",
     "axios": "^0.28.1",
     "bcryptjs": "^2.4.3",
     "connect-pg-simple": "^9.0.1",

package/src/api.ts

@@ -5,7 +5,8 @@ import * as path from "path";
 import * as crypto from "crypto";
 import * as mime from "mime";
 
-import { S3, Endpoint } from "aws-sdk";
+import { S3Client, PutObjectCommand } from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { Storage } from "@google-cloud/storage";
 import sizeOf from "image-size";
 import * as serializeJs from "serialize-javascript";
@@ -1280,28 +1281,42 @@ export default (db, config) => {
             Math.random().toString().substr(2) +
             "." +
             extension;
-          const s3 = new S3({
-            endpoint: new Endpoint(s3Config.host),
-            accessKeyId: s3Config.accessKeyId,
-            secretAccessKey: s3Config.secretAccessKey,
+          const rawHost = String(s3Config.host || "");
+          const endpoint = /^https?:\/\//i.test(rawHost)
+            ? rawHost
+            : `https://${rawHost}`;
+          const s3 = new S3Client({
+            endpoint,
             region: s3Config.region,
-            signatureVersion: "v4",
+            credentials: {
+              accessKeyId: s3Config.accessKeyId,
+              secretAccessKey: s3Config.secretAccessKey,
+            },
+            forcePathStyle: false,
           });
           if (s3Config.signedUrlNeeded) {
-            const signedUrl = s3.getSignedUrl("putObject", {
-              Bucket: s3Config.bucket,
-              Key: path,
-              ContentType: contentType,
-              Expires: 150,
-            });
-            axios
-              .put(signedUrl, fs.readFileSync(files[fileParamName][0].path), {
-                maxContentLength: 100000000000,
-                maxBodyLength: 100000000000,
-                headers: {
-                  "Content-Type": contentType,
-                },
-              })
+            getSignedUrl(
+              s3,
+              new PutObjectCommand({
+                Bucket: s3Config.bucket,
+                Key: path,
+                ContentType: contentType,
+              }),
+              { expiresIn: 150 }
+            )
+              .then((signedUrl) =>
+                axios.put(
+                  signedUrl,
+                  fs.readFileSync(files[fileParamName][0].path),
+                  {
+                    maxContentLength: 100000000000,
+                    maxBodyLength: 100000000000,
+                    headers: {
+                      "Content-Type": contentType,
+                    },
+                  }
+                )
+              )
               .then(() => {
                 res.status(200).send({
                   path: s3Config.pathTransform
@@ -1315,16 +1330,16 @@ export default (db, config) => {
                 res.status(500).send(e);
               });
           } else {
-            s3.putObject(
-              {
+            s3.send(
+              new PutObjectCommand({
                 Body: fs.readFileSync(files[fileParamName][0].path),
                 Bucket: s3Config.bucket,
                 ContentType: contentType,
                 ACL: "public-read",
                 Key: path,
-              },
-              function (err, data) {
-                if (err) return res.status(500).send(err);
+              })
+            )
+              .then(() => {
                 res.send({
                   url: `https://${s3Config.host}/${s3Config.bucket}/${path}`,
                   path: s3Config.pathTransform
@@ -1333,8 +1348,8 @@ export default (db, config) => {
                   aspectRatio,
                   originalFilename,
                 });
-              }
-            );
+              })
+              .catch((err) => res.status(500).send(err));
           }
         }
       });

package/src/front/ckeditor5-build/node_modules/.bin/semver

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../semver/bin/semver.js" "$@"
+else 
+  exec node  "$basedir/../semver/bin/semver.js" "$@"
+fi

package/src/front/ckeditor5-build/node_modules/.bin/semver.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\semver\bin\semver.js" %*

package/src/front/ckeditor5-build/node_modules/.bin/semver.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../semver/bin/semver.js" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../semver/bin/semver.js" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../semver/bin/semver.js" $args
+  } else {
+    & "node$exe"  "$basedir/../semver/bin/semver.js" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret