Commit 9717f7ee authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

add pingfed login, update login form

parent 1440d96b

client/src/components/Login/LoginForm.vue

+6 −2
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,
@@ -158,7 +162,7 @@ export default { 
            url: null,

            messageText: null,

            messageVariant: null,

            headerWelcome: _l("Welcome to Galaxy, please log in"),

            headerWelcome: _l("Welcome to Galaxy, please sign in"),

            labelNameAddress: _l("Public Name or Email Address"),

            labelPassword: _l("Password"),

            confirmURL: urlParams.has("confirm") && urlParams.get("confirm") == "true",

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

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
                    <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) }}

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

                    </b-button>

                </span>

            </div>

client/src/entry/analysis/modules/Login.test.js

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ jest.mock("app/singleton"); 
const mockGalaxy = {

    config: {

        allow_user_creation: true,

        disable_internal_login: false,

        enable_oidc: true,

        mailing_join_addr: "mailing_join_addr",

        prefer_custos_login: true,
@@ -43,6 +44,7 @@ describe("Login", () => { 
        expect(attributes.redirect).toBe("redirect_url");

        expect(attributes.allowusercreation).toBe("true");

        expect(attributes.sessioncsrftoken).toBe("session_csrf_token");

        expect(attributes.disable_internal_login).toBe("false");

        expect(attributes.enableoidc).toBe("true");

        expect(attributes.mailingjoinaddr).toBe("mailing_join_addr");

        expect(attributes.prefercustoslogin).toBe("true");

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"