FediMovies/fedimovies-web
1
1
Fork 0
Code Pull requests Activity

Refactor ethereum sign-in helpers

Browse source
This commit is contained in:
silverpill 2022-02-08 10:51:55 +00:00
parent 2c9182d50c
commit 901d788d49
6 changed files with 55 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/nft.ts
View file

@ -2,7 +2,7 @@ import { Signer } from "ethers"
import { TransactionResponse } from "@ethersproject/abstract-provider"
import { BACKEND_URL } from "@/constants"
import { Signature } from "@/utils/ethereum"
import { EthereumSignature } from "@/utils/ethereum"
import { http } from "./common"
import { Contracts, getContract } from "./contracts"
import { Post } from "./posts"
@ -27,7 +27,7 @@ export async function makePermanent(
export async function getMintingAuthorization(
authToken: string,
postId: string,
): Promise<Signature> {
): Promise<EthereumSignature> {
const url = `${BACKEND_URL}/api/v1/statuses/${postId}/signature`
const response = await http(url, {
method: "GET",
@ -53,7 +53,7 @@ export async function mintToken(
signer: Signer,
ownerAddress: string,
tokenUri: string,
serverSignature: Signature,
serverSignature: EthereumSignature,
): Promise<TransactionResponse> {
const adapter = await getContract(Contracts.Adapter, contractAddress, signer)
const transaction = await adapter.mint(

6
src/api/subscriptions.ts
View file

@ -2,13 +2,13 @@ import { Signer } from "ethers"
import { TransactionResponse } from "@ethersproject/abstract-provider"
import { BACKEND_URL } from "@/constants"
import { Signature } from "@/utils/ethereum"
import { EthereumSignature } from "@/utils/ethereum"
import { http } from "./common"
import { Contracts, getContract } from "./contracts"
export async function getSubscriptionAuthorization(
authToken: string,
): Promise<Signature> {
): Promise<EthereumSignature> {
const url = `${BACKEND_URL}/api/v1/accounts/authorize_subscription`
const response = await http(url, {
method: "GET",
@ -26,7 +26,7 @@ export async function configureSubscription(
contractAddress: string,
signer: Signer,
recipientAddress: string,
serverSignature: Signature,
serverSignature: EthereumSignature,
): Promise<TransactionResponse> {
const adapter = await getContract(Contracts.Adapter, contractAddress, signer)
const transaction = await adapter.configureSubscription(

4
src/components/Post.vue
View file

@ -226,7 +226,7 @@ import VisibilityIcon from "@/components/VisibilityIcon.vue"
import { useInstanceInfo } from "@/store/instance"
import { useCurrentUser } from "@/store/user"
import { CRYPTOCURRENCIES } from "@/utils/cryptocurrencies"
import { getSigner } from "@/utils/ethereum"
import { getWallet } from "@/utils/ethereum"
import { formatDate } from "@/utils/format"
interface PaymentOption {
@ -481,7 +481,7 @@ export default class PostComponent extends Vue {
this.isWaitingForToken = false
return
}
const signer = await getSigner()
const signer = await getWallet()
if (!signer) {
this.isWaitingForToken = false
return

39
src/utils/ethereum.ts
View file

@ -1,13 +1,13 @@
import { Signer } from "ethers"
import { Web3Provider } from "@ethersproject/providers"
export function getProvider(): Web3Provider | null {
export function getWeb3Provider(): Web3Provider {
const provider = (window as any).ethereum
return new Web3Provider(provider)
}
export async function getSigner(): Promise<Signer | null> {
const provider = getProvider()
export async function getWallet(): Promise<Signer | null> {
const provider = getWeb3Provider()
if (!provider) {
return null
}
@ -22,8 +22,39 @@ export async function getSigner(): Promise<Signer | null> {
return signer
}
export interface Signature {
export interface EthereumSignature {
v: number;
r: string;
s: string;
}
export async function getWalletAddress(provider: Web3Provider): Promise<string | null> {
let walletAddress
try {
[walletAddress] = await provider.send("eth_requestAccounts", [])
} catch (error) {
// Access denied
console.warn(error)
return null
}
return walletAddress.toLowerCase()
}
export async function getWalletSignature(
provider: Web3Provider,
walletAddress: string,
message: string,
): Promise<string | null> {
let signature
try {
signature = await provider.send(
"personal_sign",
[message, walletAddress],
)
} catch (error) {
// Signature request rejected
console.warn(error)
return null
}
return signature
}

42
src/views/LandingPage.vue
View file

@ -52,14 +52,13 @@
<script lang="ts">
import { Options, Vue, setup } from "vue-class-component"
import { Web3Provider } from "@ethersproject/providers"
import { createUser, getAccessToken, getCurrentUser } from "@/api/users"
import { InstanceInfo } from "@/api/instance"
import Loader from "@/components/Loader.vue"
import { useInstanceInfo } from "@/store/instance"
import { useCurrentUser } from "@/store/user"
import { getProvider } from "@/utils/ethereum"
import { getWeb3Provider, getWalletAddress, getWalletSignature } from "@/utils/ethereum"
@Options({
components: { Loader },
@ -82,45 +81,18 @@ export default class LandingPage extends Vue {
return this.store.instance
}
private async getWalletAddress(provider: Web3Provider): Promise<string | null> {
let walletAddress
try {
[walletAddress] = await provider.send("eth_requestAccounts", [])
} catch (error) {
// Access denied
console.warn(error)
return null
}
return walletAddress.toLowerCase()
}
private async getSignature(provider: Web3Provider, walletAddress: string, message: string): Promise<string | null> {
let signature
try {
signature = await provider.send(
"personal_sign",
[message, walletAddress],
)
} catch (error) {
// Signature request rejected
console.warn(error)
return null
}
return signature
}
async register() {
this.registrationErrorMessage = null
const provider = getProvider()
const provider = getWeb3Provider()
if (!provider || !this.store.instance) {
return
}
const loginMessage = this.store.instance.login_message
const walletAddress = await this.getWalletAddress(provider)
const walletAddress = await getWalletAddress(provider)
if (!walletAddress) {
return
}
const signature = await this.getSignature(provider, walletAddress, loginMessage)
const signature = await getWalletSignature(provider, walletAddress, loginMessage)
if (!signature) {
return
}
@ -148,16 +120,16 @@ export default class LandingPage extends Vue {
async login() {
this.loginErrorMessage = null
const provider = getProvider()
const provider = getWeb3Provider()
if (!provider || !this.store.instance) {
return
}
const loginMessage = this.store.instance.login_message
const walletAddress = await this.getWalletAddress(provider)
const walletAddress = await getWalletAddress(provider)
if (!walletAddress) {
return
}
const signature = await this.getSignature(provider, walletAddress, loginMessage)
const signature = await getWalletSignature(provider, walletAddress, loginMessage)
if (!signature) {
return
}

10
src/views/Profile.vue
View file

@ -150,7 +150,7 @@ import ProfileListItem from "@/components/ProfileListItem.vue"
import Sidebar from "@/components/Sidebar.vue"
import { useInstanceInfo } from "@/store/instance"
import { useCurrentUser } from "@/store/user"
import { getSigner } from "@/utils/ethereum"
import { getWallet } from "@/utils/ethereum"
@Options({
components: {
@ -306,7 +306,7 @@ export default class ProfileView extends Vue {
}
async connectWallet() {
const signer = await getSigner()
const signer = await getWallet()
if (!signer) {
return
}
@ -329,7 +329,7 @@ export default class ProfileView extends Vue {
) {
return
}
const signer = await getSigner()
const signer = await getWallet()
if (!signer) {
return
}
@ -350,7 +350,7 @@ export default class ProfileView extends Vue {
return
}
// Subscription configuration tx can be send from any address
const signer = await getSigner()
const signer = await getWallet()
if (!signer) {
return
}
@ -379,7 +379,7 @@ export default class ProfileView extends Vue {
) {
return
}
const signer = await getSigner()
const signer = await getWallet()
if (!signer) {
return
}