Revert "implement MiAuth (#55)"

This reverts commit 0bf980f.

capacitor.config.dev.json

@@ -6,9 +6,6 @@
   "plugins": {
     "PushNotifications": {
       "presentationOptions": ["badge", "sound", "alert"]
-    },
-    "CapacitorHttp": {
-      "enabled": true
     }
   },
   "server": {

capacitor.config.prod.json

@@ -6,9 +6,6 @@
   "plugins": {
     "PushNotifications": {
       "presentationOptions": ["badge", "sound", "alert"]
-    },
-    "CapacitorHttp": {
-      "enabled": true
     }
   }
 }

ios/App/Podfile

@@ -12,7 +12,6 @@ def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
-  pod 'CapacitorBrowser', :path => '../../node_modules/@capacitor/browser'
   pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device'
   pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
   pod 'CapacitorPushNotifications', :path => '../../node_modules/@capacitor/push-notifications'

package.json

@@ -15,7 +15,6 @@
   "dependencies": {
     "@capacitor/android": "^4.5.0",
     "@capacitor/app": "^4.1.1",
-    "@capacitor/browser": "^4.1.1",
     "@capacitor/core": "^4.5.0",
     "@capacitor/device": "^4.1.0",
     "@capacitor/ios": "^4.5.0",

src/components/MkSignin.vue

@@ -19,7 +19,6 @@
 				required
 			/>
 		</template>
-		<!--
 		{{ i18n.ts.ririca.accessToken }}
 		<MkInput
 			v-model="token"
@@ -28,7 +27,6 @@
 			required
 			data-cy-signin-username
 		></MkInput>
-		-->
 		<MkButton
 			class="_formBlock"
 			type="submit"
@@ -55,8 +53,6 @@ import * as os from "@/os";
 import { login } from "@/account";
 import { instance } from "@/instance";
 import { i18n } from "@/i18n";
-import { quickAuth, Permissions } from "@/miauth"
-import { Browser } from "@capacitor/browser"
 
 let signing = $ref(false);
 let user = $ref(null);
@@ -130,7 +126,7 @@ function queryKey() {
     .get({
       publicKey: {
         challenge: byteify(challengeData.challenge, "base64"),
-        allowCredentials: challengeData.securityKeys.map((key: { id: string; }) => ({
+        allowCredentials: challengeData.securityKeys.map((key) => ({
           id: byteify(key.id, "hex"),
           type: "public-key",
           transports: ["usb", "nfc", "ble", "internal"],
@@ -171,38 +167,16 @@ function queryKey() {
     });
 }
 
-// TODO: Implement handling browser shutdown by user.
-// On current implementation, arbitrary closing of browser by user is
-// not detected. The button will be disabled until token fetching maxCount is reached.
-// Also, MiAuth will try to get the token forever.
-// Browser.addListener('browserFinished', ...) will work.
-// https://capacitorjs.com/docs/apis/browser#addlistenerbrowserfinished-
-async function onSubmit() {
-  const miauth = quickAuth(instanceUrlResult, {name: "missRirica", permission: Permissions})
-  var maxCount = 100
-  var miauthToken = ""
+function onSubmit() {
   signing = true;
-  await Browser.open({url: miauth.authUrl(), presentationStyle: "popover"})
-
-  setTimeout(async function fetchToken() {
-    try {
-      maxCount--
-      miauthToken = await miauth.getToken()
-      await Browser.close() // No-op in Android, User need to close Webview themselves.
-      login(miauthToken, instanceUrlResult)
-      signing = false
-    } catch (er) {
-      if (maxCount > 0) {
-        setTimeout(fetchToken, 3000)
-      } else if (maxCount === 0) {
-        loginFailed(er)
-        signing = false
-      }
-    }
-  }, 3000);
+  console.log("submit");
+  if (!token.value) {
+    login(token, instanceUrlResult);
+    signing = false;
+  }
 }
 
-function loginFailed(err: unknown) {
+function loginFailed(err) {
   switch (err.id) {
     case "6cc579cc-885d-43d8-95c2-b8c7fc963280": {
       os.alert({

src/miauth.ts

@@ -1,5 +1,3 @@
-import { CapacitorHttp } from "@capacitor/core";
-
 function join(...paths: string[]) {
   return paths.join("/");
 }
@@ -78,15 +76,16 @@ export class MiAuth {
       join("api", "miauth", this.session, "check"),
       this.origin
     );
-    const data: Record<string, unknown> = await CapacitorHttp.request(
-      {
-        method: "POST",
-        url: url.href
-      }).then(res => res.data)
+
+    const data: Record<string, unknown> = await fetch(url).then((res) =>
+      res.json()
+    );
     const token = String(data.token);
+
     if (typeof data.token === "undefined") {
       throw new AuthenticationError();
     }
+
     return token;
   }
 

yarn.lock

@@ -68,11 +68,6 @@
     tslib "^2.0.3"
     yargs "^17.3.1"
 
-"@capacitor/browser@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@capacitor/browser/-/browser-4.1.1.tgz#ef7f705bda5c63c5497d4cb3c9108bd6aa9db908"
-  integrity sha512-RJKNeRiLm6X668X75YiPN/9t3z1pxVEPjIhLM/AtWAEsHUb8bjroQQ3WGdW/30Wa60a7ywiw3YLqWctfRaYyFw==
-
 "@capacitor/camera@^4.1.4":
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/@capacitor/camera/-/camera-4.1.4.tgz#5d019f88d1f3547b537270e35bcb96084eb48df6"