feeds-fun 1.21.6 → 1.22.1

package/src/components/SupertokensLogin.vue

@@ -1,141 +0,0 @@
-<template>
-  <div v-if="globalState.isLoggedIn">
-    <h3 class="">You have already logged in</h3>
-    <button
-      class="text-blue-600 hover:text-blue-800 text-xl pt-0"
-      @click.prevent="goToWorkspace()"
-      >Go To Feeds ⇒</button
-    >
-  </div>
-
-  <div v-else>
-    <h2 class="my-0">Single e-mail to log in</h2>
-    <template v-if="!requested">
-      <p class="text-center">We'll send you an email with a login link, no password required.</p>
-
-      <form
-        @submit.prevent="login()"
-        class="w-full flex justify-center">
-        <input
-          class="ffun-input flex-grow p-1 mr-2"
-          type="email"
-          v-model="email"
-          required
-          placeholder="me@example.com" />
-        <button
-          class="ffun-form-button"
-          type="submit"
-          >Log In</button
-        >
-      </form>
-    </template>
-
-    <template v-else>
-      <p class="">
-        Login link was sent to <strong>{{ email }}</strong>
-
-        <a
-          class="ml-1"
-          @click.prevent="onChangeEmail()"
-          >change</a
-        >
-      </p>
-
-      <button
-        v-if="!counting"
-        type="button"
-        class="btn btn-primary ffun-form-button">
-        <span @click.prevent="resend()">Resend email</span>
-      </button>
-
-      <vue-countdown
-        v-else
-        :time="supertokens.allowResendAfter"
-        @end="onCountdownEnd"
-        class=""
-        v-slot="{totalSeconds}">
-        Resend in {{ totalSeconds }} seconds
-      </vue-countdown>
-    </template>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import {computed, ref, onMounted} from "vue";
-  import * as t from "@/logic/types";
-  import * as e from "@/logic/enums";
-  import * as api from "@/logic/api";
-  import {computedAsync} from "@vueuse/core";
-  import DOMPurify from "dompurify";
-  import {useEntriesStore} from "@/stores/entries";
-  import {useSupertokens} from "@/stores/supertokens";
-  import {useGlobalState} from "@/stores/globalState";
-  import {useRouter} from "vue-router";
-  import * as settings from "@/logic/settings";
-  const router = useRouter();
-
-  const globalState = useGlobalState();
-
-  const supertokens = useSupertokens();
-
-  const requested = ref(false);
-
-  const counting = ref(false);
-
-  const email = ref("");
-
-  async function afterEmailSend(success: boolean) {
-    if (success) {
-      return;
-    }
-
-    window.alert("Something went wrong. Please try again.");
-    requested.value = false;
-    counting.value = false;
-    await supertokens.clearLoginAttempt();
-  }
-
-  function beforeEmailSend() {
-    requested.value = true;
-    counting.value = true;
-  }
-
-  async function login() {
-    beforeEmailSend();
-
-    const success = await supertokens.sendMagicLink(email.value);
-
-    await afterEmailSend(success);
-  }
-
-  async function resend() {
-    beforeEmailSend();
-
-    const success = await supertokens.resendMagicLink();
-
-    await afterEmailSend(success);
-  }
-
-  function onCountdownEnd() {
-    counting.value = false;
-  }
-
-  async function onChangeEmail() {
-    requested.value = false;
-    await supertokens.clearLoginAttempt();
-  }
-
-  function goToWorkspace() {
-    router.push({name: e.MainPanelMode.Entries, params: {}});
-  }
-
-  onMounted(async () => {
-    if (settings.authMode === settings.AuthMode.SingleUser) {
-      return true;
-    }
-
-    requested.value = await supertokens.hasInitialMagicLinkBeenSent();
-  });
-</script>
-
-<style scoped></style>

package/src/stores/supertokens.ts

@@ -1,144 +0,0 @@
-import {ref, watch} from "vue";
-import {useRouter} from "vue-router";
-import {defineStore} from "pinia";
-import {Timer} from "@/logic/timer";
-import SuperTokens from "supertokens-web-js";
-import Session from "supertokens-web-js/recipe/session";
-import Passwordless from "supertokens-web-js/recipe/passwordless";
-import * as passwordless from "supertokens-web-js/recipe/passwordless";
-import {computedAsync} from "@vueuse/core";
-
-export const useSupertokens = defineStore("supertokens", () => {
-  const isLoggedIn = ref<boolean | null>(null);
-
-  async function refresh() {
-    isLoggedIn.value = await Session.doesSessionExist();
-  }
-
-  const refresher = new Timer(refresh, 1000);
-
-  const allowResendAfter = ref(60 * 1000);
-
-  function init({
-    apiDomain,
-    apiBasePath,
-    appName,
-    resendAfter
-  }: {
-    apiDomain: string;
-    apiBasePath: string;
-    appName: string;
-    resendAfter: number;
-  }) {
-    allowResendAfter.value = resendAfter;
-
-    SuperTokens.init({
-      // enableDebugLogs: true,
-      appInfo: {
-        apiDomain: apiDomain,
-        apiBasePath: apiBasePath,
-        appName: appName
-      },
-      recipeList: [Session.init(), Passwordless.init()]
-    });
-
-    refresher.start();
-  }
-
-  async function processError(err: any) {
-    await refresh();
-
-    if (err.isSuperTokensGeneralError === true) {
-      window.alert(err.message);
-    }
-  }
-
-  async function sendMagicLink(email: string) {
-    try {
-      let response = await passwordless.createCode({
-        email
-      });
-
-      return response.status === "OK";
-    } catch (err: any) {
-      await processError(err);
-      return false;
-    }
-  }
-
-  async function logout() {
-    await Session.signOut();
-
-    await passwordless.clearLoginAttemptInfo();
-
-    await refresh();
-  }
-
-  async function resendMagicLink() {
-    try {
-      let response = await passwordless.resendCode();
-
-      if (response.status === "OK") {
-        return true;
-      } else if (response.status === "RESTART_FLOW_ERROR") {
-        // this can happen if the user has already successfully logged in into
-        // another device whilst also trying to login to this one.
-        return false;
-      } else {
-        return false;
-      }
-    } catch (err: any) {
-      await processError(err);
-      return false;
-    }
-  }
-
-  async function hasInitialMagicLinkBeenSent() {
-    return (await passwordless.getLoginAttemptInfo()) !== undefined;
-  }
-
-  async function handleMagicLinkClicked({
-    onSignUp,
-    onSignIn,
-    onSignFailed
-  }: {
-    onSignUp: () => void;
-    onSignIn: () => void;
-    onSignFailed: () => void;
-  }) {
-    try {
-      let response = await passwordless.consumeCode();
-
-      await refresh();
-
-      if (response.status === "OK") {
-        if (response.createdNewUser) {
-          await onSignUp();
-        } else {
-          await onSignIn();
-        }
-      } else {
-        await onSignFailed();
-      }
-    } catch (err: any) {
-      await processError(err);
-    }
-  }
-
-  async function clearLoginAttempt() {
-    await passwordless.clearLoginAttemptInfo();
-  }
-
-  return {
-    allowResendAfter,
-
-    init,
-    sendMagicLink,
-    resendMagicLink,
-    isLoggedIn,
-    logout,
-    hasInitialMagicLinkBeenSent,
-    handleMagicLinkClicked,
-    clearLoginAttempt
-  };
-});

package/src/views/AuthView.vue

@@ -1,77 +0,0 @@
-<template>
-  <wide-layout>
-    <div class="ffun-page-header">
-      <div class="ffun-page-header-center-block">
-        <page-header-external-links :show-api="false" />
-      </div>
-    </div>
-
-    <hr />
-
-    <main-block>
-      <h1 class="m-0 text-5xl">Feeds Fun</h1>
-      <p class="mt-2 text-2xl">Transparent Personalized News</p>
-    </main-block>
-
-    <main-block>
-      <div class="max-w-xl md:mx-auto ffun-info-good text-center mx-2">
-        <p>Checking login status...</p>
-      </div>
-    </main-block>
-  </wide-layout>
-</template>
-
-<script lang="ts" setup>
-  import {computed, ref, onUnmounted, watch, provide, onBeforeMount} from "vue";
-  import {useRouter} from "vue-router";
-  import {useGlobalSettingsStore} from "@/stores/globalSettings";
-  import {useSupertokens} from "@/stores/supertokens";
-  import {useGlobalState} from "@/stores/globalState";
-  import {computedAsync} from "@vueuse/core";
-  import * as settings from "@/logic/settings";
-
-  const globalSettings = useGlobalSettingsStore();
-  const globalState = useGlobalState();
-
-  const supertokens = useSupertokens();
-
-  const router = useRouter();
-
-  provide("eventsViewName", "auth");
-
-  function goToWorkspace() {
-    router.push({name: globalSettings.mainPanelMode, params: {}});
-  }
-
-  function goToMain() {
-    router.push({name: "main", params: {}});
-  }
-
-  onBeforeMount(async () => {
-    if (globalState.isLoggedIn) {
-      goToWorkspace();
-      return;
-    }
-
-    async function onSignIn() {
-      goToWorkspace();
-    }
-
-    async function onSignFailed() {
-      await supertokens.clearLoginAttempt();
-      goToMain();
-    }
-
-    if (await supertokens.hasInitialMagicLinkBeenSent()) {
-      await supertokens.handleMagicLinkClicked({
-        onSignUp: onSignIn,
-        onSignIn: onSignIn,
-        onSignFailed: onSignFailed
-      });
-    } else {
-      goToMain();
-    }
-  });
-</script>
-
-<style></style>