Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
f2fcdaf3
Commit
f2fcdaf3
authored
Jan 20, 2019
by
Christophe Maudoux
🐛
Browse files
Improve error msg if relative module is disabled (#1386)
parent
5af818eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
lemonldap-ng-portal/site/coffee/2fregistration.coffee
View file @
f2fcdaf3
...
...
@@ -15,7 +15,10 @@ displayError = (j, status, err) ->
if
res
and
res
.
error
res
=
res
.
error
.
replace
/.* /
,
''
console
.
log
'Returned error'
,
res
setMsg
res
,
'warning'
if
res
.
match
/module/
setMsg
'notAuthorized'
,
'warning'
else
setMsg
res
,
'warning'
# Delete function (launched by "delete" button)
delete2F
=
(
device
,
epoch
)
->
...
...
lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.js
View file @
f2fcdaf3
...
...
@@ -24,7 +24,11 @@ LemonLDAP::NG 2F registration script
if
(
res
&&
res
.
error
)
{
res
=
res
.
error
.
replace
(
/.* /
,
''
);
console
.
log
(
'
Returned error
'
,
res
);
return
setMsg
(
res
,
'
warning
'
);
if
(
res
.
match
(
/module/
))
{
return
setMsg
(
'
notAuthorized
'
,
'
warning
'
);
}
else
{
return
setMsg
(
res
,
'
warning
'
);
}
}
};
...
...
lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js
View file @
f2fcdaf3
(
function
(){
var
delete2F
,
displayError
,
setMsg
;
setMsg
=
function
(
msg
,
level
){
$
(
"
#msg
"
).
html
(
window
.
translate
(
msg
));
$
(
"
#color
"
).
removeClass
(
"
message-positive message-warning alert-success alert-warning
"
);
$
(
"
#color
"
).
addClass
(
"
message-
"
+
level
);
if
(
level
===
"
positive
"
){
level
=
"
success
"
}
return
$
(
"
#color
"
).
addClass
(
"
alert-
"
+
level
)};
displayError
=
function
(
j
,
status
,
err
){
var
res
;
console
.
log
(
"
Error
"
,
err
);
res
=
JSON
.
parse
(
j
.
responseText
);
if
(
res
&&
res
.
error
){
res
=
res
.
error
.
replace
(
/.* /
,
""
);
console
.
log
(
"
Returned error
"
,
res
);
return
setMsg
(
res
,
"
warning
"
)}};
delete2F
=
function
(
device
,
epoch
){
if
(
device
===
"
U2F
"
){
device
=
"
u
"
}
else
if
(
device
===
"
UBK
"
){
device
=
"
yubikey
"
}
else
if
(
device
===
"
TOTP
"
){
device
=
"
totp
"
}
else
{
setMsg
(
"
u2fFailed
"
,
"
warning
"
)}
return
$
.
ajax
({
type
:
"
POST
"
,
url
:
portal
+
"
2fregisters/
"
+
device
+
"
/delete
"
,
data
:{
epoch
:
epoch
},
dataType
:
"
json
"
,
error
:
displayError
,
success
:
function
(
resp
){
if
(
resp
.
error
){
if
(
resp
.
error
.
match
(
/notAuthorized/
)){
return
setMsg
(
"
notAuthorized
"
,
"
warning
"
)}
else
{
return
setMsg
(
"
unknownAction
"
,
"
warning
"
)}}
else
if
(
resp
.
result
){
$
(
"
#delete-
"
+
epoch
).
hide
();
return
setMsg
(
"
yourKeyIsUnregistered
"
,
"
positive
"
)}},
error
:
displayError
})};
$
(
document
).
ready
(
function
(){
$
(
"
body
"
).
on
(
"
click
"
,
"
.btn-danger
"
,
function
(){
return
delete2F
(
$
(
this
).
attr
(
"
device
"
),
$
(
this
).
attr
(
"
epoch
"
))});
$
(
"
#goback
"
).
attr
(
"
href
"
,
portal
);
return
$
(
"
.data-epoch
"
).
each
(
function
(){
var
myDate
;
myDate
=
new
Date
(
$
(
this
).
text
()
*
1
e3
);
return
$
(
this
).
text
(
myDate
.
toLocaleString
())})})}).
call
(
this
);
(
function
(){
var
delete2F
,
displayError
,
setMsg
;
setMsg
=
function
(
msg
,
level
){
$
(
"
#msg
"
).
html
(
window
.
translate
(
msg
));
$
(
"
#color
"
).
removeClass
(
"
message-positive message-warning alert-success alert-warning
"
);
$
(
"
#color
"
).
addClass
(
"
message-
"
+
level
);
if
(
level
===
"
positive
"
){
level
=
"
success
"
}
return
$
(
"
#color
"
).
addClass
(
"
alert-
"
+
level
)};
displayError
=
function
(
j
,
status
,
err
){
var
res
;
console
.
log
(
"
Error
"
,
err
);
res
=
JSON
.
parse
(
j
.
responseText
);
if
(
res
&&
res
.
error
){
res
=
res
.
error
.
replace
(
/.* /
,
""
);
console
.
log
(
"
Returned error
"
,
res
);
if
(
res
.
match
(
/module/
)){
return
setMsg
(
"
notAuthorized
"
,
"
warning
"
)}
else
{
return
setMsg
(
res
,
"
warning
"
)}}
}
;
delete2F
=
function
(
device
,
epoch
){
if
(
device
===
"
U2F
"
){
device
=
"
u
"
}
else
if
(
device
===
"
UBK
"
){
device
=
"
yubikey
"
}
else
if
(
device
===
"
TOTP
"
){
device
=
"
totp
"
}
else
{
setMsg
(
"
u2fFailed
"
,
"
warning
"
)}
return
$
.
ajax
({
type
:
"
POST
"
,
url
:
portal
+
"
2fregisters/
"
+
device
+
"
/delete
"
,
data
:{
epoch
:
epoch
},
dataType
:
"
json
"
,
error
:
displayError
,
success
:
function
(
resp
){
if
(
resp
.
error
){
if
(
resp
.
error
.
match
(
/notAuthorized/
)){
return
setMsg
(
"
notAuthorized
"
,
"
warning
"
)}
else
{
return
setMsg
(
"
unknownAction
"
,
"
warning
"
)}}
else
if
(
resp
.
result
){
$
(
"
#delete-
"
+
epoch
).
hide
();
return
setMsg
(
"
yourKeyIsUnregistered
"
,
"
positive
"
)}},
error
:
displayError
})};
$
(
document
).
ready
(
function
(){
$
(
"
body
"
).
on
(
"
click
"
,
"
.btn-danger
"
,
function
(){
return
delete2F
(
$
(
this
).
attr
(
"
device
"
),
$
(
this
).
attr
(
"
epoch
"
))});
$
(
"
#goback
"
).
attr
(
"
href
"
,
portal
);
return
$
(
"
.data-epoch
"
).
each
(
function
(){
var
myDate
;
myDate
=
new
Date
(
$
(
this
).
text
()
*
1
e3
);
return
$
(
this
).
text
(
myDate
.
toLocaleString
())})})}).
call
(
this
);
Write
Preview
Supports
Markdown
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