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
Tatuya Kamada
gitlab-ce
Commits
932bcb4d
Commit
932bcb4d
authored
Jan 02, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added isAuthenticate to differentiate between ineligible messages
parent
8dc2163c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
app/assets/javascripts/u2f/authenticate.js.es6
app/assets/javascripts/u2f/authenticate.js.es6
+1
-1
app/assets/javascripts/u2f/error.js
app/assets/javascripts/u2f/error.js
+8
-8
app/assets/javascripts/u2f/register.js
app/assets/javascripts/u2f/register.js
+1
-1
No files found.
app/assets/javascripts/u2f/authenticate.js.es6
View file @
932bcb4d
...
...
@@ -57,7 +57,7 @@
return function(response) {
var error;
if (response.errorCode) {
error = new U2FError(response.errorCode);
error = new U2FError(response.errorCode
, 'authenticate'
);
return _this.renderError(error);
} else {
return _this.renderAuthenticated(JSON.stringify(response));
...
...
app/assets/javascripts/u2f/error.js
View file @
932bcb4d
...
...
@@ -5,21 +5,21 @@
var
bind
=
function
(
fn
,
me
){
return
function
(){
return
fn
.
apply
(
me
,
arguments
);
};
};
this
.
U2FError
=
(
function
()
{
function
U2FError
(
errorCode
)
{
function
U2FError
(
errorCode
,
u2fFlowType
)
{
this
.
errorCode
=
errorCode
;
this
.
message
=
bind
(
this
.
message
,
this
);
this
.
httpsDisabled
=
window
.
location
.
protocol
!==
'
https:
'
;
this
.
u2fFlowType
=
u2fFlowType
;
}
U2FError
.
prototype
.
message
=
function
()
{
switch
(
false
)
{
case
!
(
this
.
errorCode
===
u2f
.
ErrorCodes
.
BAD_REQUEST
&&
this
.
httpsDisabled
):
return
"
U2F only works with HTTPS-enabled websites. Contact your administrator for more details.
"
;
case
this
.
errorCode
!==
u2f
.
ErrorCodes
.
DEVICE_INELIGIBLE
:
return
"
This device has already been registered with us.
"
;
default
:
return
"
There was a problem communicating with your device.
"
;
if
(
this
.
errorCode
===
u2f
.
ErrorCodes
.
BAD_REQUEST
&&
this
.
httpsDisabled
)
{
return
'
U2F only works with HTTPS-enabled websites. Contact your administrator for more details.
'
;
}
else
if
(
this
.
errorCode
===
u2f
.
ErrorCodes
.
DEVICE_INELIGIBLE
)
{
if
(
this
.
u2fFlowType
===
'
authenticate
'
)
return
'
This device has not been registered with us.
'
;
if
(
this
.
u2fFlowType
===
'
register
'
)
return
'
This device has already been registered with us.
'
;
}
return
"
There was a problem communicating with your device.
"
;
};
return
U2FError
;
...
...
app/assets/javascripts/u2f/register.js
View file @
932bcb4d
...
...
@@ -39,7 +39,7 @@
return
function
(
response
)
{
var
error
;
if
(
response
.
errorCode
)
{
error
=
new
U2FError
(
response
.
errorCode
);
error
=
new
U2FError
(
response
.
errorCode
,
'
register
'
);
return
_this
.
renderError
(
error
);
}
else
{
return
_this
.
renderRegistered
(
JSON
.
stringify
(
response
));
...
...
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