Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Pass access token for publishing through request body instead of header #5700

Merged
a-b-r-o-w-n merged 4 commits into from
Feb 5, 2021
Merged

fix: Pass access token for publishing through request body instead of header #5700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db99dd0
Pass access token for publishing through request body instead of header
tonyanziano Feb 4, 2021
2d5a261
Merge branch 'main' into toanzian/fix/header-size
tonyanziano Feb 4, 2021
d9af6e0
Merge branch 'main' into toanzian/fix/header-size
cwhitten Feb 5, 2021
4fab4da
Merge branch 'main' into toanzian/fix/header-size
a-b-r-o-w-n Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions Composer/packages/client/src/recoilModel/dispatchers/publisher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,15 @@ export const publisherDispatcher = () => {
const luFiles = await snapshot.getPromise(luFilesState(projectId));
const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
const referredLuFiles = luUtil.checkLuisBuild(luFiles, dialogs);
const response = await httpClient.post(
`/publish/${projectId}/publish/${target.name}`,
{
metadata: {
...metadata,
luResources: referredLuFiles.map((file) => ({ id: file.id, isEmpty: file.empty })),
qnaResources: qnaFiles.map((file) => ({ id: file.id, isEmpty: file.empty })),
},
sensitiveSettings,
const response = await httpClient.post(`/publish/${projectId}/publish/${target.name}`, {
accessToken: token,
metadata: {
...metadata,
luResources: referredLuFiles.map((file) => ({ id: file.id, isEmpty: file.empty })),
qnaResources: qnaFiles.map((file) => ({ id: file.id, isEmpty: file.empty })),
},
{
headers: { Authorization: `Bearer ${token}` },
}
);
sensitiveSettings,
});
await publishSuccess(callbackHelpers, projectId, response.data, target);
} catch (err) {
// special case to handle dotnet issues
Expand Down
6 changes: 2 additions & 4 deletions Composer/packages/server/src/controllers/publisher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const PublishController = {
publish: async (req, res) => {
const target: string = req.params.target;
const user = await ExtensionContext.getUserFromRequest(req);
const { metadata, sensitiveSettings } = req.body;
const { accessToken = '', metadata, sensitiveSettings } = req.body;
const projectId: string = req.params.projectId;
const currentProject = await BotProjectService.getProjectById(projectId, user);

Expand All @@ -68,9 +68,7 @@ export const PublishController = {
const profile = profiles.length ? profiles[0] : undefined;
const extensionName = profile ? profile.type : ''; // get the publish plugin key

// get token from header
const accessToken = req.headers.authorization?.substring('Bearer '.length);
log('access token get from header: %s', accessToken);
log('access token retrieved from body: %s', accessToken || 'no token provided');
if (profile && extensionImplementsMethod(extensionName, 'publish')) {
// append config from client(like sensitive settings)
const configuration = {
Expand Down