From 2108f993bf298506f560e320bc5807fd7c935eb0 Mon Sep 17 00:00:00 2001 From: Vazhin Tayeb Date: Mon, 18 Jan 2021 10:22:27 +0300 Subject: [PATCH] Changes https to http --- React/real-estate/package.json | 2 +- React/real-estate/src/services/userService.js | 42 ++++++++++--------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/React/real-estate/package.json b/React/real-estate/package.json index df6161b..6cad834 100644 --- a/React/real-estate/package.json +++ b/React/real-estate/package.json @@ -17,7 +17,7 @@ "tailwindcss": "^2.0.2" }, "scripts": { - "start": "HTTPS=true react-scripts start", + "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject" diff --git a/React/real-estate/src/services/userService.js b/React/real-estate/src/services/userService.js index 58edaf3..c03c5a5 100644 --- a/React/real-estate/src/services/userService.js +++ b/React/real-estate/src/services/userService.js @@ -1,46 +1,48 @@ -import { UserManager } from 'oidc-client'; -import { storeUserError, storeUser } from '../actions/authActions' +import { UserManager } from "oidc-client"; +import { storeUserError, storeUser } from "../actions/authActions"; const config = { - authority: "https://localhost:10000", + authority: "http://localhost:10000", client_id: "traffic-police-react-app", - redirect_uri: "https://localhost:3000/signin-oidc", + redirect_uri: "http://localhost:3000/signin-oidc", response_type: "code", scope: "openid profile traffic-police-api", - post_logout_redirect_uri: "https://localhost:3000/signout-oidc", + post_logout_redirect_uri: "http://localhost:3000/signout-oidc", }; -const userManager = new UserManager(config) +const userManager = new UserManager(config); export async function loadUserFromStorage(store) { try { - let user = await userManager.getUser() - if (!user) { return store.dispatch(storeUserError()) } - store.dispatch(storeUser(user)) + let user = await userManager.getUser(); + if (!user) { + return store.dispatch(storeUserError()); + } + store.dispatch(storeUser(user)); } catch (e) { - console.error(`User not found: ${e}`) - store.dispatch(storeUserError()) + console.error(`User not found: ${e}`); + store.dispatch(storeUserError()); } } export function signinRedirect() { - return userManager.signinRedirect() + return userManager.signinRedirect(); } export function signinRedirectCallback() { - return userManager.signinRedirectCallback() + return userManager.signinRedirectCallback(); } export function signoutRedirect() { - userManager.clearStaleState() - userManager.removeUser() - return userManager.signoutRedirect() + userManager.clearStaleState(); + userManager.removeUser(); + return userManager.signoutRedirect(); } export function signoutRedirectCallback() { - userManager.clearStaleState() - userManager.removeUser() - return userManager.signoutRedirectCallback() + userManager.clearStaleState(); + userManager.removeUser(); + return userManager.signoutRedirectCallback(); } -export default userManager \ No newline at end of file +export default userManager;