Skip to content

Remove sponsorship call as BrightID app is doing that now #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 2, 2024
Merged

Remove sponsorship call as BrightID app is doing that now #737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 5 additions & 105 deletions vue-app/src/views/Verify.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,6 @@
</div>
<div class="form-area">
<div class="application">
<div v-if="currentPage === 'sponsorship'">
<h2 class="step-title">{{ $t('verify.get_sponsored_header') }}</h2>
<p>
{{ $t('verify.get_sponsored_text') }}
</p>
<div class="transaction">
<div>
<div class="row row-gap">
<button
type="button"
class="btn-action btn-block"
@click="selfSponsorAndWait"
:disabled="selfSponsorTxHash.length !== 0 || loadingTx"
>
{{ $t('verify.get_sponsored_cta') }}
</button>
<button type="button" class="btn-secondary btn-block" @click="skipSponsorship">
{{ $t('verify.skip_sponsorship') }}
</button>
</div>
<div class="error" v-if="sponsorTxError">{{ sponsorTxError }}</div>
</div>
</div>
</div>
<div v-if="currentPage === 'connect'">
<h2 class="step-title">{{ $t('verify.h2_1') }}</h2>
<p>
Expand All @@ -88,16 +64,8 @@
<p>
{{ $t('verify.click_next') }}
</p>
<transaction
class="transaction"
v-if="autoSponsorError"
:display-close-btn="false"
hash=""
:error="autoSponsorError"
>
</transaction>
<div class="qr">
<loader v-if="!appLink && !autoSponsorError"></loader>
<loader v-if="!appLink"></loader>
<div class="instructions" v-if="appLink">
<p class="desktop" v-if="appLinkQrCode">
{{ $t('verify.p4') }}
Expand All @@ -124,14 +92,6 @@
</em>
</p>
<div class="row row-gap qr-code">
<button
v-if="showBackToSponsorshipButton"
type="button"
class="btn-action btn-block"
@click="backToSponsorship"
>
{{ $t('verify.previous') }}
</button>
<button type="button" class="btn-secondary btn-block" @click="checkVerificationStatus">
{{ $t('verify.next') }}
</button>
Expand Down Expand Up @@ -176,7 +136,7 @@
import { ref, computed, onMounted, watch } from 'vue'
import ProgressBar from '@/components/ProgressBar.vue'
import QRCode from 'qrcode'
import { getBrightIdLink, getBrightIdUniversalLink, registerUser, selfSponsor, sponsorUser } from '@/api/bright-id'
import { getBrightIdLink, getBrightIdUniversalLink, registerUser } from '@/api/bright-id'
import { getProofSnapshot, getProofMerkle, registerUserSnapshot, registerUserMerkle } from '@/api/user'
import Transaction from '@/components/Transaction.vue'
import Loader from '@/components/Loader.vue'
Expand All @@ -185,19 +145,17 @@ import { waitForTransaction } from '@/utils/contracts'
import { useAppStore, useUserStore } from '@/stores'
import { storeToRefs } from 'pinia'
import { useRouter } from 'vue-router'
import { UserRegistryType, isBrightIdRequired, brightIdSponsorUrl, userRegistryType } from '@/api/core'
import { UserRegistryType, isBrightIdRequired, userRegistryType } from '@/api/core'
import { assert } from '@/utils/assert'

interface VerificationStep {
page: 'connect' | 'registration' | 'sponsorship'
page: 'connect' | 'registration'
}

function getVerificationSteps(): Array<VerificationStep> {
switch (userRegistryType) {
case UserRegistryType.BRIGHT_ID:
return brightIdSponsorUrl
? [{ page: 'connect' }, { page: 'registration' }]
: [{ page: 'sponsorship' }, { page: 'connect' }, { page: 'registration' }]
return [{ page: 'connect' }, { page: 'registration' }]
default:
return [{ page: 'registration' }]
}
Expand All @@ -224,11 +182,7 @@ const registrationTxError = ref('')
const notAuthorized = ref(false)
const loadingTx = ref(false)
const gettingProof = ref(false)
const isSponsoring = ref(!brightIdSponsorUrl)
const showVerificationStatus = ref(false)
const autoSponsorError = ref('')
const sponsorTxError = ref('')
const selfSponsorTxHash = ref('')

const brightId = computed(() => currentUser.value?.brightId)

Expand All @@ -237,9 +191,6 @@ const currentStep = computed(() => {
if (!brightId.value) {
return 0
}
if (isSponsoring.value) {
return stepNumbers['sponsorship']
}
if (!brightId.value.isVerified) {
return stepNumbers['connect']
}
Expand All @@ -255,19 +206,6 @@ const currentPage = computed(() => {
return steps[currentStep.value].page
})

// if the sponsor url is not defined, we are doing self sponsorship, show the button
// to allow users to go back to that page
const showBackToSponsorshipButton = !brightIdSponsorUrl

function backToSponsorship() {
isSponsoring.value = true
showVerificationStatus.value = false
}

function skipSponsorship() {
isSponsoring.value = false
}

async function checkVerificationStatus() {
showVerificationStatus.value = false
await userStore.loadBrightID()
Expand Down Expand Up @@ -295,24 +233,8 @@ onMounted(async () => {
// mounted
if (isBrightIdRequired && currentUser.value && !brightId.value?.isVerified) {
const walletAddress = currentUser.value.walletAddress
// send sponsorship request if automatic sponsoring is enabled
if (brightIdSponsorUrl) {
try {
const res = await sponsorUser(walletAddress)
if (!res.hash) {
autoSponsorError.value = res.error ? res.error : JSON.stringify(res)
return
}
} catch (err) {
const errorMessage = (err as Error).message
autoSponsorError.value =
'Unable to sponsor user. Make sure the brightId node is setup correctly.' + errorMessage
return
}
}

// Present app link and QR code

appLink.value = getBrightIdUniversalLink(walletAddress)
const qrcodeLink = getBrightIdLink(walletAddress)
QRCode.toDataURL(qrcodeLink, (error, url: string) => {
Expand All @@ -329,26 +251,6 @@ watch(currentUser, () => {
}
})

async function selfSponsorAndWait() {
if (!userRegistryAddress.value) {
sponsorTxError.value = 'Missing the user registry address'
return
}

const signer = await userStore.getSigner()
loadingTx.value = true
sponsorTxError.value = ''

try {
await waitForTransaction(selfSponsor(userRegistryAddress.value, signer), hash => (selfSponsorTxHash.value = hash))
isSponsoring.value = false
} catch (error) {
sponsorTxError.value = (error as Error).message
} finally {
loadingTx.value = false
}
}

async function register() {
const signer = await userStore.getSigner()

Expand Down Expand Up @@ -418,8 +320,6 @@ function isStepUnlocked(step: number): boolean {

const stepName = steps[step].page
switch (stepName) {
case 'sponsorship':
return !isSponsoring.value
case 'connect':
return !!currentUser.value?.brightId?.isVerified
case 'registration':
Expand Down