Hypernet/Passport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⏪️ 重现旧 UI #4

Merged
LittleSheep merged 8 commits from refactor/v2 into master 2024-06-26 08:06:28 +00:00
Conversation 1 Commits 8 Files Changed 81 +245 -167
15 changed files with 245 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f64747839 - Show all commits

59
.idea/codeStyles/Project.xml Normal file
View File

@ -0,0 +1,59 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<HTMLCodeStyleSettings>
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
</HTMLCodeStyleSettings>
<JSCodeStyleSettings version="0">
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</JSCodeStyleSettings>
<TypeScriptCodeStyleSettings version="0">
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</TypeScriptCodeStyleSettings>
<VueCodeStyleSettings>
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
</VueCodeStyleSettings>
<codeStyleSettings language="HTML">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Vue">
<option name="SOFT_MARGINS" value="120" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml Normal file
View File

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

73
.idea/workspace.xml
View File

@ -5,70 +5,19 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":ambulance: Fix nil map panic"> <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":ambulance: Fix nil map panic">
<change afterPath="$PROJECT_DIR$/web/.eslintrc.cjs" afterDir="false" /> <change afterPath="$PROJECT_DIR$/web/src/components/auth/AuthenticateCompleted.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/.prettierrc.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/env.d.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/package.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/public/favicon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/assets/utils.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/components/Copyright.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/components/NotificationList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/components/UserMenu.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/components/auth/AccountLocator.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/components/auth/CallbackNotify.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/components/auth/FactorApplicator.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/components/auth/FactorPicker.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/index.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/layouts/master.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/layouts/user-center.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/main.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/router/index.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/scripts/request.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/stores/notifications.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/stores/userinfo.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/auth/claims.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/auth/connect.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/auth/sign-in.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/auth/sign-up.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/confirm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/dashboard.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/personal-page.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/personalize.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/src/views/security.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/tsconfig.app.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/tsconfig.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/tsconfig.node.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/uno.config.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/vite.config.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/auth_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/auth_api.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/factors_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/factors_api.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/embed.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/grpc/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/server.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/api/index.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/index.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/index.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/index.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/server.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/components/Copyright.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/components/Copyright.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/ui/accounts.go" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/components/auth/AccountLocator.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/components/auth/Authenticate.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/ui/index.go" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/components/auth/FactorApplicator.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/components/auth/FactorApplicator.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/ui/mfa.go" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/components/auth/FactorPicker.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/components/auth/FactorPicker.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/ui/oauth.go" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/router/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/router/index.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/ui/signin.go" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/views/auth/connect.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/views/auth/authorize.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/ui/signup.go" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/views/auth/sign-in.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/views/auth/sign-in.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/authorize.gohtml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/web/src/views/confirm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/views/confirm.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/favicon.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/index.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/layouts/auth.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/layouts/user-center.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/mfa-apply.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/mfa.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/partials/header.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/signin.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/signup.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/views/users/me.gohtml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/main.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/settings.toml" beforeDir="false" afterPath="$PROJECT_DIR$/settings.toml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

4
pkg/internal/server/api/auth_api.go
View File

@ -36,7 +36,7 @@ func doAuthenticate(c *fiber.Ctx) error {
} }
return c.JSON(fiber.Map{ return c.JSON(fiber.Map{
"is_finished": ticket.IsAvailable(), "is_finished": ticket.IsAvailable() == nil,
"ticket": ticket, "ticket": ticket,
}) })
} }
@ -68,7 +68,7 @@ func doMultiFactorAuthenticate(c *fiber.Ctx) error {
} }
return c.JSON(fiber.Map{ return c.JSON(fiber.Map{
"is_finished": ticket.IsAvailable(), "is_finished": ticket.IsAvailable() == nil,
"ticket": ticket, "ticket": ticket,
}) })
} }

19
pkg/internal/server/api/factors_api.go
View File

@ -1,10 +1,29 @@
package api package api
import ( import (
"fmt"
"git.solsynth.dev/hydrogen/passport/pkg/internal/services" "git.solsynth.dev/hydrogen/passport/pkg/internal/services"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
) )
func getAvailableFactors(c *fiber.Ctx) error {
ticketId := c.QueryInt("ticketId", 0)
if ticketId <= 0 {
return fiber.NewError(fiber.StatusBadRequest, "must provide ticket id as a query parameter")
}
ticket, err := services.GetTicket(uint(ticketId))
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("ticket was not found: %v", err))
}
factors, err := services.ListUserFactor(ticket.AccountID)
if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
return c.JSON(factors)
}
func requestFactorToken(c *fiber.Ctx) error { func requestFactorToken(c *fiber.Ctx) error {
id, _ := c.ParamsInt("factorId", 0) id, _ := c.ParamsInt("factorId", 0)

3
pkg/internal/server/api/index.go
View File

@ -55,7 +55,10 @@ func MapAPIs(app *fiber.App) {
api.Post("/users", doRegister) api.Post("/users", doRegister)
api.Post("/auth", doAuthenticate) api.Post("/auth", doAuthenticate)
api.Post("/auth/mfa", doMultiFactorAuthenticate)
api.Post("/auth/token", getToken) api.Post("/auth/token", getToken)
api.Get("/auth/factors", getAvailableFactors)
api.Post("/auth/factors/:factorId", requestFactorToken) api.Post("/auth/factors/:factorId", requestFactorToken)
realms := api.Group("/realms").Name("Realms API") realms := api.Group("/realms").Name("Realms API")

2
web/src/components/Copyright.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="text-xs text-center opacity-80"> <div class="text-xs text-center opacity-80">
<p>Copyright © {{ new Date().getFullYear() }} Solsynth</p> <p>Copyright © {{ new Date().getFullYear() }} Solsynth</p>
<p>Powered by <a class="underline" href="#">Hydrogen.Identity</a></p> <p>Powered by <a class="underline" href="https://git.solsynth.dev/Hydrogen/Passport">Hydrogen.Passport</a></p>
</div> </div>
</template> </template>

20
web/src/components/auth/AccountLocator.vue → web/src/components/auth/Authenticate.vue
View File

@ -1,7 +1,10 @@
<template> <template>
<div class="flex items-center"> <div class="flex items-center">
<v-form class="flex-grow-1" @submit.prevent="submit"> <v-form class="flex-grow-1" @submit.prevent="submit">
<v-text-field label="Account ID" variant="solo" density="comfortable" :disabled="props.loading" v-model="probe" /> <v-text-field label="Username" variant="solo" density="comfortable" class="mb-3" :hide-details="true"
:disabled="props.loading" v-model="probe" />
<v-text-field label="Password" variant="solo" density="comfortable" type="password" :disabled="props.loading"
v-model="password" />
<v-expand-transition> <v-expand-transition>
<v-alert v-show="error" variant="tonal" type="error" class="text-xs mb-3"> <v-alert v-show="error" variant="tonal" type="error" class="text-xs mb-3">
@ -32,28 +35,29 @@ import { ref } from "vue"
import { request } from "@/scripts/request" import { request } from "@/scripts/request"
const probe = ref("") const probe = ref("")
const password = ref("")
const error = ref<string | null>(null) const error = ref<string | null>(null)
const props = defineProps<{ loading?: boolean }>() const props = defineProps<{ loading?: boolean }>()
const emits = defineEmits(["swap", "update:loading", "update:factors", "update:challenge"]) const emits = defineEmits(["swap", "update:loading", "update:ticket"])
async function submit() { async function submit() {
if (!probe) return if (!probe.value || !password.value) return
emits("update:loading", true) emits("update:loading", true)
const res = await request("/api/auth", { const res = await request("/api/auth", {
method: "PUT", method: "POST",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify({ id: probe.value }), body: JSON.stringify({ id: probe.value, password: password.value }),
}) })
if (res.status !== 200) { if (res.status !== 200) {
error.value = await res.text() error.value = await res.text()
} else { } else {
const data = await res.json() const data = await res.json()
emits("update:factors", data["factors"]) emits("update:ticket", data["ticket"])
emits("update:challenge", data["challenge"]) if (data.is_finished) emits("swap", "completed")
emits("swap", "pick") else emits("swap", "mfa")
error.value = null error.value = null
} }
emits("update:loading", false) emits("update:loading", false)

68
web/src/components/auth/AuthenticateCompleted.vue Normal file
View File

@ -0,0 +1,68 @@
<template>
<div>
<v-icon icon="mdi-lan-check" size="32" color="grey-darken-3" class="mb-3" />
<h1 class="font-bold text-xl">All Done!</h1>
<p>Welcome back! You just signed in right now! We're going to send you to jesus...</p>
<v-expand-transition>
<v-alert v-show="error" variant="tonal" type="error" class="text-xs mb-3">
Something went wrong... {{ error }}
</v-alert>
</v-expand-transition>
</div>
</template>
<script setup lang="ts">
import { request } from "@/scripts/request"
import { useUserinfo } from "@/stores/userinfo"
import { onMounted, ref } from "vue"
import { useRoute, useRouter } from "vue-router"
const route = useRoute()
const router = useRouter()
const userinfo = useUserinfo()
const props = defineProps<{ loading?: boolean; currentFactor?: any; ticket?: any }>()
const emits = defineEmits(["update:loading"])
const error = ref<string | null>(null)
async function load() {
emits("update:loading", true)
await getToken(props.ticket.grant_token)
await userinfo.readProfiles()
emits("update:loading", false)
setTimeout(() => callback(), 3000)
}
onMounted(() => load())
async function getToken(tk: string) {
const res = await request("/api/auth/token", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
code: tk,
grant_type: "grant_token",
}),
})
if (res.status !== 200) {
const err = await res.text()
error.value = err
throw new Error(err)
} else {
error.value = null
}
}
function callback() {
if (route.query["close"]) {
window.close()
} else if (route.query["redirect_uri"]) {
window.open((route.query["redirect_uri"] as string) ?? "/", "_self")
} else {
router.push({ name: "dashboard" })
}
}
</script>

62
web/src/components/auth/FactorApplicator.vue
View File

@ -47,75 +47,37 @@
<script setup lang="ts"> <script setup lang="ts">
import { request } from "@/scripts/request" import { request } from "@/scripts/request"
import { useUserinfo } from "@/stores/userinfo"
import { computed, ref } from "vue" import { computed, ref } from "vue"
import { useRoute, useRouter } from "vue-router"
const password = ref("") const password = ref("")
const error = ref<string | null>(null) const error = ref<string | null>(null)
const props = defineProps<{ loading?: boolean; currentFactor?: any; challenge?: any }>() const props = defineProps<{ loading?: boolean; currentFactor?: any; ticket?: any }>()
const emits = defineEmits(["swap", "update:challenge"]) const emits = defineEmits(["swap", "update:ticket", "update:loading"])
const route = useRoute()
const router = useRouter()
const { readProfiles } = useUserinfo()
async function submit() { async function submit() {
const res = await request(`/api/auth`, { emits("update:loading", true)
const res = await request(`/api/auth/mfa`, {
method: "POST", method: "POST",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify({ body: JSON.stringify({
challenge_id: props.challenge?.id, ticket_id: props.ticket?.id,
factor_id: props.currentFactor?.id, factor_id: props.currentFactor?.id,
secret: password.value, code: password.value,
}), }),
}) })
if (res.status !== 200) { if (res.status !== 200) {
error.value = await res.text() error.value = await res.text()
} else { } else {
const data = await res.json() const data = await res.json()
if (data["is_finished"]) {
await getToken(data["session"]["grant_token"])
await readProfiles()
callback()
} else {
emits("swap", "pick")
emits("update:challenge", data["challenge"])
error.value = null
password.value = ""
}
}
}
async function getToken(tk: string) {
const res = await request("/api/auth/token", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
code: tk,
grant_type: "grant_token",
}),
})
if (res.status !== 200) {
const err = await res.text()
error.value = err
throw new Error(err)
} else {
error.value = null error.value = null
password.value = ""
emits("update:ticket", data["ticket"])
if (data["is_finished"]) emits("swap", "completed")
else emits("swap", "mfa")
} }
} emits("update:loading", false)
function callback() {
if (route.query["closable"]) {
window.close()
} else if (route.query["redirect_uri"]) {
window.open((route.query["redirect_uri"] as string) ?? "/", "_self")
} else {
router.push({ name: "dashboard" })
}
} }
const inputType = computed(() => { const inputType = computed(() => {
@ -124,6 +86,8 @@ const inputType = computed(() => {
return "text" return "text"
case 1: case 1:
return "one-time-password" return "one-time-password"
default:
return "unknown"
} }
}) })
</script> </script>

31
web/src/components/auth/FactorPicker.vue
View File

@ -4,7 +4,8 @@
<v-card class="mb-3"> <v-card class="mb-3">
<v-list density="compact" color="primary"> <v-list density="compact" color="primary">
<v-list-item <v-list-item
v-for="item in props.factors ?? []" v-for="(item, idx) in factors ?? []"
:key="idx"
:prepend-icon="getFactorType(item)?.icon" :prepend-icon="getFactorType(item)?.icon"
:title="getFactorType(item)?.label" :title="getFactorType(item)?.label"
:active="focus === item.id" :active="focus === item.id"
@ -30,18 +31,32 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref } from "vue" import { onMounted, ref } from "vue"
import { request } from "@/scripts/request" import { request } from "@/scripts/request"
const focus = ref<number | null>(null) const focus = ref<number | null>(null)
const factors = ref<any[]>([])
const error = ref<string | null>(null) const error = ref<string | null>(null)
const props = defineProps<{ factors?: any[]; challenge?: any }>() const props = defineProps<{ ticket?: any }>()
const emits = defineEmits(["swap", "update:loading", "update:currentFactor"]) const emits = defineEmits(["swap", "update:loading", "update:currentFactor"])
async function load() {
emits("update:loading", true)
const res = await request(`/api/auth/factors?ticketId=${props.ticket.ticketId}`)
if (res.status !== 200) {
error.value = await res.text()
} else {
factors.value = await res.json()
}
emits("update:loading", false)
}
onMounted(() => load())
async function submit() { async function submit() {
if (!focus) return if (!focus.value) return
emits("update:loading", true) emits("update:loading", true)
const res = await request(`/api/auth/factors/${focus.value}`, { const res = await request(`/api/auth/factors/${focus.value}`, {
@ -50,7 +65,7 @@ async function submit() {
if (res.status !== 200 && res.status !== 204) { if (res.status !== 200 && res.status !== 204) {
error.value = await res.text() error.value = await res.text()
} else { } else {
const item = props.factors?.find((item: any) => item.id === focus.value) const item = factors.value.find((item: any) => item.id === focus.value)
emits("update:currentFactor", item) emits("update:currentFactor", item)
emits("swap", "applicator") emits("swap", "applicator")
error.value = null error.value = null
@ -61,15 +76,13 @@ async function submit() {
function getFactorType(item: any) { function getFactorType(item: any) {
switch (item.type) { switch (item.type) {
case 0:
return { icon: "mdi-form-textbox-password", label: "Password Validation" }
case 1: case 1:
return { icon: "mdi-email-fast", label: "Email One Time Password" } return { icon: "mdi-email-fast", label: "Email Validation" }
} }
} }
function getFactorAvailable(factor: any) { function getFactorAvailable(factor: any) {
const blacklist: number[] = props.challenge?.blacklist_factors ?? [] const blacklist: number[] = props.ticket?.blacklist_factors ?? []
return blacklist.includes(factor.id) return blacklist.includes(factor.id)
} }
</script> </script>

33
web/src/router/index.ts
View File

@ -6,16 +6,20 @@ import UserCenterLayout from "@/layouts/user-center.vue"
const router = createRouter({ const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL), history: createWebHistory(import.meta.env.BASE_URL),
routes: [ routes: [
{
path: "/",
redirect: { name: "dashboard" },
},
{ {
path: "/", path: "/",
component: MasterLayout, component: MasterLayout,
children: [ children: [
{ {
path: "/", path: "/users",
component: UserCenterLayout, component: UserCenterLayout,
children: [ children: [
{ {
path: "/", path: "/me",
name: "dashboard", name: "dashboard",
component: () => import("@/views/dashboard.vue"), component: () => import("@/views/dashboard.vue"),
meta: { title: "Your account" }, meta: { title: "Your account" },
@ -43,34 +47,33 @@ const router = createRouter({
], ],
}, },
{ {
path: "/auth", path: "/",
children: [ children: [
{ {
path: "sign-in", path: "/sign-in",
name: "auth.sign-in", name: "auth.sign-in",
component: () => import("@/views/auth/sign-in.vue"), component: () => import("@/views/auth/sign-in.vue"),
meta: { public: true, title: "Sign in" }, meta: { public: true, title: "Sign in" },
}, },
{ {
path: "sign-up", path: "/sign-up",
name: "auth.sign-up", name: "auth.sign-up",
component: () => import("@/views/auth/sign-up.vue"), component: () => import("@/views/auth/sign-up.vue"),
meta: { public: true, title: "Sign up" }, meta: { public: true, title: "Sign up" },
}, },
{ {
path: "o/connect", path: "authorize",
name: "openid.connect", name: "oauth.authorize",
component: () => import("@/views/auth/connect.vue"), component: () => import("@/views/auth/authorize.vue"),
},
{
path: "/me/confirm",
name: "callback.confirm",
component: () => import("@/views/confirm.vue"),
meta: { public: true, title: "Confirm registration" },
}, },
], ],
}, },
{
path: "/users/me/confirm",
name: "callback.confirm",
component: () => import("@/views/confirm.vue"),
meta: { public: true, title: "Confirm registration" },
},
], ],
}) })

0
web/src/views/auth/connect.vue → web/src/views/auth/authorize.vue
View File

31
web/src/views/auth/sign-in.vue
View File

@ -7,24 +7,14 @@
<div> <div>
<v-avatar color="accent" icon="mdi-login-variant" size="large" class="card-rounded mb-2" /> <v-avatar color="accent" icon="mdi-login-variant" size="large" class="card-rounded mb-2" />
<h1 class="text-2xl">Sign in</h1> <h1 class="text-2xl">Sign in</h1>
<div v-if="challenge" class="flex items-center gap-4"> <p v-if="ticket">We need to verify that the person trying to access your account is you.</p>
<v-tooltip>
<template v-slot:activator="{ props }">
<v-progress-circular v-bind="props" size="large"
:model-value="(challenge?.progress / challenge?.requirements) * 100" />
</template>
<p><b>Risk: </b> {{ challenge?.risk_level }}</p>
<p><b>Progress: </b> {{ challenge?.progress }}/{{ challenge?.requirements }}</p>
</v-tooltip>
<p>We need to verify that the person trying to access your account is you.</p>
</div>
<p v-else>Sign in via your Solar ID to access the entire Solar Network.</p> <p v-else>Sign in via your Solar ID to access the entire Solar Network.</p>
</div> </div>
<v-window :touch="false" :model-value="panel" class="pa-2 mx-[-0.5rem]"> <v-window :touch="false" :model-value="panel" class="pa-2 mx-[-0.5rem]">
<v-window-item v-for="k in Object.keys(panels)" :value="k"> <v-window-item v-for="(k, idx) in Object.keys(panels)" :key="idx" :value="k">
<component :is="panels[k]" @swap="(val: string) => (panel = val)" v-model:loading="loading" <component :is="panels[k]" @swap="(val: string) => (panel = val)" v-model:loading="loading"
v-model:factors="factors" v-model:currentFactor="currentFactor" v-model:challenge="challenge" /> v-model:currentFactor="currentFactor" v-model:ticket="ticket" />
</v-window-item> </v-window-item>
</v-window> </v-window>
</v-card-text> </v-card-text>
@ -35,25 +25,26 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, type Component } from "vue" import { type Component, ref } from "vue"
import Copyright from "@/components/Copyright.vue" import Copyright from "@/components/Copyright.vue"
import CallbackNotify from "@/components/auth/CallbackNotify.vue" import CallbackNotify from "@/components/auth/CallbackNotify.vue"
import AccountLocator from "@/components/auth/AccountLocator.vue"
import FactorPicker from "@/components/auth/FactorPicker.vue" import FactorPicker from "@/components/auth/FactorPicker.vue"
import FactorApplicator from "@/components/auth/FactorApplicator.vue" import FactorApplicator from "@/components/auth/FactorApplicator.vue"
import AccountAuthenticate from "@/components/auth/Authenticate.vue"
import AuthenticateCompleted from "@/components/auth/AuthenticateCompleted.vue"
const loading = ref(false) const loading = ref(false)
const factors = ref<any>(null)
const currentFactor = ref<any>(null) const currentFactor = ref<any>(null)
const challenge = ref<any>(null) const ticket = ref<any>(null)
const panel = ref("locate") const panel = ref("authenticate")
const panels: { [id: string]: Component } = { const panels: { [id: string]: Component } = {
locate: AccountLocator, authenticate: AccountAuthenticate,
pick: FactorPicker, mfa: FactorPicker,
applicator: FactorApplicator, applicator: FactorApplicator,
completed: AuthenticateCompleted,
} }
</script> </script>

2
web/src/views/confirm.vue
View File

@ -28,7 +28,7 @@
<v-icon icon="mdi-fire" size="32" color="grey-darken-3" class="mb-3" /> <v-icon icon="mdi-fire" size="32" color="grey-darken-3" class="mb-3" />
<h1 class="font-bold text-xl">Confirmed</h1> <h1 class="font-bold text-xl">Confirmed</h1>
<p>You're done! We sucessfully confirmed your account.</p> <p>You're done! We successfully confirmed your account.</p>
<p class="mt-3">Now you can continue use Solarpass, we will redirect to dashboard you soon.</p> <p class="mt-3">Now you can continue use Solarpass, we will redirect to dashboard you soon.</p>
</div> </div>