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

fix appId and appPassword missing Issue #1183

Merged
VanyLaw merged 4 commits into from
Oct 23, 2019
Merged

fix appId and appPassword missing Issue #1183

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eca247f
fix appId and appPassword missing problem
VanyLaw Oct 22, 2019
e8e03a9
Merge remote-tracking branch 'origin/master' into wenyluo/fix
VanyLaw Oct 22, 2019
f6c0d94
Merge branch 'master' into wenyluo/fix
cwhitten Oct 22, 2019
aa71973
Merge branch 'master' into wenyluo/fix
boydc2014 Oct 23, 2019
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
4 changes: 2 additions & 2 deletions Composer/packages/server/src/models/bot/botProject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ export class BotProject {

public getEnvSettings = async (slot: string, obfuscate: boolean) => {
const settings = await this.settingManager.get(slot, obfuscate);
if (settings && oauthInput().MicrosoftAppId !== OBFUSCATED_VALUE) {
if (settings && oauthInput().MicrosoftAppId && oauthInput().MicrosoftAppId !== OBFUSCATED_VALUE) {
settings.MicrosoftAppId = oauthInput().MicrosoftAppId;
}
if (settings && oauthInput().MicrosoftAppPassword !== OBFUSCATED_VALUE) {
if (settings && oauthInput().MicrosoftAppPassword && oauthInput().MicrosoftAppPassword !== OBFUSCATED_VALUE) {
settings.MicrosoftAppPassword = oauthInput().MicrosoftAppPassword;
}
return settings;
Expand Down