Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vMap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marty Fabien
vMap
Commits
ee85f804
Commit
ee85f804
authored
Nov 12, 2018
by
Armand Bahi
Browse files
Options
Downloads
Patches
Plain Diff
fix url uthentification problems
Closes #19
parent
85bb73a6
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
client/javascript/app/controllers/initCtrl.js
+11
-9
11 additions, 9 deletions
client/javascript/app/controllers/initCtrl.js
with
11 additions
and
9 deletions
client/javascript/app/controllers/initCtrl.js
+
11
−
9
View file @
ee85f804
...
@@ -101,12 +101,12 @@ vitisApp.initCtrl = function ($scope, $log, $q, envSrvc, sessionSrvc, properties
...
@@ -101,12 +101,12 @@ vitisApp.initCtrl = function ($scope, $log, $q, envSrvc, sessionSrvc, properties
/**
/**
* connect
From
Url function.
* connect
WithToken
Url function.
* Connexion à l'application avec les identifiants passés dans l'url.
* Connexion à l'application avec les identifiants passés dans l'url.
* @param {string} oConnexionId Identifiants de connexion
* @param {string} oConnexionId Identifiants de connexion
**/
**/
$scope
.
$root
[
"
connectWithTokenUrl
"
]
=
function
()
{
$scope
.
$root
[
"
connectWithTokenUrl
"
]
=
function
()
{
$log
.
info
(
"
connect
From
Url
"
);
$log
.
info
(
"
connect
WithToken
Url
"
);
// Demande de token pour l'utilisateur.
// Demande de token pour l'utilisateur.
ajaxRequest
({
ajaxRequest
({
"
method
"
:
"
POST
"
,
"
method
"
:
"
POST
"
,
...
@@ -157,15 +157,17 @@ vitisApp.initCtrl = function ($scope, $log, $q, envSrvc, sessionSrvc, properties
...
@@ -157,15 +157,17 @@ vitisApp.initCtrl = function ($scope, $log, $q, envSrvc, sessionSrvc, properties
sessionSrvc
[
"
token
"
]
=
oUrlParams
[
'
token
'
];
sessionSrvc
[
"
token
"
]
=
oUrlParams
[
'
token
'
];
sessionSrvc
[
"
saveSessionToLocalStorage
"
]();
sessionSrvc
[
"
saveSessionToLocalStorage
"
]();
$scope
.
$root
[
"
connectWithTokenUrl
"
]();
$scope
.
$root
[
"
connectWithTokenUrl
"
]();
}
else
}
else
{
deferred
.
resolve
();
deferred
.
resolve
();
}
// Connexion avec les identifiants passés dans l'url (si le cookie avec le token n'existe pas).
// Connexion avec les identifiants passés dans l'url (si le cookie avec le token n'existe pas).
var
aUrlParamsKeys
=
Object
.
keys
(
oUrlParams
);
var
aUrlParamsKeys
=
Object
.
keys
(
oUrlParams
);
if
(
sessionSrvc
[
"
getAppLocalStorageItem
"
](
"
session_token
"
)
===
null
&&
aUrlParamsKeys
.
indexOf
(
"
login
"
)
!==
-
1
&&
aUrlParamsKeys
.
indexOf
(
"
password
"
)
!==
-
1
)
if
(
aUrlParamsKeys
.
indexOf
(
"
login
"
)
!==
-
1
&&
aUrlParamsKeys
.
indexOf
(
"
password
"
)
!==
-
1
)
{
$scope
.
$root
[
"
connectFromUrl
"
](
oUrlParams
);
$scope
.
$root
[
"
connectFromUrl
"
](
oUrlParams
);
else
}
else
{
deferred
.
resolve
();
deferred
.
resolve
();
}
// Si le token est dans le session storage : connexion à l'application (si la date est toujours valide).
// Si le token est dans le session storage : connexion à l'application (si la date est toujours valide).
promise
.
then
(
function
()
{
promise
.
then
(
function
()
{
...
...
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