self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 10:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(web) handle auth.oidc null value and update npm packages

Browse source
This commit is contained in:
Alexey Kontsevoy 2017-03-31 17:48:24 -04:00
parent bd3514d79a
commit 1a777868b5
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/dist/app/app.cad10412a802f4fe148b.js → web/dist/app/app.372d8559f99a1a894a19.js vendored
View file

@ -1303,7 +1303,7 @@ webpackJsonp([0],[
return (0, _patternUtils.formatPattern)(cfg.routes.currentSession, { sid: sid, siteId: siteId });
},
getAuthProviders: function getAuthProviders() {
return cfg.auth ? [cfg.auth.oidc] : [];
return cfg.auth && cfg.auth.oidc ? [cfg.auth.oidc] : [];
},
getAuthType: function getAuthType() {
return cfg.auth ? cfg.auth.type : null;

0
web/dist/app/styles.cad10412a802f4fe148b.js → web/dist/app/styles.372d8559f99a1a894a19.js vendored
View file

18
web/dist/app/vendor.cad10412a802f4fe148b.js → web/dist/app/vendor.372d8559f99a1a894a19.js vendored
View file

File diff suppressed because one or more lines are too long

2
web/dist/index.html vendored
View file

@ -10,5 +10,5 @@
<body class="grv">
<div id="app"></div>
<div id="bearer_token" style="display: none;">{{.Session}}</div>
<script type="text/javascript" src="/web/app/vendor.cad10412a802f4fe148b.js"></script><script type="text/javascript" src="/web/app/styles.cad10412a802f4fe148b.js"></script><script type="text/javascript" src="/web/app/app.cad10412a802f4fe148b.js"></script></body>
<script type="text/javascript" src="/web/app/vendor.372d8559f99a1a894a19.js"></script><script type="text/javascript" src="/web/app/styles.372d8559f99a1a894a19.js"></script><script type="text/javascript" src="/web/app/app.372d8559f99a1a894a19.js"></script></body>
</html>

4
web/package.json
View file

@ -70,8 +70,8 @@
"karma-spec-reporter": "0.0.24",
"karma-webpack": "^1.7.0",
"mocha": "^2.0.1",
"node-inspector": "^0.12.3",
"node-sass": "^3.3.2",
"node-inspector": "^1.0.0",
"node-sass": "^4.5.2",
"raw-loader": "^0.5.1",
"react-addons-test-utils": "15.1.0",
"react-hot-loader": "^1.3.0",

2
web/src/app/config.js
View file

@ -133,7 +133,7 @@ let cfg = {
},
getAuthProviders() {
return cfg.auth ? [cfg.auth.oidc] : [];
return cfg.auth && cfg.auth.oidc ? [cfg.auth.oidc] : [];
},
getAuthType() {