core&ui: add login methods to response body (#1165)

Author: renbaoshuo

packages/hydrooj/src/handler/home.ts

@@ -204,6 +204,7 @@ class HomeSecurityHandler extends Handler {
             ])),
             geoipProvider: this.ctx.get('geoip')?.provider,
             relations,
+            loginMethods: this.loginMethods,
         };
     }
 

packages/hydrooj/src/handler/user.ts

@@ -48,7 +48,10 @@ class UserLoginHandler extends Handler {
 
     async get() {
         this.response.template = 'user_login.html';
-        this.response.body.loginMethods = this.loginMethods;
+        this.response.body = {
+            builtInLogin: system.get('server.login'),
+            loginMethods: this.loginMethods,
+        };
     }
 
     @param('uname', Types.Username)

packages/ui-default/templates/home_security.html

@@ -70,7 +70,7 @@ <h1 class="section__title" id="linked-accounts" data-heading>{{ _('Linked Accoun
           <form method="post">
             <input type="hidden" name="operation" value="unlink_account">
             {%- for relation in relations -%}{% if relation.platform != 'mail' %}
-            {% set platform = handler.loginMethods.find(eval("r => r.id === '" + relation.platform + "'")) %}
+            {% set platform = loginMethods.find(eval("r => r.id === '" + relation.platform + "'")) %}
             <li class="platform-list__item">
               <div class="media">
                 {% if platform.icon %}
@@ -88,7 +88,7 @@ <h1 class="section__title" id="linked-accounts" data-heading>{{ _('Linked Accoun
           </form>
           <form method="post">
             <input type="hidden" name="operation" value="link_account">
-            {%- for method in handler.loginMethods -%}
+            {%- for method in loginMethods -%}
               {%- if not relations.some(eval("r => r.platform === '" + method.id + "'")) -%}
               <li class="platform-list__item">
                 <div class="media">

packages/ui-default/templates/partials/login_dialog.html

@@ -40,7 +40,7 @@ <h1 class="dialog--signin__title">{{ _('SIGN IN') }}</h1>
           <input type="submit" value="{{ _('Login') }}" name="login_submit" class="expanded rounded primary button">
         </div></div>
         {% endif %}
-        {%- for v in handler.loginMethods -%}
+        {%- for v in loginMethods -%}
         <div class="row"><div class="columns">
           <a href="{{ url('user_oauth', type=v.id) }}" class="expanded rounded button">{{ _(v.text) }}</a>
         </div></div>

packages/ui-default/templates/user_login.html

@@ -30,7 +30,7 @@ <h1>{{ _('Login') }}</h1>
         </div>
       </div></div>
       {% endif %}
-      {%- for v in handler.loginMethods -%}
+      {%- for v in loginMethods -%}
         <div class="row"><div class="columns">
           <a href="{{ url('user_oauth', type=v.id) }}" class="expanded rounded button inverse">{{ _(v.text) }}</a>
         </div></div>