oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる (#12694)

Browse source 
* refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる

* fix

* fix

* renate to "misskeyApi"

* rename file
This commit is contained in:
おさむのひと 2024-01-04 18:32:46 +09:00 • committed by GitHub
parent ea41cc6ec0
commit fa9c4a19b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
191 changed files with 581 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/frontend/src/components/MkSignin.vue
View file

@ -59,6 +59,7 @@ import MkInput from '@/components/MkInput.vue';
import MkInfo from '@/components/MkInfo.vue';
import { host as configHost } from '@/config.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { login } from '@/account.js';
import { i18n } from '@/i18n.js';
@ -95,7 +96,7 @@ const props = defineProps({
});
function onUsernameChange(): void {
os.api('users/show', {
misskeyApi('users/show', {
username: username.value,
}).then(userResponse => {
user.value = userResponse;
@ -120,7 +121,7 @@ async function queryKey(): Promise<void> {
credentialRequest.value = null;
queryingKey.value = false;
signing.value = true;
return os.api('signin', {
return misskeyApi('signin', {
username: username.value,
password: password.value,
credential: credential.toJSON(),
@ -142,7 +143,7 @@ function onSubmit(): void {
signing.value = true;
if (!totpLogin.value && user.value && user.value.twoFactorEnabled) {
if (webAuthnSupported() && user.value.securityKeys) {
os.api('signin', {
misskeyApi('signin', {
username: username.value,
password: password.value,
}).then(res => {
@ -159,7 +160,7 @@ function onSubmit(): void {
signing.value = false;
}
} else {
os.api('signin', {
misskeyApi('signin', {
username: username.value,
password: password.value,
token: user.value?.twoFactorEnabled ? token.value : undefined,