Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wallet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
hive
wallet
Commits
ebed8285
Commit
ebed8285
authored
Mar 10, 2020
by
/ /\ / /\/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #118 on bridge-api
parent
cfc25f8d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
src/server/api/account_recovery.js
src/server/api/account_recovery.js
+1
-1
src/server/api/general.js
src/server/api/general.js
+3
-5
src/server/sign_up_pages/enter_confirm_email.jsx
src/server/sign_up_pages/enter_confirm_email.jsx
+2
-4
No files found.
src/server/api/account_recovery.js
View file @
ebed8285
...
...
@@ -48,7 +48,7 @@ export default function useAccountRecoveryApi(app) {
const
arec
=
yield
models
.
AccountRecoveryRequest
.
findOne
({
attributes
:
[
'
id
'
,
'
account_name
'
,
'
owner_key
'
],
where
:
{
validation_code
:
esc
(
code
)
},
order
:
'
id desc
'
,
order
:
[[
'
id
'
,
'
DESC
'
]]
,
});
if
(
arec
)
{
this
.
session
.
arec
=
arec
.
id
;
...
...
src/server/api/general.js
View file @
ebed8285
...
...
@@ -158,7 +158,7 @@ export default function useGeneralApi(app) {
const
same_ip_account
=
yield
models
.
Account
.
findOne
({
attributes
:
[
'
created_at
'
],
where
:
{
remote_ip
:
esc
(
remote_ip
),
created
:
true
},
order
:
'
id DESC
'
,
order
:
[[
'
id
'
,
'
DESC
'
]]
,
});
if
(
same_ip_account
)
{
const
minutes
=
...
...
@@ -236,7 +236,7 @@ export default function useGeneralApi(app) {
const
existing_account
=
yield
models
.
Account
.
findOne
({
attributes
:
[
'
id
'
],
where
:
{
user_id
,
name
:
account
.
name
},
order
:
'
id DESC
'
,
order
:
[[
'
id
'
,
'
DESC
'
]]
,
});
if
(
existing_account
)
{
yield
existing_account
.
update
(
account_attrs
);
...
...
@@ -368,9 +368,7 @@ export default function useGeneralApi(app) {
if
(
!
sigHex
)
return
;
if
(
weight
!==
1
||
weight_threshold
!==
1
)
{
console
.
error
(
`/login_account login_challenge unsupported
${
type
}
auth configuration:
${
account
}
`
`/login_account login_challenge unsupported
${
type
}
auth configuration:
${
account
}
`
);
}
else
{
const
sig
=
parseSig
(
sigHex
);
...
...
src/server/sign_up_pages/enter_confirm_email.jsx
View file @
ebed8285
...
...
@@ -266,9 +266,7 @@ export default function useEnterAndConfirmEmailPages(app) {
]);
if
(
check_account_res
&&
check_account_res
.
length
>
0
)
{
this
.
flash
=
{
error
:
`
${
picked_account_name
}
is already taken, please try another name`
,
error
:
`
${
picked_account_name
}
is already taken, please try another name`
,
};
this
.
redirect
(
'
/pick_account
'
+
makeParams
(
params
));
return
;
...
...
@@ -455,7 +453,7 @@ export default function useEnterAndConfirmEmailPages(app) {
const
existing_account
=
yield
models
.
Account
.
findOne
({
attributes
:
[
'
id
'
],
where
:
{
user_id
:
user
.
id
,
name
:
account
},
order
:
'
id DESC
'
,
order
:
[[
'
id
'
,
'
DESC
'
]]
,
});
if
(
!
existing_account
)
{
yield
models
.
Account
.
create
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment