projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ingest remote attachment width/height
[akkoma]
/
test
/
pleroma
/
web
/
o_auth
/
mfa_controller_test.exs
diff --git
a/test/pleroma/web/o_auth/mfa_controller_test.exs
b/test/pleroma/web/o_auth/mfa_controller_test.exs
index 3c341facdc284c0f9b507ad2de38c732b467622a..17bbde85b40a974ab45070afd08f6e3e2e4932f8 100644
(file)
--- a/
test/pleroma/web/o_auth/mfa_controller_test.exs
+++ b/
test/pleroma/web/o_auth/mfa_controller_test.exs
@@
-1,9
+1,9
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
18
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OAuth.MFAControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OAuth.MFAControllerTest do
- use Pleroma.Web.ConnCase
+ use Pleroma.Web.ConnCase
, async: true
import Pleroma.Factory
alias Pleroma.MFA
import Pleroma.Factory
alias Pleroma.MFA
@@
-20,7
+20,7
@@
defmodule Pleroma.Web.OAuth.MFAControllerTest do
insert(:user,
multi_factor_authentication_settings: %MFA.Settings{
enabled: true,
insert(:user,
multi_factor_authentication_settings: %MFA.Settings{
enabled: true,
- backup_codes: [Pbkdf2.hash_pwd_salt("test-code")],
+ backup_codes: [P
leroma.Password.P
bkdf2.hash_pwd_salt("test-code")],
totp: %MFA.Settings.TOTP{secret: otp_secret, confirmed: true}
}
)
totp: %MFA.Settings.TOTP{secret: otp_secret, confirmed: true}
}
)
@@
-171,7
+171,6
@@
defmodule Pleroma.Web.OAuth.MFAControllerTest do
assert match?(
%{
"access_token" => _,
assert match?(
%{
"access_token" => _,
- "expires_in" => 600,
"me" => ^ap_id,
"refresh_token" => _,
"scope" => "write",
"me" => ^ap_id,
"refresh_token" => _,
"scope" => "write",
@@
-247,7
+246,7
@@
defmodule Pleroma.Web.OAuth.MFAControllerTest do
hashed_codes =
backup_codes
hashed_codes =
backup_codes
- |> Enum.map(&Pbkdf2.hash_pwd_salt(&1))
+ |> Enum.map(&P
leroma.Password.P
bkdf2.hash_pwd_salt(&1))
user =
insert(:user,
user =
insert(:user,
@@
-280,7
+279,6
@@
defmodule Pleroma.Web.OAuth.MFAControllerTest do
assert match?(
%{
"access_token" => _,
assert match?(
%{
"access_token" => _,
- "expires_in" => 600,
"me" => ^ap_id,
"refresh_token" => _,
"scope" => "write",
"me" => ^ap_id,
"refresh_token" => _,
"scope" => "write",