Minor review/arc31

assets/arc-0031/.editorconfig

@@ -0,0 +1,10 @@
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

assets/arc-0031/.eslintrc.cjs

@@ -0,0 +1,13 @@
+module.exports = {
+  root: true,
+  extends: ['@mrcointreau/eslint-config-typescript'],
+  parserOptions: {
+    project: ['./tsconfig.eslint.json']
+  },
+  ignorePatterns: [
+    '*.min.*',
+    '*.d.ts',
+    'dist',
+    'package-lock.json'
+  ]
+}

assets/arc-0031/.gitignore

@@ -1,20 +1,32 @@
 # Logs
-logs
+logs/
 *.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
-node_modules
-.DS_Store
+# node_modules
+node_modules/
+
+# Nuxt dev/build outputs
+.output
+.data
+.nuxt
+.nitro
+.cache
 dist
-dist-ssr
-coverage
+
+# Misc files and directories
+.DS_Store
+.fleet
+.idea
 *.local
+
+# Local environment files
 .env
-.env.*.
+.env.*
 !.env.example
 
 # Editor directories and files

assets/arc-0031/README.md

@@ -8,7 +8,7 @@ The example shows the entire workflow of authentication using a standalone Algor
 
 ## User registration
 
-Add registered users to the `server/mock/users.db.json` array. The `nonce` field must be left empty `''`.
+Add registered users to the `server/mock/users.db.ts` array. The `challenge` field must be left empty `''`.
 
 ## Run via Docker Compose
 
@@ -27,7 +27,7 @@ Visit `localhost`
 - `node.js`
 - `npm`
 
-From both `client`and `server` folders run
+From the root folder run:
 
 ```
 cp .env.example .env
@@ -36,3 +36,5 @@ npm run dev
 ```
 
 Visit `localhost:3001`
+
+> Reference implementation credits: [deanstef](https://github.com/deanstef) and [mrcointreau](https://github.com/mrcointreau)

assets/arc-0031/client/.eslintrc

@@ -13,7 +13,10 @@
   "rules": {
     "@typescript-eslint/consistent-type-exports": "error",
     "@typescript-eslint/consistent-type-imports": "error",
-    "@typescript-eslint/indent": ["error", 2]
+    "@typescript-eslint/indent": [
+      "error",
+      2
+    ]
   },
   "overrides": [
     {

assets/arc-0031/client/Dockerfile

@@ -1,13 +1,17 @@
-FROM node:20-slim AS base
-WORKDIR /client
+FROM node:20-alpine AS base
+WORKDIR /arc31
 
 FROM base AS build
 COPY package*.json ./
-RUN npm ci && npm cache clean --force
+COPY tsconfig.json ./
+COPY packages/arc31/package*.json ./packages/arc31/
+COPY client/package*.json ./client/
+COPY client/tsconfig.json ./client/
+RUN npm ci
 COPY . .
-RUN npm run build
+RUN npm run build --workspace=arc31 && npm run build --workspace=client
 
 FROM base AS production
-COPY --from=build /client/.output /client/.output
+COPY --from=build /arc31/client/.output ./.output
 EXPOSE 3000
 ENTRYPOINT ["node", ".output/server/index.mjs"]

assets/arc-0031/client/app.vue

@@ -1,9 +1,16 @@
 <script setup lang="ts">
+import { useSessionCookie } from './utils/hooks/useSessionCookie'
+
 import { usePeraWallet } from '@/utils/hooks/usePeraWallet'
 
 if (import.meta.client) {
   const { reconnectWallet } = usePeraWallet()
-  await reconnectWallet()
+  const sessionCookie = useSessionCookie()
+  const address = await reconnectWallet()
+  if (sessionCookie.session.value && !address?.value) {
+    sessionCookie.clear()
+    window.location.reload()
+  }
 }
 
 useHead({

assets/arc-0031/client/middleware/guard.global.ts

@@ -1,8 +1,8 @@
-import type { Session } from '@/utils/hooks/useAuth'
+import { useSessionCookie } from '@/utils/hooks/useSessionCookie'
 
 export default defineNuxtRouteMiddleware((to) => {
   if (import.meta.server) {
-    const session = useCookie<Session>('session')
+    const { session } = useSessionCookie()
     if (!session.value && to.path !== '/signin') {
       return '/signin'
     }

assets/arc-0031/client/nuxt.config.ts

@@ -1,7 +1,8 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  // @ts-ignore
+  telemetry: false,
   modules: ['@nuxt/ui'],
+  modulesDir: ['../node_modules'],
   runtimeConfig: {
     apiUrl: process.env.NUXT_API_URL,
     public: {

assets/arc-0031/client/package.json

@@ -1,27 +1,23 @@
 {
   "name": "arc-0031-client",
-  "version": "0.0.1",
   "type": "module",
-  "author": "Luca Martini",
-  "license": "UNLICENSED",
+  "version": "0.0.1",
+  "author": "[deanstef](https://github.com/deanstef) and [mrcointreau](https://github.com/mrcointreau)",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "postinstall": "nuxt prepare",
-    "lint": "tsc --noEmit && eslint .",
-    "lint:fix": "tsc --noEmit && eslint . --fix"
+    "postinstall": "nuxt prepare"
   },
-  "devDependencies": {
-    "@msgpack/msgpack": "2.8.0",
+  "dependencies": {
     "@nuxt/ui": "2.13.0",
     "@nuxtjs/eslint-config-typescript": "12.1.0",
     "@perawallet/connect": "1.3.4",
-    "eslint": "8.56.0",
+    "arc31": "0.0.1",
     "normalize.css": "8.0.1",
-    "nuxt": "3.10.1",
-    "vue": "3.4.15",
+    "nuxt": "3.10.2",
+    "vue": "3.4.19",
     "vue-router": "4.2.5",
     "zod": "3.22.4"
   }

assets/arc-0031/client/pages/index.vue

@@ -3,7 +3,7 @@ import { useAuth } from '@/utils/hooks/useAuth'
 
 useHead({ title: 'Home' })
 
-const { address, signOut } = useAuth()
+const { session, signOut } = useAuth()
 </script>
 
 <template>
@@ -12,7 +12,7 @@ const { address, signOut } = useAuth()
       <div>
         <p>www.servicedomain.com</p>
         <p class="text-primary break-all">
-          {{ address }}
+          {{ session?.authAcc }}
         </p>
       </div>
       <UButton

assets/arc-0031/client/plugins/peraWalletClient.ts

@@ -1,3 +1,5 @@
+import { PeraWalletConnect } from '@perawallet/connect'
+
 import { useEnv } from '@/utils/hooks/useEnv'
 
 enum AlgorandChainId {
@@ -6,8 +8,7 @@ enum AlgorandChainId {
   BetaNet = 416003
 }
 
-export default defineNuxtPlugin(async () => {
-  const { PeraWalletConnect } = await import('@perawallet/connect')
+export default defineNuxtPlugin(() => {
   const env = useEnv()
   const peraWalletClient = new PeraWalletConnect({ chainId: AlgorandChainId[env.client.algorandChainId] })
 

assets/arc-0031/client/utils/Arc31ApiClient.ts

@@ -1,3 +1,5 @@
+import type { AlgorandChainId } from 'arc31'
+
 import type { Session } from '@/utils/hooks/useAuth'
 
 export class Arc31ApiClient {
@@ -7,10 +9,11 @@ export class Arc31ApiClient {
     this.apiFetch = $fetch.create({ baseURL })
   }
 
-  public request = (authAcc: string) => this.apiFetch<string>('/signin/request', {
+  public request = (authAcc: string, chainId: AlgorandChainId) => this.apiFetch<string>('/signin/request', {
     method: 'POST',
     body: {
-      authAcc
+      authAcc,
+      chainId
     }
   })