redash接入mobifun登陆认证

harmy · Jun 27, 2018 · 479db73 · 479db73
1 parent 4994e36
commit 479db73
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 2 deletions.
diff --git a/client/app/assets/images/mobifun_logo.png b/client/app/assets/images/mobifun_logo.png
diff --git a/client/app/pages/settings/organization.html b/client/app/pages/settings/organization.html
@@ -27,6 +27,21 @@ <h3>Authentication</h3>
                 </div>
             </p>
 
+            <p>
+                <label>
+                    <input name="input" type="checkbox" ng-model="$ctrl.settings.auth_mobifun_enabled" ng-change="$ctrl.update('auth_mobifun_enabled')"
+                        accesskey="tab" ng-disabled="$ctrl.disablePasswordLoginToggle()"> Mobifun Account Login Enabled
+                    <span uib-popover="Password login can be disabled only if another login method is enabled." popover-trigger="'mouseenter'"
+                        ng-if="$ctrl.disablePasswordLoginToggle()">
+                        <i class="fa fa-question-circle"></i>
+                    </span>
+                </label>
+
+                <div class="callout callout-warning" ng-if="!$ctrl.settings.auth_mobifun_enabled">
+                    Mobifun account based login is currently disabled and users will be able to login only with the enabled.
+                </div>
+            </p>
+
             <div ng-if="$ctrl.googleLoginEnabled">
                 <h4>Google Login</h4>
                 <label>
@@ -74,4 +89,4 @@ <h4>SAML</h4>
             </p>
         </div>
     </div>
-</settings-screen>
+</settings-screen>
diff --git a/client/app/pages/settings/organization.js b/client/app/pages/settings/organization.js
@@ -27,7 +27,7 @@ function OrganizationSettingsCtrl($http, toastr, clientConfig, Events) {
   this.googleLoginEnabled = clientConfig.googleLoginEnabled;
 
   this.disablePasswordLoginToggle = () =>
-    (clientConfig.googleLoginEnabled || this.settings.auth_saml_enabled) === false;
+    (clientConfig.googleLoginEnabled || this.settings.auth_saml_enabled || this.settings.auth_mobifun_enabled) === false;
 }
 
 export default function init(ngModule) {

diff --git a/redash/handlers/authentication.py b/redash/handlers/authentication.py
@@ -62,6 +62,7 @@ def render_token_login_page(template, org_slug, token):
                            show_google_openid=settings.GOOGLE_OAUTH_ENABLED,
                            google_auth_url=google_auth_url,
                            show_saml_login=current_org.get_setting('auth_saml_enabled'),
+                           show_mobifun_account=current_org.get_setting('auth_mobifun_enabled'),
                            show_remote_user_login=settings.REMOTE_USER_LOGIN_ENABLED,
                            show_ldap_login=settings.LDAP_LOGIN_ENABLED,
                            org_slug=org_slug,
@@ -132,6 +133,7 @@ def login(org_slug=None):
                            next=next_path,
                            email=request.form.get('email', ''),
                            show_google_openid=settings.GOOGLE_OAUTH_ENABLED,
+                           show_mobifun_account=current_org.get_setting('auth_mobifun_enabled'),
                            google_auth_url=google_auth_url,
                            show_password_login=current_org.get_setting('auth_password_login_enabled'),
                            show_saml_login=current_org.get_setting('auth_saml_enabled'),

diff --git a/redash/settings/organization.py b/redash/settings/organization.py
@@ -9,6 +9,7 @@
 
 
 PASSWORD_LOGIN_ENABLED = parse_boolean(os.environ.get("REDASH_PASSWORD_LOGIN_ENABLED", "true"))
+MOBIFUN_LOGIN_ENABLED = parse_boolean(os.environ.get("MOBIFUN_ACCOUNT_LOGIN_ENABLED", "true"))
 
 SAML_METADATA_URL = os.environ.get("REDASH_SAML_METADATA_URL", "")
 SAML_ENTITY_ID = os.environ.get("REDASH_SAML_ENTITY_ID", "")
@@ -18,6 +19,7 @@
 DATE_FORMAT = os.environ.get("REDASH_DATE_FORMAT", "DD/MM/YY")
 
 settings = {
+    "auth_mobifun_enabled": MOBIFUN_LOGIN_ENABLED,
     "auth_password_login_enabled": PASSWORD_LOGIN_ENABLED,
     "auth_saml_enabled": SAML_LOGIN_ENABLED,
     "auth_saml_entity_id": SAML_ENTITY_ID,

diff --git a/redash/templates/invite.html b/redash/templates/invite.html
@@ -28,10 +28,12 @@
       </a>
     {% endif %}
 
+    {% if show_mobifun_account %}
       <a href="/oauth/redash" class="login-button btn btn-default btn-block">
         <img src="/static/images/mobifun_logo.png">
         Login with Mobifun Account
       </a>
+    {% endif %}
 
     {% if show_saml_login %}
       <a href="{{ url_for('saml_auth.sp_initiated', org_slug=org_slug) }}" class="login-button btn btn-default btn-block">SAML Login</a>

diff --git a/redash/templates/login.html b/redash/templates/login.html
@@ -20,10 +20,12 @@
       </a>
     {% endif %}
 
+    {% if show_mobifun_account %}
       <a href="/oauth/redash" class="login-button btn btn-default btn-block">
         <img src="/static/images/mobifun_logo.png">
         Login with Mobifun Account
       </a>
+    {% endif %}
 
     {% if show_saml_login %}
       <a href="{{ url_for('saml_auth.sp_initiated', org_slug=org_slug, next=next) }}" class="login-button btn btn-default btn-block">SAML Login</a>