@redzone/taunt-logins 0.0.1 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redzone/taunt-logins",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "",
   "type": "module",
   "main": "index.ts",

package/src/magic.ts

@@ -7,24 +7,34 @@ const customNodeOptions = {
   chainId: 137
 }
 
-export function withMagic(magicKey: string, email: string) {
+export function emailOTPWithMagic(magicKey: string, email: string) {
   const magic = new Magic(magicKey, {
     network: customNodeOptions
   })
   return magic.auth.loginWithEmailOTP({ email })
 }
 
-export async function loginWithMagic(
+export async function tauntMagicEmailOTPLogin(
   tauntServiceEndpoint: string,
   magicKey: string,
   email: string
 ) {
   const taunt = new TauntApi(tauntServiceEndpoint)
   try {
-    const did = await withMagic(magicKey, email)
-    return taunt.loginWithMagicDid(did!)
+    const did = await emailOTPWithMagic(magicKey, email)
+    if (!did) throw new Error("No DID returned")
+    console.log("Magic email OTP login", { did })
+    return taunt.loginWithMagicDid(did)
   } catch (err) {
     console.error("Magic login error:", err)
     throw err
   }
 }
+
+export async function tauntMagicDidLogin(
+  tauntServiceEndpoint: string,
+  did: string
+) {
+  const taunt = new TauntApi(tauntServiceEndpoint)
+  return taunt.loginWithMagicDid(did)
+}

package/src/metamask.ts

@@ -8,7 +8,7 @@ declare global {
   }
 }
 
-export async function withMetamask(
+export async function tauntSignWithMetamask(
   tauntServiceEndpoint: string,
   provider?: BaseProvider
 ) {
@@ -49,12 +49,12 @@ export async function withMetamask(
   return { walletAddress, message, signature }
 }
 
-export async function loginWithMetamask(
+export async function tauntMetamaskLogin(
   tauntServiceEndpoint: string,
   providerParam?: BaseProvider
 ) {
   const taunt = new TauntApi(tauntServiceEndpoint)
-  const { walletAddress, message, signature } = await withMetamask(
+  const { walletAddress, message, signature } = await tauntSignWithMetamask(
     tauntServiceEndpoint,
     providerParam
   )

package/.history/package_20251002102021.json

@@ -1,24 +0,0 @@
-{
-  "name": "@seaders/redzone-taunt-logins",
-  "version": "1.0.4",
-  "description": "",
-  "type": "module",
-  "main": "dist/index.cjs",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "prebuild": "npm run clean",
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@metamask/providers": "^22.1.1",
-    "magic-sdk": "^30.0.0"
-  },
-  "devDependencies": {
-    "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
-    "@types/chrome": "^0.1.16",
-    "@types/node": "^24.6.1",
-    "prettier": "^3.6.2",
-    "tsup": "^8.5.0",
-    "typescript": "^5.9.3"
-  }
-}

package/.history/package_20251002102142.json

@@ -1,24 +0,0 @@
-{
-  "name": "@redzone/taunt-logins",
-  "version": "1.0.4",
-  "description": "",
-  "type": "module",
-  "main": "dist/index.cjs",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "prebuild": "npm run clean",
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@metamask/providers": "^22.1.1",
-    "magic-sdk": "^30.0.0"
-  },
-  "devDependencies": {
-    "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
-    "@types/chrome": "^0.1.16",
-    "@types/node": "^24.6.1",
-    "prettier": "^3.6.2",
-    "tsup": "^8.5.0",
-    "typescript": "^5.9.3"
-  }
-}

package/.history/package_20251002102150.json

@@ -1,24 +0,0 @@
-{
-  "name": "@redzone/taunt-logins",
-  "version": "0.0.1",
-  "description": "",
-  "type": "module",
-  "main": "dist/index.cjs",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "prebuild": "npm run clean",
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@metamask/providers": "^22.1.1",
-    "magic-sdk": "^30.0.0"
-  },
-  "devDependencies": {
-    "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
-    "@types/chrome": "^0.1.16",
-    "@types/node": "^24.6.1",
-    "prettier": "^3.6.2",
-    "tsup": "^8.5.0",
-    "typescript": "^5.9.3"
-  }
-}

package/.history/package_20251002102201.json

@@ -1,24 +0,0 @@
-{
-  "name": "@redzone/taunt-logins",
-  "version": "0.0.1",
-  "description": "",
-  "type": "module",
-  "main": "index.ts",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "prebuild": "npm run clean",
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@metamask/providers": "^22.1.1",
-    "magic-sdk": "^30.0.0"
-  },
-  "devDependencies": {
-    "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
-    "@types/chrome": "^0.1.16",
-    "@types/node": "^24.6.1",
-    "prettier": "^3.6.2",
-    "tsup": "^8.5.0",
-    "typescript": "^5.9.3"
-  }
-}

package/.history/src/metamask_20251002095345.ts

@@ -1,136 +0,0 @@
-import { MetaMaskInpageProvider } from "@metamask/providers"
-
-import { TauntApi } from "./taunt"
-
-const CHROME_METAMASK_ID = "nkbihfbeogaeaoehlefnkodbefgpgknn"
-
-export const createMetaMaskProvider = () =>
-  createWalletProvider(CHROME_METAMASK_ID)
-
-declare global {
-  interface Window {
-    ethereum?: MetaMaskInpageProvider
-  }
-}
-
-async function createWalletProvider(ident: string) {
-  let provider
-  try {
-    let metamaskPort
-    try {
-      metamaskPort = chrome.runtime.connect(ident)
-    } catch (error) {
-      console.log("Failed to connect to MetaMask", error)
-    }
-
-    if (metamaskPort) {
-      const PortStream = await import("extension-port-stream").then(
-        (m) => m.default
-      )
-      const pluginStream = new PortStream(metamaskPort)
-      provider = new MetaMaskInpageProvider(pluginStream)
-    } else {
-      let eth
-      try {
-        eth = window?.ethereum
-      } catch (error) {
-        console.error("Failed to access window.ethereum", error)
-      }
-
-      if (eth) {
-        provider = eth
-        if (!provider.isMetaMask) {
-          console.warn(
-            "Injected ethereum provider is not MetaMask! You may experience issues."
-          )
-        }
-      }
-    }
-  } catch (e) {
-    console.dir(`Metamask connect error `, e)
-    throw e
-  }
-
-  return provider
-}
-
-export async function withMetamask(
-  tauntServiceEndpoint: string,
-  providerParam?: MetaMaskInpageProvider
-) {
-  const provider = providerParam || (await createMetaMaskProvider())
-  if (!provider) throw new Error("MetaMask provider not found")
-
-  const accounts = (await provider.request({
-    method: "eth_requestAccounts"
-  })) as string[]
-  if (!accounts.length) throw new Error("No accounts returned")
-
-  console.log("MetaMask", { accounts })
-
-  const walletAddress = accounts[0]
-  const baseUrl = `${tauntServiceEndpoint}/v1/auth`
-  const cryptoValuesArray = new Uint32Array(3)
-  const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString()
-
-  const serverNonce = await fetch(`${baseUrl}/nonce/login`, {
-    method: "POST",
-    body: JSON.stringify({ walletAddress, clientNonce }),
-    headers: { "Content-Type": "application/json" }
-  }).then((res) => res.text())
-
-  const payload = JSON.stringify({ clientNonce, serverNonce })
-  const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`
-  const params = [message, walletAddress]
-  const method = "personal_sign"
-
-  const signature = await new Promise<string>((resolve, reject) => {
-    provider.sendAsync(
-      {
-        id: 1,
-        method,
-        params,
-        jsonrpc: "2.0"
-      },
-      (err, response) => {
-        if (err) {
-          console.error(err)
-          reject(err)
-          return
-        }
-
-        const { result, error } = response as {
-          id: number
-          jsonrpc: string
-          result: string
-          error?: unknown
-        }
-        if (error) {
-          console.error(error)
-          reject(error)
-          return
-        }
-
-        resolve(result)
-      }
-    )
-  })
-
-  return { walletAddress, message, signature }
-}
-
-export async function loginWithMetamask(
-  tauntServiceEndpoint: string,
-  providerParam?: MetaMaskInpageProvider
-) {
-  const taunt = new TauntApi(tauntServiceEndpoint)
-  const { walletAddress, message, signature } = await withMetamask(
-    tauntServiceEndpoint,
-    providerParam
-  )
-  return taunt.loginWithWeb3WalletSignature({
-    walletAddress,
-    message,
-    signature
-  })
-}

package/.history/src/metamask_20251002101110.ts

@@ -1,90 +0,0 @@
-import { BaseProvider } from "@metamask/providers"
-
-import { TauntApi } from "./taunt"
-
-declare global {
-  interface Window {
-    ethereum?: BaseProvider
-  }
-}
-
-export async function withMetamask(
-  tauntServiceEndpoint: string,
-  provider?: BaseProvider
-) {
-  provider = provider || window.ethereum
-  if (!provider) throw new Error("MetaMask provider not found")
-
-  const accounts = (await provider.request({
-    method: "eth_requestAccounts"
-  })) as string[]
-  if (!accounts.length) throw new Error("No accounts returned")
-
-  console.log("MetaMask", { accounts })
-
-  const walletAddress = accounts[0]
-  const baseUrl = `${tauntServiceEndpoint}/v1/auth`
-  const cryptoValuesArray = new Uint32Array(3)
-  const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString()
-
-  const serverNonce = await fetch(`${baseUrl}/nonce/login`, {
-    method: "POST",
-    body: JSON.stringify({ walletAddress, clientNonce }),
-    headers: { "Content-Type": "application/json" }
-  }).then((res) => res.text())
-
-  const payload = JSON.stringify({ clientNonce, serverNonce })
-  const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`
-  const params = [message, walletAddress]
-  const method = "personal_sign"
-
-  const signature = await new Promise<string>((resolve, reject) => {
-    provider.sendAsync(
-      {
-        id: 1,
-        method,
-        params,
-        jsonrpc: "2.0"
-      },
-      (err, response) => {
-        if (err) {
-          console.error(err)
-          reject(err)
-          return
-        }
-
-        const { result, error } = response as {
-          id: number
-          jsonrpc: string
-          result: string
-          error?: unknown
-        }
-        if (error) {
-          console.error(error)
-          reject(error)
-          return
-        }
-
-        resolve(result)
-      }
-    )
-  })
-
-  return { walletAddress, message, signature }
-}
-
-export async function loginWithMetamask(
-  tauntServiceEndpoint: string,
-  providerParam?: MetaMaskInpageProvider
-) {
-  const taunt = new TauntApi(tauntServiceEndpoint)
-  const { walletAddress, message, signature } = await withMetamask(
-    tauntServiceEndpoint,
-    providerParam
-  )
-  return taunt.loginWithWeb3WalletSignature({
-    walletAddress,
-    message,
-    signature
-  })
-}

package/.history/src/metamask_20251002101707.ts

@@ -1,59 +0,0 @@
-import { BaseProvider } from "@metamask/providers"
-
-import { TauntApi } from "./taunt"
-
-declare global {
-  interface Window {
-    ethereum?: BaseProvider
-  }
-}
-
-export async function withMetamask(
-  tauntServiceEndpoint: string,
-  provider?: BaseProvider
-) {
-  provider = provider || window.ethereum
-  if (!provider) throw new Error("MetaMask provider not found")
-
-  const accounts = (await provider.request({
-    method: "eth_requestAccounts"
-  })) as string[]
-  if (!accounts.length) throw new Error("No accounts returned")
-
-  console.log("MetaMask", { accounts })
-
-  const walletAddress = accounts[0]
-  const baseUrl = `${tauntServiceEndpoint}/v1/auth`
-  const cryptoValuesArray = new Uint32Array(3)
-  const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString()
-
-  const serverNonce = await fetch(`${baseUrl}/nonce/login`, {
-    method: "POST",
-    body: JSON.stringify({ walletAddress, clientNonce }),
-    headers: { "Content-Type": "application/json" }
-  }).then((res) => res.text())
-
-  const payload = JSON.stringify({ clientNonce, serverNonce })
-  const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`
-  const params = [message, walletAddress]
-
-  const signature = await provider.request({ method: "personal_sign", params })
-
-  return { walletAddress, message, signature }
-}
-
-export async function loginWithMetamask(
-  tauntServiceEndpoint: string,
-  providerParam?: MetaMaskInpageProvider
-) {
-  const taunt = new TauntApi(tauntServiceEndpoint)
-  const { walletAddress, message, signature } = await withMetamask(
-    tauntServiceEndpoint,
-    providerParam
-  )
-  return taunt.loginWithWeb3WalletSignature({
-    walletAddress,
-    message,
-    signature
-  })
-}

package/.history/src/metamask_20251002101728.ts

@@ -1,61 +0,0 @@
-import { BaseProvider } from "@metamask/providers"
-
-import { TauntApi } from "./taunt"
-
-declare global {
-  interface Window {
-    ethereum?: BaseProvider
-  }
-}
-
-export async function withMetamask(
-  tauntServiceEndpoint: string,
-  provider?: BaseProvider
-) {
-  provider = provider || window.ethereum
-  if (!provider) throw new Error("MetaMask provider not found")
-
-  const accounts = (await provider.request({
-    method: "eth_requestAccounts"
-  })) as string[]
-  if (!accounts.length) throw new Error("No accounts returned")
-
-  console.log("MetaMask", { accounts })
-
-  const walletAddress = accounts[0]
-  const baseUrl = `${tauntServiceEndpoint}/v1/auth`
-  const cryptoValuesArray = new Uint32Array(3)
-  const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString()
-
-  const serverNonce = await fetch(`${baseUrl}/nonce/login`, {
-    method: "POST",
-    body: JSON.stringify({ walletAddress, clientNonce }),
-    headers: { "Content-Type": "application/json" }
-  }).then((res) => res.text())
-
-  const payload = JSON.stringify({ clientNonce, serverNonce })
-  const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`
-
-  const signature = await provider.request({
-    method: "personal_sign",
-    params: [message, walletAddress]
-  })
-
-  return { walletAddress, message, signature }
-}
-
-export async function loginWithMetamask(
-  tauntServiceEndpoint: string,
-  providerParam?: MetaMaskInpageProvider
-) {
-  const taunt = new TauntApi(tauntServiceEndpoint)
-  const { walletAddress, message, signature } = await withMetamask(
-    tauntServiceEndpoint,
-    providerParam
-  )
-  return taunt.loginWithWeb3WalletSignature({
-    walletAddress,
-    message,
-    signature
-  })
-}

package/.history/src/metamask_20251002101947.ts

@@ -1,66 +0,0 @@
-import { BaseProvider } from "@metamask/providers"
-
-import { TauntApi } from "./taunt"
-
-declare global {
-  interface Window {
-    ethereum?: BaseProvider
-  }
-}
-
-export async function withMetamask(
-  tauntServiceEndpoint: string,
-  provider?: BaseProvider
-) {
-  provider = provider || window.ethereum
-  if (!provider) throw new Error("MetaMask provider not found")
-
-  const accounts = (await provider.request({
-    method: "eth_requestAccounts"
-  })) as string[]
-  if (!accounts.length) throw new Error("No accounts returned")
-
-  console.log("MetaMask", { accounts })
-
-  const walletAddress = accounts[0]
-  const baseUrl = `${tauntServiceEndpoint}/v1/auth`
-  const cryptoValuesArray = new Uint32Array(3)
-  const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString()
-
-  const serverNonce = await fetch(`${baseUrl}/nonce/login`, {
-    method: "POST",
-    body: JSON.stringify({ walletAddress, clientNonce }),
-    headers: { "Content-Type": "application/json" }
-  }).then((res) => res.text())
-
-  const payload = JSON.stringify({ clientNonce, serverNonce })
-  const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`
-  let signature
-  try {
-    signature = await provider.request<string>({
-      method: "personal_sign",
-      params: [message, walletAddress]
-    })
-  } catch (err) {
-    throw new Error("User denied message signature")
-  }
-  if (!signature) throw new Error("No signature returned")
-
-  return { walletAddress, message, signature }
-}
-
-export async function loginWithMetamask(
-  tauntServiceEndpoint: string,
-  providerParam?: BaseProvider
-) {
-  const taunt = new TauntApi(tauntServiceEndpoint)
-  const { walletAddress, message, signature } = await withMetamask(
-    tauntServiceEndpoint,
-    providerParam
-  )
-  return taunt.loginWithWeb3WalletSignature({
-    walletAddress,
-    message,
-    signature
-  })
-}

package/tsup.config.ts

@@ -1,10 +0,0 @@
-import { defineConfig } from "tsup"
-
-export default defineConfig({
-  entry: ["index.ts"],
-  splitting: true,
-  treeshake: true,
-  platform: "browser",
-  sourcemap: true,
-  clean: true
-})