add OIDC login buttons

blackav · Jun 3, 2024 · 5990258 · 5990258
1 parent d9054a3
commit 5990258
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/csp/contests/reg_login_page.csp b/csp/contests/reg_login_page.csp
@@ -118,6 +118,10 @@
  <s:param name="contest_id" value="phr->contest_id" />
  <s:param name="provider" value='"yandex"' />
 </s:url>
+<s:url name="LoginWithOIDCUrl" script="client" ac="'oauth-login-1'">
+ <s:param name="contest_id" value="phr->contest_id" />
+ <s:param name="provider" value='"oidc"' />
+</s:url>
 <p>
 <%
  if (oauth_is_available_num(phr->config, 1)) {
@@ -133,6 +137,11 @@
  if (oauth_is_available_num(phr->config, 3)) {
 %>
 <s:a url="LoginWithYandexUrl"><img src="<s:config name="style-prefix" />icons/yandex-logo.png" alt="yandex auth"></img></s:a>
+<%
+ }
+ if (oauth_is_available_num(phr->config, 4)) {
+%>
+<s:a url="LoginWithOIDCUrl"><img src="<s:config name="style-prefix" />icons/oidc-logo.svg" alt="OIDC auth" height="46px"></img></s:a>
 <%
  }
 %>

diff --git a/csp/contests/unpriv_login_page.csp b/csp/contests/unpriv_login_page.csp
@@ -143,6 +143,10 @@
  <s:param name="contest_id" value="phr->contest_id" />
  <s:param name="provider" value='"yandex"' />
 </s:url>
+<s:url name="LoginWithOIDCUrl" ac="oauth-login-1">
+ <s:param name="contest_id" value="phr->contest_id" />
+ <s:param name="provider" value='"oidc"' />
+</s:url>
 <p>
 <%
  if (oauth_is_available_num(phr->config, 1)) {
@@ -158,6 +162,11 @@
  if (oauth_is_available_num(phr->config, 3)) {
 %>
 <s:a url="LoginWithYandexUrl"><img src="<s:config name="style-prefix" />icons/yandex-logo.png" alt="yandex auth"></img></s:a>
+<%
+ }
+ if (oauth_is_available_num(phr->config, 4)) {
+%>
+<s:a url="LoginWithOIDCUrl"><img src="<s:config name="style-prefix" />icons/oidc-logo.svg" alt="OIDC auth" height="46px"></img></s:a>
 <%
  }
 %>

diff --git a/csp/super-server/login_page.csp b/csp/super-server/login_page.csp
@@ -55,6 +55,14 @@ is_configured(
  <s:param name="role" value='"admin"' />
  <s:param name="provider" value='"vk"' />
 </s:url>
+<s:url name="LoginWithYandexUrl" script="client" ac="'oauth-login-1'">
+ <s:param name="role" value='"admin"' />
+ <s:param name="provider" value='"yandex"' />
+</s:url>
+<s:url name="LoginWithOIDCUrl" script="client" ac="'oauth-login-1'">
+ <s:param name="role" value='"admin"' />
+ <s:param name="provider" value='"oidc"' />
+</s:url>
 <p>
 <%
  if (is_configured(phr->config, "google")) {
@@ -65,6 +73,16 @@ is_configured(
  if (is_configured(phr->config, "vk")) {
 %>
 <s:a url="LoginWithVKUrl"><img src="<s:config name="style-prefix" />icons/vk-logo.jpeg" alt="vk auth" width="46"></img></s:a>
+<%
+ }
+ if (is_configured(phr->config, "yandex")) {
+%>
+<s:a url="LoginWithYandexUrl"><img src="<s:config name="style-prefix" />icons/yandex-logo.png" alt="yandex auth"></img></s:a>
+<%
+ }
+ if (is_configured(phr->config, "oidc")) {
+%>
+<s:a url="LoginWithOIDCUrl"><img src="<s:config name="style-prefix" />icons/oidc-logo.svg" alt="OIDC auth" width="46"></img></s:a>
 <%
  }
 %>

diff --git a/style/icons/oidc-logo.svg b/style/icons/oidc-logo.svg