diff options
author | Dan Timoney <dtimoney@att.com> | 2019-03-25 14:27:10 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-03-25 14:27:10 +0000 |
commit | 1f68c64e8bcf88ee485c69d36c67b0ad6590a293 (patch) | |
tree | 34ab01010c3a8b3bb4086d4b683a6fd8040f2992 /sdnr/wt/odlux/framework/src/services/restService.ts | |
parent | 528f6391de8495f3346b5e22ede404c00b9955b7 (diff) | |
parent | 2d4424c28ac35763ef44c42ae2f01664d42b268c (diff) |
Merge "Security provider for UX-Client-Login"
Diffstat (limited to 'sdnr/wt/odlux/framework/src/services/restService.ts')
-rw-r--r-- | sdnr/wt/odlux/framework/src/services/restService.ts | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/sdnr/wt/odlux/framework/src/services/restService.ts b/sdnr/wt/odlux/framework/src/services/restService.ts index 83c005c13..cfa8ec159 100644 --- a/sdnr/wt/odlux/framework/src/services/restService.ts +++ b/sdnr/wt/odlux/framework/src/services/restService.ts @@ -1,8 +1,19 @@ +import { ApplicationStore } from "../store/applicationStore"; +import { ReplaceAction } from "../actions/navigationActions"; const baseUri = `${ window.location.origin }`; -const absUrlPattern = /^https?:\/\//; +const absUrlPattern = /^https?:\/\//; +let applicationStore: ApplicationStore | null = null; -export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = false): Promise<TData|false|null> { +export const startRestService = (store: ApplicationStore) => { + applicationStore = store; +}; + +export const formEncode = (params: { [key: string]: string | number }) => Object.keys(params).map((key) => { + return encodeURIComponent(key) + '=' + encodeURIComponent(params[key].toString()); +}).join('&'); + +export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true): Promise<TData|false|null> { const isAbsUrl = absUrlPattern.test(path); const uri = isAbsUrl ? path : (baseUri) + ('/' + path).replace(/\/{2,}/i, '/'); init.headers = { @@ -11,13 +22,23 @@ export async function requestRest<TData>(path: string = '', init: RequestInit = 'Accept': 'application/json', ...init.headers }; - if (!isAbsUrl && authenticate) { - init.headers = { + if (!isAbsUrl && authenticate && applicationStore) { + const { state: { framework: { authenticationState: { user } } } } = applicationStore; + // do not request if the user is not valid + if (!user || !user.isValid) { + return null; + } + (init.headers = { ...init.headers, - 'Authorization': 'Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==' - }; + 'Authorization': `${user.tokenType} ${user.token}` + //'Authorization': 'Basic YWRtaW46YWRtaW4=' + }); } const result = await fetch(uri, init); + if (result.status === 401 || result.status === 403) { + applicationStore && applicationStore.dispatch(new ReplaceAction(`/login?returnTo=${applicationStore.state.framework.navigationState.pathname}`)); + return null; + } const contentType = result.headers.get("Content-Type") || result.headers.get("content-type"); const isJson = contentType && contentType.toLowerCase().startsWith("application/json"); try { |