fix(#602): add redirect param for change password

andreidekterev 3 years ago
parent 3da2adc735
commit 0b16d4f9ab
  1. 1
      src/config/clients/facr.tsx
  2. 1
      src/config/clients/fqtv.tsx
  3. 1
      src/config/clients/india.tsx
  4. 1
      src/config/clients/insports.tsx
  5. 1
      src/config/clients/instat.tsx
  6. 1
      src/config/clients/lff.tsx
  7. 1
      src/config/clients/tunisia.tsx
  8. 1
      src/config/clients/types.tsx
  9. 10
      src/features/AuthServiceApp/components/ChangePassword/hooks.tsx
  10. 2
      src/features/AuthServiceApp/config/clients/index.tsx
  11. 1
      src/features/AuthServiceApp/config/clients/types.tsx
  12. 4
      src/requests/getGeoInfo.tsx

@ -31,6 +31,7 @@ export const facr: ClientConfig = {
defaultLanguage: 'cs',
description: 'Live sports streaming platform. All matches playing under the auspices of Czech Republic FA. Access to full matches, various player playlists, and highlights. Free access in the Czech Republic. Available across all devices',
disabledPreferences: false,
host: 'facr.tv',
name: ClientNames.Facr,
privacyLink: '/privacy-policy-and-statement',
requests: {

@ -17,6 +17,7 @@ export const fqtv: ClientConfig = {
defaultLanguage: 'en',
description: 'Queensland’s streamed competitions, including NPL Men, NPL Women and McDonald\'s FQPL Leagues.',
disabledPreferences: true,
host: 'fqtv.com.au',
name: ClientNames.Fqtv,
privacyLink: '/privacy-policy-and-statement?client_id=insports-ott-web',
showSearch: true,

@ -17,6 +17,7 @@ export const india: ClientConfig = {
sign: 'Rupee',
},
disabledHighlights: true,
host: 'india.insports.tv',
name: ClientNames.India,
userAccountCardsHidden: true,
}

@ -17,6 +17,7 @@ export const insports: ClientConfig = {
defaultLanguage: 'en',
description: 'Live sports streaming platform. Football, basketball, ice hockey and more. Access to various player playlists and game highlights. Multiple subscription options. Available across all devices.',
disabledPreferences: true,
host: 'insports.tv',
name: ClientNames.Insports,
privacyLink: '/privacy-policy-and-statement?client_id=insports-ott-web',
showSearch: true,

@ -17,6 +17,7 @@ export const instat: ClientConfig = {
defaultLanguage: 'en',
description: 'Live sports streaming platform. Football, basketball, ice hockey and more. Access to various player playlists and game highlights. Multiple subscription options. Available across all devices.',
disabledPreferences: true,
host: 'instat.tv',
name: ClientNames.Instat,
privacyLink: '/privacy-policy-and-statement',
showSearch: true,

@ -18,6 +18,7 @@ export const lff: ClientConfig = {
description: 'Latvijas Futbola federācija (LFF) pašmāju futbola spēļu tiešraižu, apskatu un ierakstu platforma.',
disabledHighlights: true,
disabledPreferences: true,
host: 'tv.lff.lv',
name: ClientNames.Lff,
privacyLink: '/privacy-policy-and-statement',
showSearch: true,

@ -25,6 +25,7 @@ export const tunisia: ClientConfig = {
disabledFilters: true,
disabledHighlights: true,
disabledPreferences: true,
host: 'diwansport.net',
name: ClientNames.Tunisia,
privacyLink: '/privacy-policy-and-statement?client_id=insports-ott-web',
showSearch: true,

@ -42,6 +42,7 @@ export type ClientConfig = {
disabledFilters?: boolean,
disabledHighlights?: boolean,
disabledPreferences?: boolean,
host: string,
name: ClientNames,
privacyLink: string,
requests?: Record<ProcedureName, RequestParameters>,

@ -9,11 +9,14 @@ import { useHistory } from 'react-router'
import { useAuthFields } from 'features/AuthServiceApp/hooks/useAuthFields'
import { changePassword } from 'features/AuthServiceApp/requests/changePassword'
import { clients } from 'features/AuthServiceApp/config/clients'
import { useParamsUrl } from '../../hooks/useParamsUrl'
export const useChangePasswordForm = () => {
const { client_id } = useParamsUrl()
const { client_id, redirect_uri } = useParamsUrl()
const history = useHistory()
const [error, setError] = useState('')
const [modalOpen, setModalOpen] = useState<boolean>(false)
const [isFetching, setIsFetching] = useState(false)
@ -36,9 +39,12 @@ export const useChangePasswordForm = () => {
setIsFetching(false)
}
}
const host = String(redirect_uri || clients[client_id].host)
const redirectUrl = `/authorize?client_id=${client_id}&redirect_uri=${encodeURIComponent(host)}`
const modalButtonClick = () => {
history.push(`/authorize?client_id=${client_id}`)
history.push(redirectUrl)
}
const onPasswordChange = ({

@ -8,7 +8,7 @@ import { india } from './india'
import { tunisia } from './tunisia'
import { fqtv } from './fqtv'
const clients = {
export const clients = {
[ClientIds.Facr]: facr,
[ClientIds.Fqtv]: fqtv,
[ClientIds.Instat]: instat,

@ -12,6 +12,7 @@ export type ClientConfig = {
background: FC<{ children: ReactNode }>,
defaultLanguage: string,
description: string,
host?: string,
isHideSelectLanguages?: boolean,
name: ClientNames,
privacyLink: string,

@ -1,4 +1,4 @@
import { AUTH_SERVICE } from 'config'
import { API_ROOT } from 'features/AuthServiceApp/config/routes'
import { callApi } from 'helpers'
export type GeoInfoType = {
@ -14,6 +14,6 @@ export const getGeoInfo = async (): Promise<GeoInfoType> => {
return callApi({
config,
url: `${AUTH_SERVICE}/geoinfo`,
url: `${API_ROOT}/geoinfo`,
})
}

Loading…
Cancel
Save