Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
persona
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hexang 息壤平台
persona
Commits
02c74775
Commit
02c74775
authored
12 years ago
by
Shane Tomlinson
Browse files
Options
Downloads
Patches
Plain Diff
Comment updates
parent
be035ba2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
resources/static/dialog/resources/state.js
+9
-8
9 additions, 8 deletions
resources/static/dialog/resources/state.js
with
9 additions
and
8 deletions
resources/static/dialog/resources/state.js
+
9
−
8
View file @
02c74775
...
...
@@ -194,7 +194,9 @@ BrowserID.State = (function() {
if
(
idInfo
.
type
===
"
primary
"
)
{
if
(
idInfo
.
cert
)
{
// Email is a primary and the cert is available - the user can log
// in without authenticated with the primary.
// in without authenticating with the IdP. All invalid/expired
// certs are assumed to have been checked and removed by this
// point.
redirectToState
(
"
email_valid_and_ready
"
,
info
);
}
else
{
...
...
@@ -230,13 +232,12 @@ BrowserID.State = (function() {
});
handleState
(
"
email_valid_and_ready
"
,
function
(
msg
,
info
)
{
// At this stage, we know that the email the user is trying to
// authenticate with is valid, it has been confirmed, and it has a valid
// key. Before generating an assertion, check to see if the user has
// verified whether the ownership status of this computer. If the user
// needs asked, ask them and generate the assertion once they finish the
// response. If they do not need to be asked, generate the assertion
// now.
// this state is only called after all checking is done on the email
// address. For secondaries, this means the email has been validated and
// the user is authenticated to the password level. For primaries, this
// means the user is authenticated with their IdP and the certificate for
// the address is valid. An assertion can be generated, but first we
// may have to check whether the user owns the computer.
user
.
shouldAskIfUsersComputer
(
function
(
shouldAsk
)
{
if
(
shouldAsk
)
{
redirectToState
(
"
is_this_your_computer
"
,
info
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment