Skip to content

Auth #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 92 commits into from
Mar 15, 2016
Merged

Auth #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
966fe28
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
86a7a85
Put authorizations into popup
bodnia Feb 23, 2016
5ad8006
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
10fa38a
Put authorizations into popup
bodnia Feb 23, 2016
00aec33
Merge remote-tracking branch 'origin/auth' into auth
bodnia Feb 23, 2016
253b56b
Fixed lint warnings
bodnia Feb 23, 2016
cd4715e
Ran gulp
bodnia Feb 23, 2016
6356878
[auth] Fixed applying api key
bodnia Feb 24, 2016
1354edb
[auth] Added logout button
bodnia Feb 24, 2016
8313f68
[auth] Added logout for auth with apiKey and basic auth
bodnia Mar 1, 2016
c803774
[auth] Added reload after logout
bodnia Mar 1, 2016
53a23a6
[auth] fix Set petstore spec as default
bodnia Mar 1, 2016
15747f5
[auth] moved logout buttons into authentication view
bodnia Mar 3, 2016
f0d0bfe
[auth] renamed AuthView to AuthButtonView
bodnia Mar 3, 2016
2f1f9f7
[auth] Added api key and basic authorization
bodnia Mar 4, 2016
fc67ae1
[auth] fixed base spec url
bodnia Mar 4, 2016
bc030fb
[auth] fixed base spec url run gulp
bodnia Mar 4, 2016
b9c4352
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
9894299
Put authorizations into popup
bodnia Feb 23, 2016
de828f8
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
99eec85
Put authorizations into popup
bodnia Feb 23, 2016
4129d8c
Fixed lint warnings
bodnia Feb 23, 2016
aa4a6a9
Ran gulp
bodnia Feb 23, 2016
e44a14b
[auth] Fixed applying api key
bodnia Feb 24, 2016
5f64b49
[auth] Added logout button
bodnia Feb 24, 2016
ec3e5ca
[auth] Added logout for auth with apiKey and basic auth
bodnia Mar 1, 2016
10bb5d4
[auth] Added reload after logout
bodnia Mar 1, 2016
b076c22
[auth] fix Set petstore spec as default
bodnia Mar 1, 2016
8edf67c
[auth] moved logout buttons into authentication view
bodnia Mar 3, 2016
07a427c
[auth] renamed AuthView to AuthButtonView
bodnia Mar 3, 2016
56d5b8d
[auth] Added api key and basic authorization
bodnia Mar 4, 2016
a4f98a5
[auth] fixed base spec url
bodnia Mar 4, 2016
8b6265b
[auth] fixed base spec url run gulp
bodnia Mar 4, 2016
9b85437
[auth] run gulp
bodnia Mar 4, 2016
54f2bc0
Merge remote-tracking branch 'origin/auth' into auth
bodnia Mar 4, 2016
1779838
[auth] run gulp
bodnia Mar 4, 2016
86e3852
[auth] moved authorizations into the header
bodnia Mar 7, 2016
f4c281b
[auth] parsing authentications from definitions
bodnia Mar 7, 2016
b9b1bd4
[auth] added support of oauth2 in security popup
bodnia Mar 7, 2016
337b9bc
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
ff318ad
Put authorizations into popup
bodnia Feb 23, 2016
59c6eec
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
a303579
Put authorizations into popup
bodnia Feb 23, 2016
8af3a50
Fixed lint warnings
bodnia Feb 23, 2016
56e048a
Ran gulp
bodnia Feb 23, 2016
85df0f7
[auth] Fixed applying api key
bodnia Feb 24, 2016
8280cc6
[auth] Added logout button
bodnia Feb 24, 2016
67881fb
[auth] Added logout for auth with apiKey and basic auth
bodnia Mar 1, 2016
7dac0e9
[auth] Added reload after logout
bodnia Mar 1, 2016
e405c42
[auth] fix Set petstore spec as default
bodnia Mar 1, 2016
2199a81
[auth] moved logout buttons into authentication view
bodnia Mar 3, 2016
4fdc174
[auth] renamed AuthView to AuthButtonView
bodnia Mar 3, 2016
a268d00
[auth] Added api key and basic authorization
bodnia Mar 4, 2016
18b8a7c
[auth] fixed base spec url
bodnia Mar 4, 2016
3f92a21
[auth] fixed base spec url run gulp
bodnia Mar 4, 2016
40d3161
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
9207be7
Put authorizations into popup
bodnia Feb 23, 2016
7a3198a
[auth]: Api key, basic authorization in main view
bodnia Feb 17, 2016
eefc78d
Put authorizations into popup
bodnia Feb 23, 2016
f9b8567
Fixed lint warnings
bodnia Feb 23, 2016
3b24602
Ran gulp
bodnia Feb 23, 2016
0644f76
[auth] Fixed applying api key
bodnia Feb 24, 2016
a505366
[auth] Added logout button
bodnia Feb 24, 2016
e957ff8
[auth] Added logout for auth with apiKey and basic auth
bodnia Mar 1, 2016
379440f
[auth] Added reload after logout
bodnia Mar 1, 2016
491802a
[auth] fix Set petstore spec as default
bodnia Mar 1, 2016
1861ac2
[auth] moved logout buttons into authentication view
bodnia Mar 3, 2016
0e698af
[auth] renamed AuthView to AuthButtonView
bodnia Mar 3, 2016
42be315
[auth] Added api key and basic authorization
bodnia Mar 4, 2016
0934129
[auth] fixed base spec url
bodnia Mar 4, 2016
5f3cf58
[auth] fixed base spec url run gulp
bodnia Mar 4, 2016
91c1b2c
[auth] run gulp
bodnia Mar 4, 2016
23332b1
[auth] moved authorizations into the header
bodnia Mar 7, 2016
d2b94d5
[auth] parsing authentications from definitions
bodnia Mar 7, 2016
4a49b78
[auth] added support of oauth2 in security popup
bodnia Mar 7, 2016
a5046a1
Merge remote-tracking branch 'origin/auth' into auth
bodnia Mar 7, 2016
e7d5ad6
[auth] Added display of oauth2
bodnia Mar 8, 2016
c3d4bcc
[auth] moved logic for auths collections into AuthsCollection
bodnia Mar 9, 2016
e08b7be
[auth] added handling of oauth2 login
bodnia Mar 9, 2016
1e38c89
[auth] UI changes
bodnia Mar 11, 2016
0f77177
[auth] UI changes
bodnia Mar 12, 2016
e90a72a
[auth] created auth collection view
bodnia Mar 13, 2016
fe9a497
[auth] moved parse method into collection
bodnia Mar 13, 2016
0852d70
[auth] change show auth popup button depending on logged in auth
bodnia Mar 13, 2016
56c5294
[auth] Authorize with oauth2
bodnia Mar 13, 2016
5bcd5cc
updated swagger-client
fehguy Mar 9, 2016
1f7dbe4
[auth] ran gulp
bodnia Mar 13, 2016
ab411cb
[auth] show securityDefinitions when clicking on authorize in header
bodnia Mar 15, 2016
dfd9b10
[auth] fixed display of scopes in auth button, added highlight of emp…
bodnia Mar 15, 2016
1385bcf
updated swagger-client
fehguy Mar 9, 2016
dcd7653
updated to swagger-js master
fehguy Mar 15, 2016
a7a9c5f
[auth] ran gulp
bodnia Mar 15, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 111 additions & 2 deletions dist/css/print.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
.swagger-section .swagger-ui-wrap {
line-height: 1;
font-family: "Droid Sans", sans-serif;
min-width: 760px;
max-width: 960px;
margin-left: auto;
margin-right: auto;
Expand Down Expand Up @@ -1180,18 +1181,122 @@
}
.swagger-section .oauth_submit {
text-align: center;
display: inline-block;
}
.swagger-section .authorize-wrapper {
margin: 15px 0 10px;
}
.swagger-section .authorize-wrapper_operation {
float: right;
}
.swagger-section .authorize__btn:hover {
text-decoration: underline;
cursor: pointer;
}
.swagger-section .authorize__btn_operation:hover .authorize-scopes {
display: block;
}
.swagger-section .authorize-scopes {
position: absolute;
margin-top: 20px;
background: #FFF;
border: 1px solid #ccc;
border-radius: 5px;
display: none;
font-size: 13px;
max-width: 300px;
line-height: 30px;
color: black;
padding: 5px;
}
.swagger-section .authorize-scopes .authorize__scope {
text-decoration: none;
}
.swagger-section .authorize__btn_operation {
height: 18px;
vertical-align: middle;
display: inline-block;
background: url(../images/explorer_icons.png) no-repeat;
}
.swagger-section .authorize__btn_operation_login {
background-position: 0 0;
width: 18px;
margin-top: -6px;
margin-left: 4px;
}
.swagger-section .authorize__btn_operation_logout {
background-position: -30px 0;
width: 18px;
margin-top: -6px;
margin-left: 4px;
}
.swagger-section #auth_container {
color: #fff;
display: inline-block;
border: none;
padding: 5px;
width: 87px;
height: 13px;
}
.swagger-section #auth_container .authorize__btn {
color: #fff;
}
.swagger-section .auth_container {
padding: 0 0 10px;
margin-bottom: 5px;
border-bottom: solid 1px #CCC;
font-size: 0.9em;
}
.swagger-section .auth_container .auth__title {
color: #547f00;
font-size: 1.2em;
}
.swagger-section .auth_container .basic_auth__label {
display: inline-block;
width: 60px;
}
.swagger-section .auth_container .auth__description {
color: #999999;
margin-bottom: 5px;
}
.swagger-section .auth_container .auth__button {
margin-top: 10px;
height: 30px;
}
.swagger-section .auth_container .key_auth__field {
margin: 5px 0;
}
.swagger-section .auth_container .key_auth__label {
display: inline-block;
width: 60px;
}
.swagger-section .api-popup-dialog {
z-index: 10000;
position: absolute;
display: none;
}
.swagger-section .api-popup-dialog-wrapper {
z-index: 1000;
width: 500px;
background: #FFF;
padding: 20px;
border: 1px solid #ccc;
border-radius: 5px;
display: none;
font-size: 13px;
color: #777;
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.swagger-section .api-popup-dialog-shadow {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
opacity: 0.2;
background-color: gray;
z-index: 900;
}
.swagger-section .api-popup-dialog .api-popup-title {
font-size: 24px;
Expand All @@ -1205,6 +1310,10 @@
padding-left: 5px;
padding-bottom: 5px;
}
.swagger-section .api-popup-dialog .api-popup-content {
max-height: 500px;
overflow-y: auto;
}
.swagger-section .api-popup-dialog .api-popup-authbtn {
height: 30px;
}
Expand Down
141 changes: 132 additions & 9 deletions dist/css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
.swagger-section .swagger-ui-wrap {
line-height: 1;
font-family: "Droid Sans", sans-serif;
min-width: 760px;
max-width: 960px;
margin-left: auto;
margin-right: auto;
Expand Down Expand Up @@ -1180,18 +1181,122 @@
}
.swagger-section .oauth_submit {
text-align: center;
display: inline-block;
}
.swagger-section .authorize-wrapper {
margin: 15px 0 10px;
}
.swagger-section .authorize-wrapper_operation {
float: right;
}
.swagger-section .authorize__btn:hover {
text-decoration: underline;
cursor: pointer;
}
.swagger-section .authorize__btn_operation:hover .authorize-scopes {
display: block;
}
.swagger-section .authorize-scopes {
position: absolute;
margin-top: 20px;
background: #FFF;
border: 1px solid #ccc;
border-radius: 5px;
display: none;
font-size: 13px;
max-width: 300px;
line-height: 30px;
color: black;
padding: 5px;
}
.swagger-section .authorize-scopes .authorize__scope {
text-decoration: none;
}
.swagger-section .authorize__btn_operation {
height: 18px;
vertical-align: middle;
display: inline-block;
background: url(../images/explorer_icons.png) no-repeat;
}
.swagger-section .authorize__btn_operation_login {
background-position: 0 0;
width: 18px;
margin-top: -6px;
margin-left: 4px;
}
.swagger-section .authorize__btn_operation_logout {
background-position: -30px 0;
width: 18px;
margin-top: -6px;
margin-left: 4px;
}
.swagger-section #auth_container {
color: #fff;
display: inline-block;
border: none;
padding: 5px;
width: 87px;
height: 13px;
}
.swagger-section #auth_container .authorize__btn {
color: #fff;
}
.swagger-section .auth_container {
padding: 0 0 10px;
margin-bottom: 5px;
border-bottom: solid 1px #CCC;
font-size: 0.9em;
}
.swagger-section .auth_container .auth__title {
color: #547f00;
font-size: 1.2em;
}
.swagger-section .auth_container .basic_auth__label {
display: inline-block;
width: 60px;
}
.swagger-section .auth_container .auth__description {
color: #999999;
margin-bottom: 5px;
}
.swagger-section .auth_container .auth__button {
margin-top: 10px;
height: 30px;
}
.swagger-section .auth_container .key_auth__field {
margin: 5px 0;
}
.swagger-section .auth_container .key_auth__label {
display: inline-block;
width: 60px;
}
.swagger-section .api-popup-dialog {
z-index: 10000;
position: absolute;
display: none;
}
.swagger-section .api-popup-dialog-wrapper {
z-index: 1000;
width: 500px;
background: #FFF;
padding: 20px;
border: 1px solid #ccc;
border-radius: 5px;
display: none;
font-size: 13px;
color: #777;
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.swagger-section .api-popup-dialog-shadow {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
opacity: 0.2;
background-color: gray;
z-index: 900;
}
.swagger-section .api-popup-dialog .api-popup-title {
font-size: 24px;
Expand All @@ -1205,6 +1310,10 @@
padding-left: 5px;
padding-bottom: 5px;
}
.swagger-section .api-popup-dialog .api-popup-content {
max-height: 500px;
overflow-y: auto;
}
.swagger-section .api-popup-dialog .api-popup-authbtn {
height: 30px;
}
Expand Down Expand Up @@ -1297,7 +1406,9 @@
}
.swagger-section #header {
background-color: #89bf04;
padding: 14px;
padding: 9px 14px 19px 14px;
height: 23px;
min-width: 775px;
}
.swagger-section #input_baseUrl {
width: 400px;
Expand All @@ -1308,9 +1419,8 @@
float: right;
}
.swagger-section #api_selector .input {
display: block;
display: inline-block;
clear: none;
float: left;
margin: 0 10px 0 0;
}
.swagger-section #api_selector input {
Expand All @@ -1321,7 +1431,8 @@
.swagger-section #input_apiKey {
width: 200px;
}
.swagger-section #explore {
.swagger-section #explore,
.swagger-section #auth_container .authorize__btn {
display: block;
text-decoration: none;
font-weight: bold;
Expand All @@ -1336,17 +1447,25 @@
-khtml-border-radius: 4px;
border-radius: 4px;
}
.swagger-section #explore:hover {
.swagger-section #explore:hover,
.swagger-section #auth_container .authorize__btn:hover {
background-color: #547f00;
}
.swagger-section #header #logo {
font-size: 1.5em;
font-weight: bold;
text-decoration: none;
background: transparent url(../images/logo_small.png) no-repeat left center;
padding: 20px 0 20px 40px;
color: white;
}
.swagger-section #header #logo .logo__img {
display: block;
float: left;
margin-top: 2px;
}
.swagger-section #header #logo .logo__title {
display: inline-block;
padding: 5px 0 0 10px;
}
.swagger-section #content_message {
margin: 10px 15px;
font-style: italic;
Expand All @@ -1363,3 +1482,7 @@
.swagger-section .swagger-expand:before {
content: "+";
}
.swagger-section .error {
outline-color: #cc0000;
background-color: #f2dede;
}
Loading