Skip to content

Commit

Permalink
Company Communicator v4.1.1 (#423)
Browse files Browse the repository at this point in the history
- Update version number in manifests to 4.1.1
- Fix bug in #420 where it tries to get the member information for the bot, resulting for 404 Not Found errors
- Ensure Azure tables are created by prep function. This allows a fix for the issue reported in #420 by simply deleting the UserData table and restarting the prep Azure function.
- Update npm packages
  • Loading branch information
aosolis authored Jun 11, 2021
1 parent 3efae1c commit 36a00a7
Show file tree
Hide file tree
Showing 6 changed files with 172 additions and 71 deletions.
2 changes: 1 addition & 1 deletion Deployment/deploy.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ function logout {

# Initialize connections - Azure Az/CLI/Azure AD
WriteI -message "Login with with your Azure subscription account. Launching Azure sign-in window..."
Connect-AzAccount -Subscription $parameters.subscriptionId.Value -ErrorAction Stop
Connect-AzAccount -Subscription $parameters.subscriptionId.Value -Tenant $parameters.subscriptionTenantId.value -ErrorAction Stop
$user = az login --tenant $parameters.subscriptionTenantId.value
if ($LASTEXITCODE -ne 0) {
WriteE -message "Login failed for user..."
Expand Down
2 changes: 1 addition & 1 deletion Manifest/manifest_authors.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json",
"manifestVersion": "1.5",
"version": "4.1.0",
"version": "4.1.1",
"id": "1c07cd26-a088-4db8-8928-ace382fa219f",
"packageName": "com.microsoft.teams.companycommunicator.authors",
"developer": {
Expand Down
2 changes: 1 addition & 1 deletion Manifest/manifest_users.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json",
"manifestVersion": "1.5",
"version": "4.1.0",
"version": "4.1.1",
"id": "148a66bb-e83d-425a-927d-09f4299a9274",
"packageName": "com.microsoft.teams.companycommunicator",
"developer": {
Expand Down
2 changes: 1 addition & 1 deletion Source/CompanyCommunicator.Prep.Func/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public override void Configure(IFunctionsHostBuilder builder)
// tables exist. It is here as a possible configuration setting in
// case it needs to be set differently.
repositoryOptions.EnsureTableExists =
!configuration.GetValue<bool>("IsItExpectedThatTableAlreadyExists", true);
!configuration.GetValue<bool>("IsItExpectedThatTableAlreadyExists", false);
});
builder.Services.AddOptions<MessageQueueOptions>()
.Configure<IConfiguration>((messageQueueOptions, configuration) =>
Expand Down
4 changes: 2 additions & 2 deletions Source/CompanyCommunicator/Bot/TeamsDataCapture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ public async Task OnBotAddedAsync(ITurnContext turnContext, IConversationUpdateA
await this.teamDataRepository.SaveTeamDataAsync(activity);
break;
case TeamsDataCapture.PersonalType:
// Skip Guest users.
TeamsChannelAccount teamsUser = await TeamsInfo.GetMemberAsync(turnContext, activity.Recipient.Id, cancellationToken);
// Skip Guest users
TeamsChannelAccount teamsUser = await TeamsInfo.GetMemberAsync(turnContext, activity.From.Id, cancellationToken);
if (!teamsUser.UserPrincipalName.ToLower().Contains("#ext#"))
{
await this.userDataService.SaveUserDataAsync(activity);
Expand Down
231 changes: 166 additions & 65 deletions Source/CompanyCommunicator/ClientApp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 36a00a7

Please sign in to comment.