diff --git a/resources/js/api/auth.ts b/resources/js/api/auth.ts index 8ca0339..1555c4d 100644 --- a/resources/js/api/auth.ts +++ b/resources/js/api/auth.ts @@ -93,16 +93,4 @@ export class AuthApi { return AuthApi.sendPlatfromRequest(data); } - - static async updateUser({ email, account }: { email?: string; account?: string }) { - const data = { - query: mutations.UpdateUser, - variables: { - email, - account, - }, - }; - - return AuthApi.sendPlatfromRequest(data); - } } diff --git a/resources/js/api/mutations.ts b/resources/js/api/mutations.ts index acff84e..768409a 100644 --- a/resources/js/api/mutations.ts +++ b/resources/js/api/mutations.ts @@ -38,7 +38,6 @@ import ResetPassword from '~/graphql/mutation/auth/ResetPassword'; import RequestPasswordReset from '~/graphql/mutation/auth/RequestPasswordReset'; import CreateApiToken from '~/graphql/mutation/auth/CreateApiToken'; import RevokeApiTokens from '~/graphql/mutation/auth/RevokeApiTokens'; -import UpdateUser from '~/graphql/mutation/auth/UpdateUser'; import AddAccount from '~/graphql/mutation/fueltank/AddAccount'; import RemoveAccount from '~/graphql/mutation/fueltank/RemoveAccount'; @@ -102,7 +101,6 @@ export default { RequestPasswordReset, CreateApiToken, RevokeApiTokens, - UpdateUser, AddAccount, RemoveAccount, diff --git a/resources/js/components/ProfileMenu.vue b/resources/js/components/ProfileMenu.vue index ac7831e..38b407a 100644 --- a/resources/js/components/ProfileMenu.vue +++ b/resources/js/components/ProfileMenu.vue @@ -21,14 +21,6 @@ {{ appStore.user.email }}
-Account
- -URL
@@ -84,7 +76,6 @@ import { useAppStore } from '~/store';
import { Cog6ToothIcon } from '@heroicons/vue/24/outline';
import { useRouter } from 'vue-router';
import Tooltip from './Tooltip.vue';
-import Address from './Address.vue';
const appStore = useAppStore();
const router = useRouter();
diff --git a/resources/js/components/batch/forms/BatchMintForm.vue b/resources/js/components/batch/forms/BatchMintForm.vue
index cd9dc29..8cc7283 100644
--- a/resources/js/components/batch/forms/BatchMintForm.vue
+++ b/resources/js/components/batch/forms/BatchMintForm.vue
@@ -234,7 +234,7 @@ const mintTypes = [
},
];
const formRef = ref();
-const account = ref(publicKeyToAddress(props.modelValue.account ?? appStore.user?.account) ?? '');
+const account = ref(publicKeyToAddress(props.modelValue.account ?? '') ?? '');
const createTokenId: Ref Initialization Guide Please complete these steps in order to use the platform:
- The platform depends on there being a funded wallet daemon account setup and connected to
- the platform and blockchain so it can receive transactions from the platform, sign them on
- your behalf and then broadcast them to the network. You can get the latest version of the
- wallet daemon from this repository:
-
- https://github.com/enjin/wallet-daemon
- and an overview can be found here:
-
- https://docs.enjin.io/enjin-platform/wallet-daemon
-
- Wallet Account
- *
-
-
@@ -150,8 +103,6 @@ import snackbar from '~/util/snackbar';
import FormInput from '../FormInput.vue';
import { shortString, snackbarErrors } from '~/util';
import CopyTextIcon from '../CopyTextIcon.vue';
-import { AuthApi } from '~/api/auth';
-import { addressToPublicKey, isValidAddress, publicKeyToAddress } from '~/util/address';
import LoadingCircle from '../LoadingCircle.vue';
const router = useRouter();
@@ -159,12 +110,9 @@ const appStore = useAppStore();
const advancedMode = ref(appStore.advanced);
const tokenName = ref();
-const walletAccount = ref(publicKeyToAddress(appStore.user?.account ?? appStore.config.daemon));
const enableTokenCreate = ref(false);
-const enableAccountModify = ref(true);
const loading = ref(appStore.user || !appStore.hasMultiTenantPackage ? false : true);
const creating = ref(false);
-const updating = ref(false);
const tokens = computed(() => appStore.user?.apiTokens);
@@ -189,40 +137,6 @@ const createApiToken = async () => {
}
};
-const updateWalletAccount = async () => {
- if (!enableAccountModify.value) {
- enableAccountModify.value = true;
- } else {
- if (!walletAccount.value) {
- return snackbar.error({ title: 'Account required', text: 'Please enter a wallet account.' });
- } else if (addressToPublicKey(walletAccount.value) === appStore.user?.account) {
- enableAccountModify.value = false;
- return;
- } else if (!isValidAddress(walletAccount.value)) {
- return snackbar.error({ title: 'Invalid account', text: 'Please enter a valid wallet account.' });
- }
- try {
- updating.value = true;
- const res = await AuthApi.updateUser({ account: walletAccount.value });
- enableAccountModify.value = false;
- if (res.data.UpdateUser) {
- appStore.user.account = walletAccount.value;
- snackbar.info({
- title: 'Account wallet updated',
- text: `Your wallet account is set to ${walletAccount.value}`,
- });
- } else {
- throw 'error';
- }
- } catch (e: any) {
- if (snackbarErrors(e)) return;
- snackbar.error({ title: 'Account wallet update failed', text: e.message });
- } finally {
- updating.value = false;
- }
- }
-};
-
const revokeToken = async (name: string) => {
if (!name) return;
try {
@@ -245,15 +159,6 @@ const resetSettings = () => {
router.push({ name: 'platform.setup' });
};
-(() => {
- if (appStore.user?.account) {
- walletAccount.value = publicKeyToAddress(appStore.user.account);
- enableAccountModify.value = false;
- } else if (!appStore.isMultiTenant) {
- enableAccountModify.value = false;
- }
-})();
-
watch(
() => advancedMode.value,
() => {
@@ -265,25 +170,14 @@ watch(
}
);
-watch(
- () => appStore.user?.account,
- (newAccount) => {
- if (newAccount) {
- enableAccountModify.value = false;
- walletAccount.value = publicKeyToAddress(appStore.user?.account);
- }
-
- if (!appStore.user?.apiTokens?.length) {
- enableTokenCreate.value = true;
- }
- }
-);
-
watch(
() => appStore.user,
(userVal) => {
if (userVal) {
loading.value = false;
+ if (!appStore.user?.apiTokens?.length) {
+ enableTokenCreate.value = true;
+ }
}
}
);
diff --git a/resources/js/components/pages/create/CreateListing.vue b/resources/js/components/pages/create/CreateListing.vue
index 05f214a..9c1f1fd 100644
--- a/resources/js/components/pages/create/CreateListing.vue
+++ b/resources/js/components/pages/create/CreateListing.vue
@@ -176,7 +176,7 @@ const router = useRouter();
const appStore = useAppStore();
const isLoading = ref(false);
-const account = ref(appStore.user?.account);
+const account = ref();
const amount = ref('');
const price = ref('');
const salt = ref('');
diff --git a/resources/js/components/pages/create/CreateToken.vue b/resources/js/components/pages/create/CreateToken.vue
index 1a99098..8a82010 100644
--- a/resources/js/components/pages/create/CreateToken.vue
+++ b/resources/js/components/pages/create/CreateToken.vue
@@ -227,7 +227,7 @@ import snackbar from '~/util/snackbar';
import { useRouter } from 'vue-router';
import FormInput from '~/components/FormInput.vue';
import FormCheckbox from '~/components/FormCheckbox.vue';
-import { addressToPublicKey, publicKeyToAddress } from '~/util/address';
+import { addressToPublicKey } from '~/util/address';
import { currencySymbolByNetwork, formatData, formatPriceToENJ, formatToken, snackbarErrors } from '~/util';
import { TokenCapType, TokenIdSelectType } from '~/types/types.enums';
import FormList from '~/components/FormList.vue';
@@ -253,7 +253,7 @@ const currencySymbol = computed(() => currencySymbolByNetwork(appStore.config.ne
const isLoading = ref(false);
const collectionId = ref('');
-const recipient = ref(publicKeyToAddress(appStore.user?.account));
+const recipient = ref();
const tokenId = ref({
tokenId: '',
tokenType: TokenIdSelectType.Integer,
diff --git a/resources/js/graphql/mutation/auth/UpdateUser.ts b/resources/js/graphql/mutation/auth/UpdateUser.ts
deleted file mode 100644
index c2afaf1..0000000
--- a/resources/js/graphql/mutation/auth/UpdateUser.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default `mutation UpdateUser($email: String, $account: String) {
- UpdateUser(email: $email, account: $account)
- }`;
diff --git a/resources/js/graphql/query/auth/User.ts b/resources/js/graphql/query/auth/User.ts
index 04d4c69..2257a0d 100644
--- a/resources/js/graphql/query/auth/User.ts
+++ b/resources/js/graphql/query/auth/User.ts
@@ -6,6 +6,5 @@ export default `query User {
apiTokens {
name
}
- account
}
}`;
diff --git a/resources/js/shims-vue.d.ts b/resources/js/shims-vue.d.ts
index c271a8e..3ab144c 100644
--- a/resources/js/shims-vue.d.ts
+++ b/resources/js/shims-vue.d.ts
@@ -9,7 +9,6 @@ interface Window {
bootstrap: {
network: string;
url: string;
- daemon: string;
name: string;
};
}
diff --git a/resources/js/store/index.ts b/resources/js/store/index.ts
index 799753d..feca584 100644
--- a/resources/js/store/index.ts
+++ b/resources/js/store/index.ts
@@ -25,7 +25,6 @@ export const useAppStore = defineStore('app', {
tenant: false,
webSocket: '',
channel: '',
- daemon: '',
},
navigations: [
{ name: 'Collections', to: { name: 'platform.collections' }, pos: 1 },
@@ -130,10 +129,6 @@ export const useAppStore = defineStore('app', {
this.config.channel = appConfig.channel;
}
- if (window.bootstrap?.daemon) {
- this.config.daemon = window.bootstrap.daemon;
- }
-
if (window.bootstrap?.name) {
document.title = window.bootstrap.name;
}
@@ -252,7 +247,7 @@ export const useAppStore = defineStore('app', {
getters: {
hasValidConfig(state: AppState) {
if (this.isMultiTenant) {
- return state.loggedIn && state.user?.apiTokens?.length > 0 && state.user?.account;
+ return state.loggedIn && state.user?.apiTokens?.length > 0;
}
return state.loggedIn && state.config.url;
diff --git a/resources/js/store/transaction.ts b/resources/js/store/transaction.ts
index dd39849..959eea9 100644
--- a/resources/js/store/transaction.ts
+++ b/resources/js/store/transaction.ts
@@ -8,7 +8,6 @@ import snackbar from '~/util/snackbar';
import { SignerPayloadJSON } from '@polkadot/types/types';
import { markRaw } from 'vue';
import { AccountInfoWithTripleRefCount } from '@polkadot/types/interfaces';
-import { publicKeyToAddress } from '~/util/address';
import { useConnectionStore } from './connection';
const RPC_URLS = {
@@ -85,21 +84,6 @@ export const useTransactionStore = defineStore('transaction', {
return paymentInfo.partialFee.toHuman();
},
async signTransaction(transaction: any) {
- const appStore = useAppStore();
- if (appStore.user?.account || appStore.config.daemon) {
- if (
- publicKeyToAddress(useConnectionStore().account.address) !==
- publicKeyToAddress(appStore.user?.account ?? appStore.config.daemon)
- ) {
- snackbar.error({
- title: 'Sign Transaction',
- text: 'Signing account must be the same as wallet daemon account',
- });
-
- return;
- }
- }
-
const { extrinsic, payloadToSign, currentBlock } = await this.getExtrinsicData(
transaction,
useConnectionStore().account.address,
diff --git a/resources/js/types/types.interface.ts b/resources/js/types/types.interface.ts
index f196b21..cf0a4af 100644
--- a/resources/js/types/types.interface.ts
+++ b/resources/js/types/types.interface.ts
@@ -14,7 +14,6 @@ export interface AppState {
tenant: boolean;
webSocket: string;
channel: string;
- daemon: string;
};
navigations: any[];
collections: string[];
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 760cedc..c361986 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -15,7 +15,7 @@
@vite('resources/js/app.ts', 'vendor/platform-ui/build')