Skip to content

Commit

Permalink
Merge pull request #52 from cesmii/cesmii/develop
Browse files Browse the repository at this point in the history
- OPC PRs 179 - 189
- Home page: add PD/Marketplace links etc.
- Readme for AAD support
  • Loading branch information
MarkusHorstmann authored Oct 6, 2023
2 parents dcdb541 + aa5e816 commit 84e1f25
Show file tree
Hide file tree
Showing 80 changed files with 5,809 additions and 398 deletions.
1 change: 0 additions & 1 deletion CloudLibSync/CloudLibSync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ public async Task SynchronizeAsync(string sourceUrl, string sourceUserName, stri
targetNodesets.AddRange(targetNodeSetResult.Edges.Select(e => e.Node));
targetCursor = targetNodeSetResult.PageInfo.EndCursor;
} while (targetNodeSetResult.PageInfo.HasNextPage);

bAdded = false;

GraphQlResult<Nodeset> sourceNodeSetResult;
Expand Down
2 changes: 1 addition & 1 deletion CloudLibSync/CloudLibSync.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<ProjectReference Include="..\Opc.Ua.CloudLib.Client\Opc.Ua.Cloud.Library.Client.csproj" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.4.371.60" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.4.371.96" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta3.22114.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion CloudLibSync/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public async Task<int> MainAsync(string[] args)
uploadCommand,
};

await root.InvokeAsync(args);
await root.InvokeAsync(args).ConfigureAwait(false);

return 0;
}
Expand Down
38 changes: 38 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,44 @@ Hosting on AWS requires the identity/role used to have policies allowing access
Hosting on GCP requires an identity used to have policies allowing access to the GCS bucket.
In case file based authentication is used, please set the envionment variable GOOGLE_APPLICATION_CREDENTIALS pointing to the SA-Key.

## Microsoft Identity Platform Login (aka Azure AD, Microsoft Entra Id)

1. Create an application registration for an ASP.Net web app using Microsoft identity, as per the [documentation](https://learn.microsoft.com/en-us/azure/active-directory/develop/scenario-web-app-sign-user-app-registration?tabs=aspnetcore).

Specifically:

- Redirect UIs:

https://(servername)/Identity/Account/ExternalLogin

https://(servername)/signin-oidc

https://(servername)/

- Front Channel logout URL:

https://(servername)/signout-oidc

- Select ID tokens (no need for Access tokens).

2. Add an Administrator App role:
- Name and Description per your conventions
- Value must be "Administrator"

3. Assign administrator role to the desired users.

4. Configure the server to use the application:

```json
"AzureAd": {
"Instance": "https://login.microsoftonline.com/",
"ClientId": "<clientid>", //"[Enter the Client Id (Application ID obtained from the Azure portal), e.g. ba74781c2-53c2-442a-97c2-3d60re42f403]",
"TenantId": "<tenantid>", //"[Enter 'common', or 'organizations' or the Tenant Id (Obtained from the Azure portal. Select 'Endpoints' from the 'App
}
```

You can use the corresponding environment variables (AzureAd__XYZ ) or Azure configuration names (AzureAd:XYZ).

## Deployment

Docker containers are automatically built for the UA Cloud Library. The latest version is always available via:
Expand Down
Loading

0 comments on commit 84e1f25

Please sign in to comment.