Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
catalog.genesys-pgr.org
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Catalog
catalog.genesys-pgr.org
Commits
6cecf9fb
Commit
6cecf9fb
authored
Oct 23, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Handle invalid CLIENT_ID and SECRET
- Prevents infinite loop
parent
3d1dc1a2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
7 deletions
+16
-7
i18n/i18n-server.ts
i18n/i18n-server.ts
+1
-1
package.json
package.json
+4
-0
server/middleware/checkAuthToken.ts
server/middleware/checkAuthToken.ts
+7
-5
server/middleware/fetchComponentData.ts
server/middleware/fetchComponentData.ts
+1
-1
server/middleware/prerenderer.tsx
server/middleware/prerenderer.tsx
+3
-0
No files found.
i18n/i18n-server.ts
View file @
6cecf9fb
...
...
@@ -23,7 +23,7 @@ const i18nServer = i18n
order
:
[
'
path
'
],
lookupFromPathIndex
:
0
,
},
...
optionsBase
...
optionsBase
,
});
export
default
i18nServer
;
package.json
View file @
6cecf9fb
...
...
@@ -22,10 +22,14 @@
"build"
:
"webpack --config config/webpack-development.config.js"
,
"build:production"
:
"cross-env NODE_ENV=production SSR=true webpack --config config/webpack-production.config.js"
,
"build:server"
:
"cross-env NODE_ENV=production SSR=true webpack --config config/server.config.js"
,
"build:serverdebug"
:
"cross-env SSR=true webpack --config config/server.config.js"
,
"serve"
:
"webpack-dev-server --config config/webpack-development.config.js"
,
"serve:production"
:
"cross-env NODE_ENV=production webpack-dev-server --config config/webpack-production.config.js"
,
"build:ssr"
:
"rimraf target && npm run build:production && npm run build:server"
,
"serve:ssr"
:
"npm run build:ssr && cd target/app/server && cross-env SSR=true node server.js"
,
"build:ssrdebug"
:
"rimraf target && npm run build && npm run build:serverdebug"
,
"debug:ssr"
:
"npm run build:ssrdebug && cd target/app/server && cross-env SSR=true node server.js"
,
"ssr"
:
"cd target/app/server && cross-env SSR=true node server.js"
,
"i18nscan"
:
"i18next-scanner --config i18next-scanner.config.js 'src/**/*.tsx'"
},
"dependencies"
:
{
...
...
server/middleware/checkAuthToken.ts
View file @
6cecf9fb
import
{
checkTokenRequest
,
loginAppRequest
,
loginUser
}
from
'
actions/login
'
;
import
ApiError
from
'
model/ApiError
'
;
function
checkAuthTokenRequest
(
req
,
dispatch
)
{
const
token
=
req
.
cookies
.
access_token
;
...
...
@@ -9,12 +10,12 @@ function checkAuthTokenRequest(req, dispatch) {
console
.
log
(
`User token
${
token
}
is valid, response`
,
checkedToken
);
return
dispatch
(
loginUser
(
checkedToken
));
})
.
catch
(()
=>
{
console
.
log
(
'
Server: check failed dispatching loginAppRequest
'
);
.
catch
((
err
)
=>
{
console
.
log
(
'
Cookie check failed, dispatching loginAppRequest
'
,
ApiError
.
axiosError
(
err
)
);
return
dispatch
(
loginAppRequest
());
});
}
else
{
console
.
log
(
'
Server:
No token in cookie, dispatching loginAppRequest
'
);
console
.
log
(
'
No token in cookie, dispatching loginAppRequest
'
);
return
dispatch
(
loginAppRequest
());
}
}
...
...
@@ -31,9 +32,10 @@ export default function checkAuthToken(req, res, dispatch) {
res
.
clearCookie
(
'
authorities
'
);
}
return
data
;
}).
catch
((
x
)
=>
{
console
.
log
(
'
Failed checkAuthToken, clearing cookies
'
,
x
);
}).
catch
((
err
)
=>
{
console
.
log
(
'
Failed checkAuthToken, clearing cookies
'
,
ApiError
.
axiosError
(
err
)
);
res
.
clearCookie
(
'
access_token
'
);
res
.
clearCookie
(
'
authorities
'
);
return
Promise
.
reject
({
message
:
'
Could not authenticate against the API.
'
});
});
}
server/middleware/fetchComponentData.ts
View file @
6cecf9fb
...
...
@@ -14,7 +14,7 @@ export default function fetchComponentData(dispatch, branch, search) {
}).
forEach
((
promise
)
=>
{
console
.
log
(
`Component
${
component
}
needs`
,
promise
);
// a nice array of Promises
promisesWithProps
.
push
(
promise
)
promisesWithProps
.
push
(
promise
)
;
});
});
...
...
server/middleware/prerenderer.tsx
View file @
6cecf9fb
...
...
@@ -139,6 +139,9 @@ const prerenderer = (html) => (req, res) => {
console
.
error
(
'
Error:
'
,
err
);
res
.
status
(
500
).
end
(
err
.
message
);
});
}).
catch
((
err
)
=>
{
console
.
error
(
'
Error:
'
,
err
);
res
.
status
(
500
).
end
(
err
.
message
);
});
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment