support oauth with webfinger

peertube
Namekuji 2022-12-26 21:18:09 +09:00
rodzic fdd37a6e76
commit a922146dcb
4 zmienionych plików z 14 dodań i 11 usunięć

Wyświetl plik

@ -17,8 +17,6 @@ closeRoom: "Close"
close: "Close"
server: "Your Mastodon instance"
addressRequired: "Enter your instance address"
invalidAddress: "Invalid address"
serverNotFound: "Instance not found"
createNewRoom: "Create a New Room"
editRoom: "Edit the Room"
comingFuture: "Coming with future update!"
@ -42,6 +40,8 @@ roomReady:
header: "Your room is ready!"
message: "Your room \"{title}\" is now ready. Share the following URL with other participants."
errors:
invalidAddress: "Invalid address"
serverNotFound: "Instance not found"
notFound: "{value} not found"
alreadyAdded: "Already added"
connectionFailed: "Failed to connect"

Wyświetl plik

@ -17,8 +17,6 @@ closeRoom: "Fermer la salle"
close: "Fermer cette fenêtre"
server: "Votre serveur mastodon"
addressRequired: "L'adresse de votre serveur mastodon"
invalidAddress: "L'adresse non valide"
serverNotFound: "Serveur mastodon non trouvé"
createNewRoom: "Créer une salle"
editRoom: "Modifier la salle"
comingFuture: "Ce projet est encore très jeune. D'autres fonctionnalités sont à venir."
@ -42,6 +40,8 @@ roomReady:
header: "Votre salle est prête !"
message: "Votre salle \"{title}\" est prête. Partagez ce lien pour que les autres puissent vous rejoindre."
errors:
invalidAddress: "L'adresse non valide"
serverNotFound: "Serveur mastodon non trouvé"
notFound: "{value} not found"
alreadyAdded: "Already added"
connectionFailed: "Failed to connect"

Wyświetl plik

@ -16,8 +16,6 @@ closeRoom: "閉室"
close: "閉じる"
server: "Mastodon サーバー"
addressRequired: "アドレスを入力してください"
invalidAddress: "アドレスが有効ではありません"
serverNotFound: "サーバーが見つかりません"
createNewRoom: "部屋を作成"
editRoom: "部屋の編集"
comingFuture: "今後のアップデートで追加予定"
@ -41,6 +39,8 @@ roomReady:
header: "お部屋の用意ができました!"
message: "{title} を作りました。参加者に以下の URL を共有してください。"
errors:
invalidAddress: "アドレスが有効ではありません"
serverNotFound: "サーバーが見つかりません"
notFound: "{value} が見つかりません"
alreadyAdded: "すでに追加済みです"
connectionFailed: "接続できませんでした。"

Wyświetl plik

@ -1,7 +1,7 @@
<script>
import { RouterLink } from "vue-router";
import { useVuelidate } from "@vuelidate/core";
import { required, helpers } from "@vuelidate/validators";
import { required, helpers, email, or } from "@vuelidate/validators";
import { validators } from "../assets/utils";
import { map } from "lodash-es";
import axios from "axios";
@ -23,9 +23,9 @@ export default {
server: {
required: helpers.withMessage(this.$t("addressRequired"), required),
hostname: helpers.withMessage(
this.$t("invalidAddress"),
validators.fqdn
),
this.$t("errors.invalidAddress"),
or(validators.fqdn, email)
)
},
};
},
@ -41,6 +41,9 @@ export default {
},
methods: {
async onSubmit() {
if (this.server.includes("@")) {
this.server = this.server.split("@", 2)[1]
}
const isFormCorrect = await this.v$.$validate();
if (!isFormCorrect) {
return;
@ -56,7 +59,7 @@ export default {
}
} catch (error) {
if (error.response?.status === 404) {
this.serverErr = this.$t("serverNotFound");
this.serverErr = this.$t("errors.serverNotFound");
}
}
},