Skip to content

Commit 04d04a6

Browse files
appeon-dotnetappeon-dotnet
committed
Update to Powerbuilder 2022 R2 GA (2819)
1 parent 7ad54cc commit 04d04a6

74 files changed

Lines changed: 7590 additions & 1120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Client/addressmanager.pbd‎

-5.5 KB
Binary file not shown.

‎Client/addressmanager.pbl‎

3 KB
Binary file not shown.

‎Client/authentication.pbd‎

-23 KB
Binary file not shown.

‎Client/authentication.pbl‎

7.5 KB
Binary file not shown.

‎README.md‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The project is structured as follows.
1717
|—— ServerAPIs.Authentication.Common Common class library
1818
|—— ServerAPIs.Authentication.IdentityServer4 IdentityServer4 authentication integration
1919
|—— ServerAPIs.Authentication.Jwt JWT authentication integration
20+
|—— UserExtensions User Extension Project
2021
```
2122

2223
### Setting Up the Project
@@ -32,7 +33,7 @@ Download this demo application, and then:
3233

3334
#### Build & deploy the PowerServer project
3435

35-
1. Open the PowerBuilder project in PowerBuilder 2022.
36+
1. Open the PowerBuilder project in PowerBuilder 2022 R2.
3637
2. Open the PowerServer project: ps_authentication, switch to the Web APIs tab and set the Web API URL as you need. Please note that the Web API URL must be HTTPS.
3738
3. Click the Auto Import button in the License settings to import your license.
3839
4. Open Database Configuration. Set the database to the ODBC source configured in step #2 of the Preparations section.
@@ -41,11 +42,11 @@ Download this demo application, and then:
4142

4243
#### Modifying the configuration files in **PowerServer-Authentication-Example.sln**
4344

44-
1. Copy the ServerAPIs/AppConfig/Applications.json from **PowerServer_authentication.sln** generated in the section above and replace the files of same names in **PowerServer-Authentication-Example.sln.**
45+
1. Copy the UserExtensions/AppConfig/Applications.json from **PowerServer_authentication.sln** generated in the section above and replace the files of same names in **PowerServer-Authentication-Example.sln.**
4546

46-
2. Copy the ServerAPIs/Server.json from **PowerServer_authentication.sln** generated in the section above and replace the files of same names in **PowerServer-Authentication-Example.sln**.
47+
2. Copy the UserExtensions/UserConfig.json from **PowerServer_authentication.sln** generated in the section above and replace the files of same names in **PowerServer-Authentication-Example.sln**.
4748

48-
3. Fill in all the sensitive data between the angle brackets `<>` in the ServerAPIs/Authentication/Authentication.json file in **PowerServer-Authentication-Example.sln**, for example:
49+
3. Fill in all the sensitive data between the angle brackets `<>` in the UserExtensions/Authentication/Authentication.json file in **PowerServer-Authentication-Example.sln**, for example:
4950

5051
e.g.:
5152

@@ -58,18 +59,19 @@ Download this demo application, and then:
5859

5960
#### Running the Example
6061

61-
1. Run the ServerAPIs project.
62-
2. Switch to PowerBuilder 2022, right click on **ps_authentication**, and then click Run PowerServer project.
62+
1. Switch to PowerBuilder 2022 R2, right click on **ps_authentication**, and then click Run PowerServer project.
6363

6464
#### How to integrate to your ServerAPIs project
6565

6666
1. Open your PowerServer ServerAPIs project.
6767

68+
2. Switch to UserExtensions project.
69+
6870
2. Add reference to **ServerAPIs.Authentication.Common** class library. The relative path is //Server/ServerAPIs.Authentication.Common/ServerAPIs.Authentication.Common.csproj.
6971

70-
3. Add references to the library of the authentication that you need to use (they are integrated in **PowerServer-Authentication-Example.sln**) in your ServerAPIs project. For example, suppose you need to use Aamaon Cognito authentication, you will need to add reference to **ServerAPIs.Authentication.AWS** project.
72+
3. Add references to the library of the authentication that you need to use (they are integrated in **PowerServer-Authentication-Example.sln**) in your UserExtensions project. For example, suppose you need to use Aamaon Cognito authentication, you will need to add reference to **ServerAPIs.Authentication.AWS** project.
7173

72-
4. Edit the **AuthenticationExtensions.cs** file in **Authentication** folder in the ServerAPIs project, and add the following code inside **AddPowerServerAuthentication** method. Note that uncomment the code that is required for your authentication.
74+
4. Edit the **AuthenticationExtensions.cs** file in **Authentication** folder in the UserExtensions project, and add the following code inside **AddPowerServerAuthentication** method. Note that uncomment the code that is required for your authentication.
7375

7476
```c#
7577
// Authentication platform service to supporting multiple identity authentication

‎Server/AppModels/AppModels.csproj‎

-275 Bytes
Binary file not shown.

‎Server/AppModels/PSRESTAuthentication/Models/addressmanager/Dw_Address.cs‎

400 Bytes
Binary file not shown.

‎Server/PowerServer-Authentication-Example.sln‎

Lines changed: 57 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,80 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.31321.278
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 16.0.31005.135
54
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs", "ServerAPIs\ServerAPIs.csproj", "{0445A9F0-4741-40A9-B155-466CE47930B9}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs", "ServerAPIs\ServerAPIs.csproj", "{9545C5FF-D7E5-4099-B960-10FDF0999640}"
76
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.Azure", "ServerAPIs.Authentication.Azure\ServerAPIs.Authentication.Azure.csproj", "{BD7730CE-81F8-43F3-A793-276008FDE4B8}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppModels", "AppModels\AppModels.csproj", "{852FD8FB-7781-4A4D-9A57-28CAB841EA47}"
98
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.Jwt", "ServerAPIs.Authentication.Jwt\ServerAPIs.Authentication.Jwt.csproj", "{3DB53506-5D8D-4464-9B81-1B2C8B878B56}"
9+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EF65B672-63B7-46C3-BAB9-48B3FBAF48CC}"
10+
ProjectSection(SolutionItems) = preProject
11+
Readme.txt = Readme.txt
12+
EndProjectSection
13+
1114
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.IdentityServer4", "ServerAPIs.Authentication.IdentityServer4\ServerAPIs.Authentication.IdentityServer4.csproj", "{EABD443B-91A8-4319-9D89-825A78B43789}"
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserExtensions", "UserExtensions\UserExtensions.csproj", "{80B5C976-8BD4-46FF-BA2C-3B6196DAF1F8}"
1316
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.AWS", "ServerAPIs.Authentication.AWS\ServerAPIs.Authentication.AWS.csproj", "{D25E7E22-3A77-4970-A96A-AFCB9926AEB9}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.AWS", "ServerAPIs.Authentication.AWS\ServerAPIs.Authentication.AWS.csproj", "{60D40038-3102-4DE5-8DE0-3773A574171D}"
1518
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppModels", "AppModels\AppModels.csproj", "{583E4C39-439F-4916-A565-AE8E318C8C19}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.Azure", "ServerAPIs.Authentication.Azure\ServerAPIs.Authentication.Azure.csproj", "{27BB1417-F588-4CF5-B9E8-14F3EDE6FA3A}"
1720
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.Common", "ServerAPIs.Authentication.Common\ServerAPIs.Authentication.Common.csproj", "{70A00624-90EB-44D3-8B71-A7B73ABE877F}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.Common", "ServerAPIs.Authentication.Common\ServerAPIs.Authentication.Common.csproj", "{D16B8AE7-4781-4612-92FB-BFD72F4EC594}"
1922
EndProject
20-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1FA39CA8-1FDB-495E-8C1C-A16DF748D6C2}"
21-
ProjectSection(SolutionItems) = preProject
22-
Readme.txt = Readme.txt
23-
EndProjectSection
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.IdentityServer4", "ServerAPIs.Authentication.IdentityServer4\ServerAPIs.Authentication.IdentityServer4.csproj", "{A69C7B1C-B830-4A55-9683-98E46248015D}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerAPIs.Authentication.Jwt", "ServerAPIs.Authentication.Jwt\ServerAPIs.Authentication.Jwt.csproj", "{8E115595-1B89-4A39-8929-36BE5E27F7AA}"
2426
EndProject
2527
Global
2628
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2729
Debug|Any CPU = Debug|Any CPU
2830
Release|Any CPU = Release|Any CPU
2931
EndGlobalSection
32+
3033
GlobalSection(ProjectConfigurationPlatforms) = postSolution
31-
{0445A9F0-4741-40A9-B155-466CE47930B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{0445A9F0-4741-40A9-B155-466CE47930B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{0445A9F0-4741-40A9-B155-466CE47930B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
34-
{0445A9F0-4741-40A9-B155-466CE47930B9}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{BD7730CE-81F8-43F3-A793-276008FDE4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{BD7730CE-81F8-43F3-A793-276008FDE4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{BD7730CE-81F8-43F3-A793-276008FDE4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{BD7730CE-81F8-43F3-A793-276008FDE4B8}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{3DB53506-5D8D-4464-9B81-1B2C8B878B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{3DB53506-5D8D-4464-9B81-1B2C8B878B56}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{3DB53506-5D8D-4464-9B81-1B2C8B878B56}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{3DB53506-5D8D-4464-9B81-1B2C8B878B56}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{EABD443B-91A8-4319-9D89-825A78B43789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{EABD443B-91A8-4319-9D89-825A78B43789}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{EABD443B-91A8-4319-9D89-825A78B43789}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{EABD443B-91A8-4319-9D89-825A78B43789}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{D25E7E22-3A77-4970-A96A-AFCB9926AEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{D25E7E22-3A77-4970-A96A-AFCB9926AEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{D25E7E22-3A77-4970-A96A-AFCB9926AEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{D25E7E22-3A77-4970-A96A-AFCB9926AEB9}.Release|Any CPU.Build.0 = Release|Any CPU
51-
{583E4C39-439F-4916-A565-AE8E318C8C19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52-
{583E4C39-439F-4916-A565-AE8E318C8C19}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{583E4C39-439F-4916-A565-AE8E318C8C19}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{583E4C39-439F-4916-A565-AE8E318C8C19}.Release|Any CPU.Build.0 = Release|Any CPU
55-
{70A00624-90EB-44D3-8B71-A7B73ABE877F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56-
{70A00624-90EB-44D3-8B71-A7B73ABE877F}.Debug|Any CPU.Build.0 = Debug|Any CPU
57-
{70A00624-90EB-44D3-8B71-A7B73ABE877F}.Release|Any CPU.ActiveCfg = Release|Any CPU
58-
{70A00624-90EB-44D3-8B71-A7B73ABE877F}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{9545C5FF-D7E5-4099-B960-10FDF0999640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{9545C5FF-D7E5-4099-B960-10FDF0999640}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{9545C5FF-D7E5-4099-B960-10FDF0999640}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{9545C5FF-D7E5-4099-B960-10FDF0999640}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{852FD8FB-7781-4A4D-9A57-28CAB841EA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{852FD8FB-7781-4A4D-9A57-28CAB841EA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{852FD8FB-7781-4A4D-9A57-28CAB841EA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{852FD8FB-7781-4A4D-9A57-28CAB841EA47}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{80B5C976-8BD4-46FF-BA2C-3B6196DAF1F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{80B5C976-8BD4-46FF-BA2C-3B6196DAF1F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{80B5C976-8BD4-46FF-BA2C-3B6196DAF1F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{80B5C976-8BD4-46FF-BA2C-3B6196DAF1F8}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{60D40038-3102-4DE5-8DE0-3773A574171D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{60D40038-3102-4DE5-8DE0-3773A574171D}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{60D40038-3102-4DE5-8DE0-3773A574171D}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{60D40038-3102-4DE5-8DE0-3773A574171D}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{27BB1417-F588-4CF5-B9E8-14F3EDE6FA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{27BB1417-F588-4CF5-B9E8-14F3EDE6FA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{27BB1417-F588-4CF5-B9E8-14F3EDE6FA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{27BB1417-F588-4CF5-B9E8-14F3EDE6FA3A}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{D16B8AE7-4781-4612-92FB-BFD72F4EC594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{D16B8AE7-4781-4612-92FB-BFD72F4EC594}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{D16B8AE7-4781-4612-92FB-BFD72F4EC594}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{D16B8AE7-4781-4612-92FB-BFD72F4EC594}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{A69C7B1C-B830-4A55-9683-98E46248015D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{A69C7B1C-B830-4A55-9683-98E46248015D}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{A69C7B1C-B830-4A55-9683-98E46248015D}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{A69C7B1C-B830-4A55-9683-98E46248015D}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{8E115595-1B89-4A39-8929-36BE5E27F7AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{8E115595-1B89-4A39-8929-36BE5E27F7AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{8E115595-1B89-4A39-8929-36BE5E27F7AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{8E115595-1B89-4A39-8929-36BE5E27F7AA}.Release|Any CPU.Build.0 = Release|Any CPU
5966
EndGlobalSection
67+
6068
GlobalSection(SolutionProperties) = preSolution
6169
HideSolutionNode = FALSE
6270
EndGlobalSection
71+
6372
GlobalSection(ExtensibilityGlobals) = postSolution
64-
SolutionGuid = {DFD7F94A-093F-4733-98C8-E8C95C1B3A2B}
73+
AuthenticationType = Default
74+
SolutionGuid = {306FC735-2D3F-4E38-81DB-979D7D72F30A}
75+
EndGlobalSection
76+
77+
GlobalSection(NestedProjects) = preSolution
6578
EndGlobalSection
79+
6680
EndGlobal

‎Server/ServerAPIs/AppConfig/AppConfig.xml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Server/ServerAPIs/AppConfig/AppConfigExtensions.cs‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)