This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push: new 280e29b Login (#439) 280e29b is described below commit 280e29be8f16bbf86dd2b2c89ecb9244c021ef9b Author: Marat Gubaidullin <marat.gubaidul...@gmail.com> AuthorDate: Mon Aug 1 13:36:03 2022 -0400 Login (#439) --- karavan-app/pom.xml | 2 +- ...onfigurationResource.java => AuthResource.java} | 41 ++++---- .../camel/karavan/api/ConfigurationResource.java | 1 - .../apache/camel/karavan/service/AuthService.java | 61 +++++++++++ .../src/main/resources/application.properties | 3 + karavan-app/src/main/webapp/package-lock.json | 81 +++++++++++++++ karavan-app/src/main/webapp/package.json | 1 + .../src/main/webapp/public/karavan-logo-light.png | Bin 0 -> 23131 bytes karavan-app/src/main/webapp/src/Main.tsx | 45 +++++++-- karavan-app/src/main/webapp/src/MainLogin.tsx | 111 +++++++++++++++++++++ karavan-app/src/main/webapp/src/api/KaravanApi.tsx | 15 ++- karavan-app/src/main/webapp/src/index.css | 4 + karavan-builder/openshift/karavan-secret.yaml | 2 +- 13 files changed, 333 insertions(+), 34 deletions(-) diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml index 18c66f2..3aea04e 100644 --- a/karavan-app/pom.xml +++ b/karavan-app/pom.xml @@ -29,7 +29,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id> <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id> - <quarkus.platform.version>2.10.0.Final</quarkus.platform.version> + <quarkus.platform.version>2.11.1.Final</quarkus.platform.version> <surefire-plugin.version>3.0.0-M5</surefire-plugin.version> <version.camel-kamelet>0.8.1</version.camel-kamelet> <version.camel>3.18.0</version.camel> diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java similarity index 55% copy from karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java copy to karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java index 04f6f75..759bb72 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java @@ -16,40 +16,33 @@ */ package org.apache.camel.karavan.api; -import org.apache.camel.karavan.model.KaravanConfiguration; -import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.apache.camel.karavan.service.AuthService; import javax.inject.Inject; -import javax.ws.rs.GET; +import javax.ws.rs.Consumes; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import java.util.Map; -import java.util.stream.Collectors; - -@Path("/configuration") -public class ConfigurationResource { - - @ConfigProperty(name = "karavan.version") - String version; +@Path("/auth") +public class AuthResource { @Inject - KaravanConfiguration configuration; + AuthService authService; - @GET + @POST @Produces(MediaType.APPLICATION_JSON) - public Response getConfiguration() throws Exception { - return Response.ok( - Map.of( - "version", version, - "environments", configuration.environments().stream() - .filter(e -> e.active()) - .map(e -> e.name()).collect(Collectors.toList()), - "runtime", configuration.runtime() - ) - ).build(); + @Consumes(MediaType.APPLICATION_JSON) + public Response auth(@HeaderParam("Authorization") String basicAuth, @Context HttpHeaders headers) throws Exception { + if (authService.login(basicAuth)){ + return Response.ok().build(); + } else { + return Response.status(Response.Status.UNAUTHORIZED).build(); + } } - } \ No newline at end of file diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java index 04f6f75..8568bba 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java @@ -34,7 +34,6 @@ public class ConfigurationResource { @ConfigProperty(name = "karavan.version") String version; - @Inject KaravanConfiguration configuration; diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java new file mode 100644 index 0000000..8cd82b6 --- /dev/null +++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.karavan.service; + +import io.fabric8.kubernetes.api.model.Secret; +import io.smallrye.mutiny.tuples.Tuple2; +import io.vertx.core.Vertx; +import org.apache.camel.karavan.model.GitConfig; +import org.eclipse.microprofile.config.ConfigProvider; +import org.jboss.logging.Logger; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +@ApplicationScoped +public class AuthService { + + @Inject + Vertx vertx; + + @Inject + KubernetesService kubernetesService; + + private static final Logger LOGGER = Logger.getLogger(AuthService.class.getName()); + + private Tuple2<String, String> getMasterConfig() { + if (kubernetesService.inKubernetes()){ + Secret secret = kubernetesService.getKaravanSecret(); + String username = new String(Base64.getDecoder().decode(secret.getData().get("master-username").getBytes(StandardCharsets.UTF_8))); + String password = new String(Base64.getDecoder().decode(secret.getData().get("master-password").getBytes(StandardCharsets.UTF_8))); + return Tuple2.of(username, password); + } else { + String username = ConfigProvider.getConfig().getValue("karavan.master-username", String.class); + String password = ConfigProvider.getConfig().getValue("karavan.master-password", String.class); + return Tuple2.of(username, password); + } + } + + public boolean login(String basicAuth) { + Tuple2<String, String> master = getMasterConfig(); + String secretToken = new String(Base64.getEncoder().encode((master.getItem1() + ":" + master.getItem2()).getBytes())); + String auth = "Basic " + secretToken; + return auth.equals(basicAuth); + } +} diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties index 808000b..2fbb43a 100644 --- a/karavan-app/src/main/resources/application.properties +++ b/karavan-app/src/main/resources/application.properties @@ -2,6 +2,9 @@ karavan.version=${project.version} karavan.folder.kamelets=kamelets +karavan.master-username=admin +karavan.master-password=karavan + # Git repository Configuration karavan.git-repository=${GIT_REPOSITORY} karavan.git-username=${GIT_USERNAME} diff --git a/karavan-app/src/main/webapp/package-lock.json b/karavan-app/src/main/webapp/package-lock.json index ed941bd..484bf5d 100644 --- a/karavan-app/src/main/webapp/package-lock.json +++ b/karavan-app/src/main/webapp/package-lock.json @@ -17,6 +17,7 @@ "@types/js-yaml": "^4.0.5", "@types/uuid": "^8.3.4", "axios": "^0.25.0", + "buffer": "^6.0.3", "dagre": "^0.8.5", "file-saver": "^2.0.5", "karavan-core": "file:../../../../karavan-core", @@ -5027,6 +5028,25 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", @@ -5192,6 +5212,29 @@ "node-int64": "^0.4.0" } }, + "node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -8656,6 +8699,25 @@ "node": ">=4" } }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", @@ -20575,6 +20637,11 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", @@ -20711,6 +20778,15 @@ "node-int64": "^0.4.0" } }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -23244,6 +23320,11 @@ "harmony-reflect": "^1.4.6" } }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + }, "ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", diff --git a/karavan-app/src/main/webapp/package.json b/karavan-app/src/main/webapp/package.json index 1e64f4a..3c53917 100644 --- a/karavan-app/src/main/webapp/package.json +++ b/karavan-app/src/main/webapp/package.json @@ -36,6 +36,7 @@ "@types/js-yaml": "^4.0.5", "@types/uuid": "^8.3.4", "axios": "^0.25.0", + "buffer": "^6.0.3", "dagre": "^0.8.5", "file-saver": "^2.0.5", "karavan-core": "file:../../../../karavan-core", diff --git a/karavan-app/src/main/webapp/public/karavan-logo-light.png b/karavan-app/src/main/webapp/public/karavan-logo-light.png new file mode 100644 index 0000000..a80c02e Binary files /dev/null and b/karavan-app/src/main/webapp/public/karavan-logo-light.png differ diff --git a/karavan-app/src/main/webapp/src/Main.tsx b/karavan-app/src/main/webapp/src/Main.tsx index 89c0ec8..6f11935 100644 --- a/karavan-app/src/main/webapp/src/Main.tsx +++ b/karavan-app/src/main/webapp/src/Main.tsx @@ -32,6 +32,8 @@ import KameletsIcon from "@patternfly/react-icons/dist/js/icons/registry-icon"; import EipIcon from "@patternfly/react-icons/dist/js/icons/topology-icon"; import ComponentsIcon from "@patternfly/react-icons/dist/js/icons/module-icon"; import ConfigurationIcon from "@patternfly/react-icons/dist/js/icons/cogs-icon"; +import {MainLogin} from "./MainLogin"; +import {AxiosResponse} from "axios"; class ToastMessage { id: string = '' @@ -72,8 +74,10 @@ interface State { projectToDelete?: Project, openapi: string, alerts: ToastMessage[], - request: string - filename: string + request: string, + filename: string, + key: string, + isAuthorized: boolean } export class Main extends React.Component<Props, State> { @@ -87,7 +91,9 @@ export class Main extends React.Component<Props, State> { alerts: [], request: uuidv4(), openapi: '', - filename: '' + filename: '', + isAuthorized: false, + key: '' }; designer = React.createRef(); @@ -98,6 +104,12 @@ export class Main extends React.Component<Props, State> { config: config }) }); + if (this.state.isAuthorized) { + this.getData(); + } + } + + getData() { KaravanApi.getKameletNames(names => names.forEach(name => { KaravanApi.getKamelet(name, yaml => KameletApi.saveKamelet(yaml)) })); @@ -199,7 +211,7 @@ export class Main extends React.Component<Props, State> { }); }; - onGetProjects() { + onGetProjects = () => { KaravanApi.getProjects((projects: Project[]) => { this.setState({ projects: projects, request: uuidv4() @@ -207,9 +219,20 @@ export class Main extends React.Component<Props, State> { }); } - render() { + onLogin = (username: string, password: string) => { + KaravanApi.auth(username, password, (res: any) => { + if (res?.status === 200) { + this.setState({isAuthorized: true}); + this.getData(); + } else { + this.toast("Error", "Incorrect username and/or password!", "danger"); + } + }); + } + + getMain() { return ( - <Page className="karavan"> + <div> <Flex direction={{default:"row"}} style={{width: "100%", height:"100%"}} alignItems={{default:"alignItemsStretch"}} spaceItems={{ default: 'spaceItemsNone' }}> <FlexItem> {this.pageNav()} @@ -245,6 +268,16 @@ export class Main extends React.Component<Props, State> { onEscapePress={e => this.setState({isModalOpen: false})}> <div>{"Are you sure you want to delete the project " + this.state.projectToDelete?.projectId + "?"}</div> </Modal> + </div> + ) + } + + render() { + const {isAuthorized} = this.state; + return ( + <Page className="karavan"> + {isAuthorized && this.getMain()} + {!isAuthorized && <MainLogin config={this.state.config} onLogin={this.onLogin}/>} {this.state.alerts.map((e: ToastMessage) => ( <Alert key={e.id} className="main-alert" variant={e.variant} title={e.title} timeout={e.variant === "success" ? 1000 : 2000} diff --git a/karavan-app/src/main/webapp/src/MainLogin.tsx b/karavan-app/src/main/webapp/src/MainLogin.tsx new file mode 100644 index 0000000..b457b0f --- /dev/null +++ b/karavan-app/src/main/webapp/src/MainLogin.tsx @@ -0,0 +1,111 @@ +import React from 'react'; +import { + Bullseye, Card, CardBody, CardFooter, CardTitle, + LoginForm, + LoginMainFooterBandItem, + LoginMainFooterLinksItem, + LoginPage, Text +} from '@patternfly/react-core'; +import {Project} from "./models/ProjectModels"; + +interface Props { + config: any, + onLogin: (username: string, password: string) => void +} + +interface State { + username: string, + password: string, + isValidUsername: boolean, + isValidPassword: boolean, + isRememberMeChecked: boolean, +} + +export class MainLogin extends React.Component<Props, State> { + public state: State = { + username: "", + password: "", + isValidUsername: true, + isValidPassword: true, + isRememberMeChecked: false, + } + + onLoginButtonClick = (event: any) => { + event.preventDefault(); + this.props.onLogin?.call(this, this.state.username, this.state.password); + } + + render() { + const socialMediaLoginContent = ( + <React.Fragment> + <LoginMainFooterLinksItem href="#" linkComponentProps={{ 'aria-label': 'Login with Google' }}> + <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 488 512"> + <path d="M488 261.8C488 403.3 391.1 504 248 504 110.8 504 0 393.2 0 256S110.8 8 248 8c66.8 0 123 24.5 166.3 64.9l-67.5 64.9C258.5 52.6 94.3 116.6 94.3 256c0 86.5 69.1 156.6 153.7 156.6 98.2 0 135-70.4 140.8-106.9H248v-85.3h236.1c2.3 12.7 3.9 24.9 3.9 41.4z" /> + </svg> + </LoginMainFooterLinksItem> + <LoginMainFooterLinksItem href="#" linkComponentProps={{ 'aria-label': 'Login with Github' }}> + <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"> + <path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15 [...] + </svg> + </LoginMainFooterLinksItem> + <LoginMainFooterLinksItem href="#" linkComponentProps={{ 'aria-label': 'Login with Dropbox' }}> + <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 528 512"> + <path d="M264.4 116.3l-132 84.3 132 84.3-132 84.3L0 284.1l132.3-84.3L0 116.3 132.3 32l132.1 84.3zM131.6 395.7l132-84.3 132 84.3-132 84.3-132-84.3zm132.8-111.6l132-84.3-132-83.6L395.7 32 528 116.3l-132.3 84.3L528 284.8l-132.3 84.3-131.3-85z" /> + </svg> + </LoginMainFooterLinksItem> + <LoginMainFooterLinksItem href="#" linkComponentProps={{ 'aria-label': 'Login with Facebook' }}> + <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"> + <path d="M448 56.7v398.5c0 13.7-11.1 24.7-24.7 24.7H309.1V306.5h58.2l8.7-67.6h-67v-43.2c0-19.6 5.4-32.9 33.5-32.9h35.8v-60.5c-6.2-.8-27.4-2.7-52.2-2.7-51.6 0-87 31.5-87 89.4v49.9h-58.4v67.6h58.4V480H24.7C11.1 480 0 468.9 0 455.3V56.7C0 43.1 11.1 32 24.7 32h398.5c13.7 0 24.8 11.1 24.8 24.7z" /> + </svg> + </LoginMainFooterLinksItem> + <LoginMainFooterLinksItem href="#" linkComponentProps={{ 'aria-label': 'Login with Gitlab' }}> + <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"> + <path d="M29.782 199.732L256 493.714 8.074 309.699c-6.856-5.142-9.712-13.996-7.141-21.993l28.849-87.974zm75.405-174.806c-3.142-8.854-15.709-8.854-18.851 0L29.782 199.732h131.961L105.187 24.926zm56.556 174.806L256 493.714l94.257-293.982H161.743zm349.324 87.974l-28.849-87.974L256 493.714l247.926-184.015c6.855-5.142 9.711-13.996 7.141-21.993zm-85.404-262.78c-3.142-8.854-15.709-8.854-18.851 0l-56.555 174.806h131.961L425.663 24.926z" /> + </svg> + </LoginMainFooterLinksItem> + </React.Fragment> + ); + + const signUpForAccountMessage = ( + <LoginMainFooterBandItem> + Need an account? <a href="#">Sign up.</a> + </LoginMainFooterBandItem> + ); + const forgotCredentials = ( + <LoginMainFooterBandItem> + <a href="#">Forgot username or password?</a> + </LoginMainFooterBandItem> + ); + + return ( + <Bullseye> + <Card isFlat isCompact> + <CardTitle> + <img src="karavan-logo-light.png" className="login-logo"/> + <Text component="h3" style={{width:"fit-content", marginLeft:"auto"}}>{this.props.config.version}</Text> + </CardTitle> + <CardBody> + <LoginForm + showHelperText={true} + usernameLabel="Username" + usernameValue={this.state.username} + onChangeUsername={value => this.setState({username: value})} + isValidUsername={this.state.isValidUsername} + passwordLabel="Password" + passwordValue={this.state.password} + isShowPasswordEnabled + onChangePassword={value => this.setState({password: value})} + isValidPassword={this.state.isValidPassword} + onLoginButtonClick={this.onLoginButtonClick} + loginButtonLabel="Log in" + /> + </CardBody> + <CardFooter> + {signUpForAccountMessage} + {forgotCredentials} + </CardFooter> + </Card> + </Bullseye> + ); + } +} \ No newline at end of file diff --git a/karavan-app/src/main/webapp/src/api/KaravanApi.tsx b/karavan-app/src/main/webapp/src/api/KaravanApi.tsx index 7a2e172..09bb9c5 100644 --- a/karavan-app/src/main/webapp/src/api/KaravanApi.tsx +++ b/karavan-app/src/main/webapp/src/api/KaravanApi.tsx @@ -1,5 +1,6 @@ import axios, {AxiosResponse} from "axios"; import {Project, ProjectFile, ProjectStatus} from "../models/ProjectModels"; +import { Buffer } from 'buffer'; export const KaravanApi = { @@ -301,7 +302,19 @@ export const KaravanApi = { .then(res => { after(res); }).catch(err => { - after(err); + after(err); + }); + }, + + auth: async (username: string, password: string, after: (res: any) => void) => { + const token = username + ":" + password; + const basicAuth = "Basic " + Buffer.from(token).toString('base64'); + axios.post('/auth/', "", + {headers: {Accept: 'application/json', "Content-Type": 'application/json', Authorization: basicAuth }}) + .then(res => { + after(res); + }).catch(err => { + after(err.response); }); }, } \ No newline at end of file diff --git a/karavan-app/src/main/webapp/src/index.css b/karavan-app/src/main/webapp/src/index.css index 12b14e9..fc76799 100644 --- a/karavan-app/src/main/webapp/src/index.css +++ b/karavan-app/src/main/webapp/src/index.css @@ -14,6 +14,10 @@ overflow: hidden; } +.karavan .login-logo { + width: 300px; +} + .logo, .logo svg { height: 48px; diff --git a/karavan-builder/openshift/karavan-secret.yaml b/karavan-builder/openshift/karavan-secret.yaml index ac5a3a6..c7d7333 100644 --- a/karavan-builder/openshift/karavan-secret.yaml +++ b/karavan-builder/openshift/karavan-secret.yaml @@ -4,7 +4,7 @@ metadata: name: karavan type: Opaque stringData: - master-user: admin + master-username: admin master-password: karavan git-repository: https://github.com/mgubaidullin/karavan-demo.git git-password: demo