Merge branch 'feature/env' into 'dev'

env variables, removed cancel button while importing

See merge request spatial/postamates_frontend!71
dev
Anton Vlasov 2 years ago
commit 0dbd310b74

@ -1 +1,4 @@
VITE_API_URL=https://postnet.dev.selftech.ru VITE_API_URL=https://postnet.dev.selftech.ru
VITE_KEYCLOAK_CLIENT_ID=postnet
VITE_KEYCLOAK_CLIENT_SECRET=K2yHweEUispkVeWn03VMk843sW2Moic5
VITE_KEYCLOAK_URL=https://kk.dev.selftech.ru/

@ -68,6 +68,16 @@ export const PointsFileUploadModal = ({onClose, isOpened}) => {
Просмотреть отчет Просмотреть отчет
</Button> </Button>
] ]
if (isImporting) return [
<Button
key="ok-button"
type="primary"
onClick={() => onImportPoints()}
disabled={!fileId || isImporting}
>
Импортировать
</Button>,
]
return [ return [
<Button <Button
key="close-button" key="close-button"

@ -11,14 +11,18 @@ export const setAuth = action(isAuthorized$, "setAuth", (store, newValue) => {
}); });
export const refreshToken = () => { export const refreshToken = () => {
const url = import.meta.env.VITE_KEYCLOAK_URL || 'https://kk.dev.selftech.ru/';
const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID || 'postnet';
const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET || 'K2yHweEUispkVeWn03VMk843sW2Moic5';
return api.request({ return api.request({
url: "/realms/SST/protocol/openid-connect/token", url: "/realms/SST/protocol/openid-connect/token",
baseURL: "https://kk.dev.selftech.ru/", baseURL: url,
method: "POST", method: "POST",
data: { data: {
grant_type: "refresh_token", grant_type: "refresh_token",
client_id: "postnet", client_id: clientId,
client_secret: "K2yHweEUispkVeWn03VMk843sW2Moic5", client_secret: clientSecret,
token_type: "bearer", token_type: "bearer",
refresh_token: localStorage.getItem("refresh_token") refresh_token: localStorage.getItem("refresh_token")
}, },

@ -31,15 +31,19 @@ export async function signin(values) {
signinLoading$.set(true); signinLoading$.set(true);
signinError$.set(""); signinError$.set("");
const url = import.meta.env.VITE_KEYCLOAK_URL || 'https://kk.dev.selftech.ru/';
const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID || 'postnet';
const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET || 'K2yHweEUispkVeWn03VMk843sW2Moic5';
const auth = () => { const auth = () => {
return api.request({ return api.request({
url: "/realms/SST/protocol/openid-connect/token", url: "/realms/SST/protocol/openid-connect/token",
baseURL: "https://kk.dev.selftech.ru/", baseURL: url,
method: "POST", method: "POST",
data: { data: {
"grant_type": "password", "grant_type": "password",
client_id: "postnet", client_id: clientId,
client_secret: "K2yHweEUispkVeWn03VMk843sW2Moic5", client_secret: clientSecret,
username: values.login, username: values.login,
password: values.password, password: values.password,
}, },

Loading…
Cancel
Save