Commit 8d2b69d3 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '90-allow-auth-via-pingfed' into 'dev' 

Resolve "Allow auth via Pingfed"

Closes #90

See merge request !69
parents c5ac8767 df8d8f6d

client/src/components/Login/LoginForm.vue

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
                                <span>{{ headerWelcome }}</span>

                            </b-card-header>

                            <b-card-body>

                                <div>

                                <div v-if="!disableInternalLogin">

                                    <!-- standard internal galaxy login -->

                                    <b-form-group :label="labelNameAddress" label-for="login-form-name">

                                        <b-form-input
@@ -121,6 +121,10 @@ export default { 
            type: Boolean,

            default: false,

        },

        disableInternalLogin: {

            type: Boolean,

            default: false,

        },

        enableOidc: {

            type: Boolean,

            default: false,

client/src/components/Login/LoginIndex.vue

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
        <login-form

            v-if="showLogin"

            :allow-user-creation="allowUserCreation"

            :disable-internal-login="disableInternalLogin"

            :enable-oidc="enableOidc"

            :redirect="redirect"

            :registration-warning-message="registrationWarningMessage"
@@ -42,6 +43,10 @@ export default { 
            type: Boolean,

            required: true,

        },

        disableInternalLogin: {

            type: Boolean,

            default: false,

        },

        enableOidc: {

            type: Boolean,

            default: false,

client/src/components/User/ExternalIdentities/ExternalLogin.vue

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ 
                <span v-else>

                    <b-button class="d-block mt-3" @click="submitOIDCLogin(idp)">

                        <i :class="oidc_idps[idp]" />

                        Sign in with

                        {{ idp.charAt(0).toUpperCase() + idp.slice(1) }}

                        Log in with

                        {{ idp_info['alias'] || (idp.charAt(0).toUpperCase() + idp.slice(1)) }}

                    </b-button>

                </span>

            </div>

client/src/entry/analysis/modules/Login.vue

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
            v-else

            :allow-user-creation="config.allow_user_creation"

            :enable-oidc="config.enable_oidc"

            :disable-internal-login="config.disable_internal_login"

            :mailing-join-addr="config.mailing_join_addr"

            :prefer-custos-login="config.prefer_custos_login"

            :redirect="$route.query.redirect"

doc/source/admin/galaxy_options.rst

+8 −0
Original line number Diff line number Diff line
@@ -3573,6 +3573,14 @@ 
:Default: ``false``

:Type: bool



~~~~~~~~~~~~~~~~~~~~~~~~~~~

``disable_internal_login``

~~~~~~~~~~~~~~~~~~~~~~~~~~~



:Description:

    Hides internal Galaxy login form fields.

:Default: ``false``

:Type: bool



~~~~~~~~~~~~~~~~~~~~~~~

``prefer_custos_login``