67bfa4b · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Merge pull request #1207 from tarvip/sign-in-fragment-fix

67bfa4bJoel Speed5 years ago

CHANGELOG.md+1

@@ -11,6 +11,7 @@

11- [#1108](https://github.com/oauth2-proxy/oauth2-proxy/pull/1108) Add alternative ways to generate cookie secrets to docs (@JoelSpeed)

12- [#1142](https://github.com/oauth2-proxy/oauth2-proxy/pull/1142) Add pagewriter to upstream proxy (@JoelSpeed)

13- [#1181](https://github.com/oauth2-proxy/oauth2-proxy/pull/1181) Fix incorrect `cfg` name in show-debug-on-error flag (@iTaybb)

14+- [#1207](https://github.com/oauth2-proxy/oauth2-proxy/pull/1207) Fix URI fragment handling on sign-in page, regression introduced in 7.1.0 (@tarvip)

15# V7.1.3

16# V7.1.3

pkg/app/pagewriter/sign_in.html+17−17

@@ -22,23 +22,6 @@

22 text-decoration: underline;

23 }

24 </style>

25−

26− <script>

27− if (window.location.hash) {

28− (function() {

29− var inputs = document.getElementsByName('rd');

30− for (var i = 0; i < inputs.length; i++) {

31− // Add hash, but make sure it is only added once

32− var idx = inputs[i].value.indexOf('#');

33− if (idx >= 0) {

34− // Remove existing hash from URL

35− inputs[i].value = inputs[i].value.substr(0, idx);

36− }

37− inputs[i].value += window.location.hash;

38− }

39− })();

40− }

41− </script>

42 </head>

25 </head>

43 <body class="has-background-light">

26 <body class="has-background-light">

44 <section class="section">

27 <section class="section">

@@ -82,6 +65,23 @@

82 </div>

65 </div>

83 </section>

66 </section>

68+ <script>

69+ if (window.location.hash) {

70+ (function() {

71+ var inputs = document.getElementsByName('rd');

72+ for (var i = 0; i < inputs.length; i++) {

73+ // Add hash, but make sure it is only added once

74+ var idx = inputs[i].value.indexOf('#');

75+ if (idx >= 0) {

76+ // Remove existing hash from URL

77+ inputs[i].value = inputs[i].value.substr(0, idx);

78+ }

79+ inputs[i].value += window.location.hash;

80+ }

81+ })();

82+ }

83+ </script>

84+

85 <footer class="footer has-text-grey has-background-light is-size-7">

86 <div class="content has-text-centered">

87 {{ if eq .Footer "-" }}