Merge commit '2cfb637451441e5bd51dbfb736598ee33b7e8323' into feature-…

…clean
DIDIRUS4 · Nov 27, 2024 · 414bde9 · 414bde9
2 parents 4ab76c5 + 2cfb637
commit 414bde9
Show file tree

Hide file tree

Showing 52 changed files with 2,490 additions and 2,943 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue b/apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue
@@ -9,7 +9,7 @@ import {
   SteamIcon,
   GitLabIcon,
 } from '@/assets/external'
-import { login, login_2fa, create_account, login_pass } from '@/helpers/mr_auth.js'
+import { login } from '@/helpers/mr_auth.js'
 import { handleError, useNotifications } from '@/store/state.js'
 import { ref } from 'vue'
 import { handleSevereError } from '@/store/error.js'
@@ -72,7 +72,7 @@ const confirmPassword = ref('')
 const subscribe = ref(true)
 
 async function signInOauth(provider) {
-  const creds = await login(provider).catch(handleSevereError)
+  const creds = await login().catch(handleSevereError)
 
   if (creds && creds.type === 'two_factor_required') {
     twoFactorFlow.value = creds.flow

diff --git a/apps/app-frontend/src/helpers/mr_auth.js b/apps/app-frontend/src/helpers/mr_auth.js
@@ -5,26 +5,8 @@
  */
 import { invoke } from '@tauri-apps/api/core'
 
-export async function login(provider) {
-  return await invoke('modrinth_auth_login', { provider })
-}
-
-export async function login_pass(username, password, challenge) {
-  return await invoke('plugin:mr-auth|login_pass', { username, password, challenge })
-}
-
-export async function login_2fa(code, flow) {
-  return await invoke('plugin:mr-auth|login_2fa', { code, flow })
-}
-
-export async function create_account(username, email, password, challenge, signUpNewsletter) {
-  return await invoke('plugin:mr-auth|create_account', {
-    username,
-    email,
-    password,
-    challenge,
-    signUpNewsletter,
-  })
+export async function login() {
+  return await invoke('plugin:mr-auth|modrinth_login')
 }
 
 export async function logout() {

diff --git a/apps/app/build.rs b/apps/app/build.rs
@@ -103,13 +103,7 @@ fn main() {
             .plugin(
                 "mr-auth",
                 InlinedPlugin::new()
-                    .commands(&[
-                        "login_pass",
-                        "login_2fa",
-                        "create_account",
-                        "logout",
-                        "get",
-                    ])
+                    .commands(&["modrinth_login", "logout", "get"])
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),

diff --git a/apps/app/gen/schemas/acl-manifests.json b/apps/app/gen/schemas/acl-manifests.json
diff --git a/apps/app/gen/schemas/desktop-schema.json b/apps/app/gen/schemas/desktop-schema.json
@@ -2370,55 +2370,35 @@
           "type": "string",
           "const": "mr-auth:default"
         },
-        {
-          "description": "Enables the create_account command without any pre-configured scope.",
-          "type": "string",
-          "const": "mr-auth:allow-create-account"
-        },
         {
           "description": "Enables the get command without any pre-configured scope.",
           "type": "string",
           "const": "mr-auth:allow-get"
         },
-        {
-          "description": "Enables the login_2fa command without any pre-configured scope.",
-          "type": "string",
-          "const": "mr-auth:allow-login-2fa"
-        },
-        {
-          "description": "Enables the login_pass command without any pre-configured scope.",
-          "type": "string",
-          "const": "mr-auth:allow-login-pass"
-        },
         {
           "description": "Enables the logout command without any pre-configured scope.",
           "type": "string",
           "const": "mr-auth:allow-logout"
         },
         {
-          "description": "Denies the create_account command without any pre-configured scope.",
+          "description": "Enables the modrinth_login command without any pre-configured scope.",
           "type": "string",
-          "const": "mr-auth:deny-create-account"
+          "const": "mr-auth:allow-modrinth-login"
         },
         {
           "description": "Denies the get command without any pre-configured scope.",
           "type": "string",
           "const": "mr-auth:deny-get"
         },
         {
-          "description": "Denies the login_2fa command without any pre-configured scope.",
-          "type": "string",
-          "const": "mr-auth:deny-login-2fa"
-        },
-        {
-          "description": "Denies the login_pass command without any pre-configured scope.",
+          "description": "Denies the logout command without any pre-configured scope.",
           "type": "string",
-          "const": "mr-auth:deny-login-pass"
+          "const": "mr-auth:deny-logout"
         },
         {
-          "description": "Denies the logout command without any pre-configured scope.",
+          "description": "Denies the modrinth_login command without any pre-configured scope.",
           "type": "string",
-          "const": "mr-auth:deny-logout"
+          "const": "mr-auth:deny-modrinth-login"
         },
         {
           "description": "This permission set configures which\noperating system information are available\nto gather from the frontend.\n\n#### Granted Permissions\n\nAll information except the host name are available.\n\n",