Further cleanup and fixing Wallet and GoogleAuth to the new Composer interface

This commit is contained in:
Samuel Andert
2023-08-07 18:57:19 +02:00
parent beeb298c35
commit 1ad46b3252
18 changed files with 51 additions and 58 deletions

View File

@ -2,13 +2,13 @@
import { onMount } from 'svelte';
import { isSignInRedirect, getProviderFromUrl } from '@lit-protocol/lit-auth-client';
import type { IRelayPKP } from '@lit-protocol/types';
import { ProviderType } from '@lit-protocol/constants';
// import { ProviderType } from '@lit-protocol/constants';
import Icon from '@iconify/svelte';
import { createLitSession } from '$lib/services/createLitSession/createLitSession';
import Apps from '$lib/components/Apps.svelte';
import { connectProvider } from '$lib/services/provider/setupLit';
const redirectUri = 'http://localhost:5173/';
export let services;
let sessionSigs, error, currentPKP, authMethod, provider;
let log = '';
@ -22,7 +22,7 @@
async function initialize() {
addToLog('Initialization...');
try {
provider = await services.setupLit.connectProvider();
provider = await connectProvider();
addToLog('Connected to Google provider.');
if (isSignInRedirect(redirectUri)) {
const providerName = getProviderFromUrl();
@ -38,7 +38,7 @@
async function authWithGoogle() {
try {
if (!provider) {
provider = await services.setupLit.connectProvider();
provider = await connectProvider();
addToLog('Reconnected to Google provider.');
}
await provider.signIn();

View File

@ -1,6 +1,6 @@
<script>
import { onMount, afterUpdate } from 'svelte';
import Composer from '$lib/core/refactor/Composer.svelte';
import Composer from '$lib/core/Composer.svelte';
export let me;

View File

@ -1,28 +0,0 @@
<script>
import { onMount } from 'svelte';
import { connectWallet } from '$lib/services/wallet/wallet';
import WalletConnect from '$lib/WalletConnect.svelte';
import Send from '$lib/Send.svelte';
// export let id;
export let store;
export let services;
onMount(async () => {
$store.pkpWallet = await connectWallet($store.pkpPubKey, $store.rpcURL);
services.core.updateStore({
'@wallet:pkpWallet': $store.pkpWallet
});
});
</script>
<div>
PkpWallet
{#if $store.pkpWallet}
<div class="mb-4 text-lg font-medium">
PKP Wallet: <span class="text-blue-600">{$store.pkpWallet.address}</span>
</div>
<Send pkpWallet={$store.pkpWallet} />
{/if}
<WalletConnect />
</div>

View File

@ -0,0 +1,23 @@
<script>
import { onMount } from 'svelte';
import { connectWallet } from '$lib/services/wallet/wallet';
import WalletConnect from '$lib/WalletConnect.svelte';
import Send from '$lib/Send.svelte';
export let me;
onMount(async () => {
$me.context.pkpWallet = await connectWallet($me.context.pkpPubKey, $me.context.rpcURL);
});
</script>
<div>
<div class="mb-4 text-lg font-medium">
PKP Wallet:
{#if $me.context.pkpWallet}
<span class="text-blue-600">{$me.context.pkpWallet.address}</span>
{/if}
</div>
<Send pkpWallet={$me.context.pkpWallet} />
<WalletConnect />
</div>