Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
26c69c5d
Commit
26c69c5d
authored
Nov 05, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display error code for U2F errors (!7305)
parent
50f3fd49
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/u2f/authenticate.js
app/assets/javascripts/u2f/authenticate.js
+2
-1
app/assets/javascripts/u2f/error.js
app/assets/javascripts/u2f/error.js
+0
-1
app/assets/javascripts/u2f/register.js
app/assets/javascripts/u2f/register.js
+2
-1
app/views/u2f/_authenticate.html.haml
app/views/u2f/_authenticate.html.haml
+1
-1
app/views/u2f/_register.html.haml
app/views/u2f/_register.html.haml
+1
-1
changelogs/unreleased/remove-u2f-error-logging.yml
changelogs/unreleased/remove-u2f-error-logging.yml
+4
-0
No files found.
app/assets/javascripts/u2f/authenticate.js
View file @
26c69c5d
...
@@ -85,7 +85,8 @@
...
@@ -85,7 +85,8 @@
U2FAuthenticate
.
prototype
.
renderError
=
function
(
error
)
{
U2FAuthenticate
.
prototype
.
renderError
=
function
(
error
)
{
this
.
renderTemplate
(
'
error
'
,
{
this
.
renderTemplate
(
'
error
'
,
{
error_message
:
error
.
message
()
error_message
:
error
.
message
(),
error_code
:
error
.
errorCode
});
});
return
this
.
container
.
find
(
'
#js-u2f-try-again
'
).
on
(
'
click
'
,
this
.
renderSetup
);
return
this
.
container
.
find
(
'
#js-u2f-try-again
'
).
on
(
'
click
'
,
this
.
renderSetup
);
};
};
...
...
app/assets/javascripts/u2f/error.js
View file @
26c69c5d
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
this
.
errorCode
=
errorCode
;
this
.
errorCode
=
errorCode
;
this
.
message
=
bind
(
this
.
message
,
this
);
this
.
message
=
bind
(
this
.
message
,
this
);
this
.
httpsDisabled
=
window
.
location
.
protocol
!==
'
https:
'
;
this
.
httpsDisabled
=
window
.
location
.
protocol
!==
'
https:
'
;
console
.
error
(
"
U2F Error Code:
"
+
this
.
errorCode
);
}
}
U2FError
.
prototype
.
message
=
function
()
{
U2FError
.
prototype
.
message
=
function
()
{
...
...
app/assets/javascripts/u2f/register.js
View file @
26c69c5d
...
@@ -72,7 +72,8 @@
...
@@ -72,7 +72,8 @@
U2FRegister
.
prototype
.
renderError
=
function
(
error
)
{
U2FRegister
.
prototype
.
renderError
=
function
(
error
)
{
this
.
renderTemplate
(
'
error
'
,
{
this
.
renderTemplate
(
'
error
'
,
{
error_message
:
error
.
message
()
error_message
:
error
.
message
(),
error_code
:
error
.
errorCode
});
});
return
this
.
container
.
find
(
'
#js-u2f-try-again
'
).
on
(
'
click
'
,
this
.
renderSetup
);
return
this
.
container
.
find
(
'
#js-u2f-try-again
'
).
on
(
'
click
'
,
this
.
renderSetup
);
};
};
...
...
app/views/u2f/_authenticate.html.haml
View file @
26c69c5d
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%script
#js-authenticate-u2f-error
{
type:
"text/template"
}
%script
#js-authenticate-u2f-error
{
type:
"text/template"
}
%div
%div
%p
<
%=
error_message
%
>
%p
<
%=
error_message
%
>
(error code:
<
%=
error_code
%
>
)
%a
.btn.btn-warning
#js-u2f-try-again
Try again?
%a
.btn.btn-warning
#js-u2f-try-again
Try again?
%script
#js-authenticate-u2f-authenticated
{
type:
"text/template"
}
%script
#js-authenticate-u2f-authenticated
{
type:
"text/template"
}
...
...
app/views/u2f/_register.html.haml
View file @
26c69c5d
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
%script
#js-register-u2f-error
{
type:
"text/template"
}
%script
#js-register-u2f-error
{
type:
"text/template"
}
%div
%div
%p
%p
%span
<
%=
error_message
%
>
%span
<
%=
error_message
%
>
(error code:
<
%=
error_code
%
>
)
%a
.btn.btn-warning
#js-u2f-try-again
Try again?
%a
.btn.btn-warning
#js-u2f-try-again
Try again?
%script
#js-register-u2f-registered
{
type:
"text/template"
}
%script
#js-register-u2f-registered
{
type:
"text/template"
}
...
...
changelogs/unreleased/remove-u2f-error-logging.yml
0 → 100644
View file @
26c69c5d
---
title
:
Display error code for U2F errors
merge_request
:
7305
author
:
winniehell
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