Merge branch 'dev' into feature/profile-roles-skills-ui

.gitignore

@@ -31,4 +31,5 @@ yarn-debug.log*
 yarn-error.log*
 
 TODO
+TODO.md
 NOTES

api/functions/login/login.js

@@ -37,19 +37,19 @@ const loginHandler = async (req, res) => {
             if (existingKeys.length >= 3)
                 return res.status(400).json({ status: 'ERROR', reason: "Can only link up to 3 wallets" })
 
-            if (!existingKeys.includes(key))
-                await prisma.userKey.create({
-                    data: {
-                        key,
-                        user_id,
-                    }
-                });
-
             // Remove old linking for this key if existing
             await prisma.userKey.deleteMany({
                 where: { key }
             })
 
+            await prisma.userKey.create({
+                data: {
+                    key,
+                    user_id,
+                }
+            });
+
+
             return res
                 .status(200)
                 .json({ status: "OK" })

api/functions/upload-image-url/upload-image-url.js

@@ -0,0 +1,46 @@
+const serverless = require('serverless-http')
+const { createExpressApp } = require('../../modules')
+const express = require('express')
+const extractKeyFromCookie = require('../../utils/extractKeyFromCookie')
+const { getUserByPubKey } = require('../../auth/utils/helperFuncs')
+const { getDirectUploadUrl } = require('../../services/imageUpload.service')
+const { prisma } = require('../../prisma')
+
+const postUploadImageUrl = async (req, res) => {
+    const userPubKey = await extractKeyFromCookie(req.headers.cookie ?? req.headers.Cookie)
+    const user = await getUserByPubKey(userPubKey)
+
+    if (!user) return res.status(401).json({ status: 'ERROR', reason: 'Not Authenticated' })
+
+    const { filename } = req.body
+
+    if (!filename) return res.status(422).json({ status: 'ERROR', reason: "The field 'filename' is required`" })
+
+    try {
+        const uploadUrl = await getDirectUploadUrl()
+
+        await prisma.hostedImage.create({
+            data: { id: uploadUrl.id, filename },
+        })
+
+        return res.status(200).json(uploadUrl)
+    } catch (error) {
+        res.status(500).send('Unexpected error happened, please try again')
+    }
+}
+
+let app
+
+if (process.env.LOCAL) {
+    app = createExpressApp()
+    app.post('/upload-image-url', postUploadImageUrl)
+} else {
+    const router = express.Router()
+    router.post('/upload-image-url', postUploadImageUrl)
+    app = createExpressApp(router)
+}
+
+const handler = serverless(app)
+exports.handler = async (event, context) => {
+    return await handler(event, context)
+}

api/services/imageUpload.service.js

@@ -0,0 +1,35 @@
+const { CONSTS } = require('../utils')
+const axios = require('axios')
+const FormData = require('form-data')
+
+const BASE_URL = 'https://api.cloudflare.com/client/v4'
+
+const operationUrls = {
+    'image.uploadUrl': `${BASE_URL}/accounts/${CONSTS.CLOUDFLARE_IMAGE_ACCOUNT_ID}/images/v2/direct_upload`,
+}
+
+async function getDirectUploadUrl() {
+    const url = operationUrls['image.uploadUrl']
+
+    const formData = new FormData()
+    formData.append('requireSignedURLs', 'false')
+
+    const config = {
+        headers: {
+            Authorization: `Bearer ${CONSTS.CLOUDFLARE_IMAGE_API_KEY}`,
+            ...formData.getHeaders(),
+        },
+    }
+
+    const result = await axios.post(url, formData, config)
+
+    if (!result.data.success) {
+        throw new Error(result.data, { cause: result.data.errors })
+    }
+
+    return result.data.result
+}
+
+module.exports = {
+    getDirectUploadUrl,
+}

api/utils/consts.js

@@ -1,11 +1,15 @@
-const BOLT_FUN_LIGHTNING_ADDRESS = 'johns@getalby.com'; // #TODO, replace it by bolt-fun lightning address if there exist one
-const JWT_SECRET = process.env.JWT_SECRET;
+const BOLT_FUN_LIGHTNING_ADDRESS = 'johns@getalby.com' // #TODO, replace it by bolt-fun lightning address if there exist one
+const JWT_SECRET = process.env.JWT_SECRET
 const LNURL_AUTH_HOST = process.env.LNURL_AUTH_HOST
+const CLOUDFLARE_IMAGE_ACCOUNT_ID = process.env.CLOUDFLARE_IMAGE_ACCOUNT_ID
+const CLOUDFLARE_IMAGE_API_KEY = process.env.CLOUDFLARE_IMAGE_API_KEY
 
 const CONSTS = {
     JWT_SECRET,
     BOLT_FUN_LIGHTNING_ADDRESS,
     LNURL_AUTH_HOST,
+    CLOUDFLARE_IMAGE_ACCOUNT_ID,
+    CLOUDFLARE_IMAGE_API_KEY,
 }
 
-module.exports = CONSTS;
+module.exports = CONSTS

package.json

@@ -41,6 +41,7 @@
     "env-cmd": "^10.1.0",
     "express": "^4.18.1",
     "express-session": "^1.17.3",
+    "form-data": "^4.0.0",
     "framer-motion": "^6.3.0",
     "fslightbox-react": "^1.6.2-2",
     "graphql": "^16.3.0",
@@ -179,6 +180,7 @@
     "netlify-cli": "^10.0.0",
     "postcss": "^8.4.12",
     "readable-stream": "^4.1.0",
+    "serverless": "^3.22.0",
     "serverless-offline": "^8.7.0",
     "tailwindcss": "^3.0.24",
     "webpack": "^5.72.0"

prisma/migrations/20220825083012_add_hosted_image_table/migration.sql

@@ -0,0 +1,9 @@
+-- CreateTable
+CREATE TABLE "HostedImage" (
+    "id" TEXT NOT NULL,
+    "filename" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "is_used" BOOLEAN NOT NULL DEFAULT false,
+
+    CONSTRAINT "HostedImage_pkey" PRIMARY KEY ("id")
+);

prisma/schema.prisma

@@ -248,3 +248,13 @@ model GeneratedK1 {
   sid       String?
   createdAt DateTime @default(now())
 }
+
+// -----------------
+// Hosted Image
+// -----------------
+model HostedImage {
+  id        String   @id
+  filename  String
+  createdAt DateTime @default(now())
+  is_used   Boolean  @default(false)
+}

serverless.yml

@@ -76,3 +76,10 @@ functions:
       - http:
           path: pubkeys-to-users
           method: post
+
+  upload-image-url:
+    handler: api/functions/upload-image-url/upload-image-url.handler
+    events:
+      - http:
+          path: upload-image-url
+          method: post

src/features/Auth/pages/LoginPage/LoginPage.tsx

@@ -175,7 +175,7 @@ export default function LoginPage() {
                 Scan this code or copy + paste it to your lightning wallet. Or click to login with your browser's wallet.
             </p>
             <div className="w-full flex flex-col items-stretch gap-16">
-                <a href={lnurl}
+                <a href={`lightning:${lnurl}`}
                     className='grow block text-body4 text-center text-white font-bolder bg-primary-500 hover:bg-primary-600 rounded-10 px-16 py-12 active:scale-90 transition-transform'
                 >Click to connect <IoRocketOutline /></a>
                 <Button

src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/LinkedAccountsCard.tsx

@@ -81,6 +81,7 @@ export default function LinkedAccountsCard({ value, onChange }: Props) {
                 <Button color='none' size='sm' className='mt-16 text-gray-600 hover:bg-gray-50' onClick={connectNewWallet}>
                     + Add another wallet
                 </Button>}
+            <p className="text-body5 text-gray-400 mt-24"><span className="font-bold">Note</span>: if you link a wallet that was used to create another account previously, you won't be able to login to that account until you remove it from here.</p>
         </Card>
     )
 }