Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
strudelv2_spa
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hpc-team
strudelv2_spa
Commits
65658df9
Commit
65658df9
authored
5 years ago
by
Chris Hines
Browse files
Options
Downloads
Patches
Plain Diff
weird hanging on dev server, trying to debug
parent
e13fd70f
No related branches found
No related tags found
2 merge requests
!21
New css dev
,
!13
Dev
Pipeline
#7536
passed
5 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/authorisation.service.ts
+7
-2
7 additions, 2 deletions
src/app/authorisation.service.ts
src/app/backend-selection.service.ts
+2
-2
2 additions, 2 deletions
src/app/backend-selection.service.ts
with
9 additions
and
4 deletions
src/app/authorisation.service.ts
+
7
−
2
View file @
65658df9
...
...
@@ -168,21 +168,26 @@ export class AuthorisationService {
public
getCert
()
{
var
token
:
AuthToken
;
token
=
this
.
token
.
value
;
console
.
log
(
'
entered getCert
'
);
if
(
token
===
null
||
token
===
undefined
||
token
.
token
===
undefined
||
token
.
token
===
''
||
token
.
token
===
null
)
{
this
.
token
.
pipe
(
skip
(
1
),
take
(
1
)).
subscribe
(()
=>
this
.
getCert
())
console
.
log
(
'
getCert token not defined, setting callback
'
);
this
.
token
.
pipe
(
skip
(
1
),
take
(
1
)).
subscribe
(()
=>
this
.
getCert
());
return
}
if
(
this
.
backendSelectionService
.
apiserver
.
value
===
null
||
this
.
backendSelectionService
.
apiserver
.
value
===
undefined
)
{
this
.
backendSelectionService
.
apiserver
.
pipe
(
skip
(
1
),
take
(
1
)).
subscribe
(()
=>
this
.
getCert
())
console
.
log
(
'
getCert api server not defined, setting callback
'
);
this
.
backendSelectionService
.
apiserver
.
pipe
(
skip
(
1
),
take
(
1
)).
subscribe
(()
=>
this
.
getCert
());
return
}
console
.
log
(
'
generating ssh key
'
);
let
starttime
=
new
Date
();
let
newkeypair
=
keypair
();
let
publicKey
=
forge
.
pki
.
publicKeyFromPem
(
newkeypair
.
public
);
let
sshpub
=
forge
.
ssh
.
publicKeyToOpenSSH
(
publicKey
,
'
sv2@monash.edu
'
);
let
endtime
=
new
Date
();
console
.
log
(
'
created a private key, getting it signed
'
);
let
headers
=
new
HttpHeaders
();
let
options
=
{
headers
:
headers
,
withCredentials
:
true
};
...
...
This diff is collapsed.
Click to expand it.
src/app/backend-selection.service.ts
+
2
−
2
View file @
65658df9
...
...
@@ -50,7 +50,7 @@ export class BackendSelectionService {
this
.
saveLastApiServer
(
this
.
apiserver
.
value
)
}
storeLocalAPIServers
(
apiservers
)
{
/*
storeLocalAPIServers(apiservers) {
localStorage.setItem('localAPIServers',JSON.stringify(apiservers));
this.getAPIServers();
}
...
...
@@ -58,7 +58,7 @@ export class BackendSelectionService {
removeLocalAPIServer() {
localStorage.removeItem('localAPIServers');
this.getAPIServers();
}
}
*/
getAPIServers
()
{
console
.
log
(
'
retrieving api servers
'
);
...
...
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