Skip to content

Commit 413ced5

Browse files
Petya KolevatatiNo5
authored andcommitted
Update samples with per project sub domains
1 parent 54d8273 commit 413ced5

17 files changed

Lines changed: 52 additions & 34 deletions

File tree

.github/workflows/dotnet.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
TESTS_IMAGE: ghcr.io/miracl/oidc-samples/integration-tests:latest-windows
1919
CLIENT_ID: ${{ vars.CLIENT_ID }}
2020
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
21-
PROJECT_ID: ${{ vars.PROJECT_ID }}
21+
PROJECT_DOMAIN: ${{ vars.PROJECT_DOMAIN }}
2222
CID_FILE: sample.cid
2323

2424
jobs:
@@ -99,6 +99,7 @@ jobs:
9999
--name sample
100100
--env CLIENT_ID
101101
--env CLIENT_SECRET
102+
--env ISSUER=$PROJECT_DOMAIN
102103
--env REDIRECT_URL=http://sample:8000/login
103104
--env PROXY_HOST=${{ steps.proxy.outputs.address }}
104105
--env PROXY_PORT=8080
@@ -120,7 +121,7 @@ jobs:
120121
run: docker run
121122
--env CLIENT_ID
122123
--env CLIENT_SECRET
123-
--env PROJECT_ID
124+
--env PROJECT_DOMAIN
124125
--env SAMPLE_NAME=sample
125126
--env SAMPLE_IP=${{ steps.sample.outputs.address }}
126127
--env SAMPLE_URL=http://sample:8000
@@ -143,6 +144,7 @@ jobs:
143144
--publish 8000:8000
144145
--env CLIENT_ID
145146
--env CLIENT_SECRET
147+
--env ISSUER=$PROJECT_DOMAIN
146148
--env REDIRECT_URL=http://sample:8000/login
147149
--cidfile $CID_FILE
148150
${{ env.SAMPLE_IMAGE }}
@@ -162,7 +164,7 @@ jobs:
162164
run: docker run
163165
--env CLIENT_ID
164166
--env CLIENT_SECRET
165-
--env PROJECT_ID
167+
--env PROJECT_DOMAIN
166168
--env SAMPLE_IP=${{ steps.info.outputs.address }}
167169
--env SAMPLE_URL=http://sample:8000
168170
--env REDIRECT_URL=http://sample:8000/login

.github/workflows/dotnet6.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
TESTS_IMAGE: ghcr.io/miracl/oidc-samples/integration-tests:latest
1919
CLIENT_ID: ${{ vars.CLIENT_ID }}
2020
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
21-
PROJECT_ID: ${{ vars.PROJECT_ID }}
21+
PROJECT_DOMAIN: ${{ vars.PROJECT_DOMAIN }}
2222

2323
jobs:
2424
lint-dotnet6:
@@ -72,6 +72,7 @@ jobs:
7272
--publish 8000
7373
--env CLIENT_ID
7474
--env CLIENT_SECRET
75+
--env ISSUER=$PROJECT_DOMAIN
7576
$SAMPLE_IMAGE
7677
- name: Sleep for a seconds
7778
run: sleep 1s
@@ -82,7 +83,7 @@ jobs:
8283
$TESTS_IMAGE
8384
--client-id $CLIENT_ID
8485
--client-secret $CLIENT_SECRET
85-
--project-id $PROJECT_ID
86+
--project-domain $PROJECT_DOMAIN
8687

8788
run-integration-tests-with-proxy:
8889
needs: build-docker
@@ -111,6 +112,7 @@ jobs:
111112
--name sample
112113
--env CLIENT_ID
113114
--env CLIENT_SECRET
115+
--env ISSUER=$PROJECT_DOMAIN
114116
--env PROXY_HOST=127.0.0.1
115117
--env PROXY_PORT=8080
116118
$SAMPLE_IMAGE
@@ -123,7 +125,7 @@ jobs:
123125
$TESTS_IMAGE
124126
--client-id $CLIENT_ID
125127
--client-secret $CLIENT_SECRET
126-
--project-id $PROJECT_ID
128+
--project-domain $PROJECT_DOMAIN
127129
--sample-name sample
128130
--proxy-host 127.0.0.1
129131
--proxy-port 8080

.github/workflows/go.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
TESTS_IMAGE: ghcr.io/miracl/oidc-samples/integration-tests:latest
1919
CLIENT_ID: ${{ vars.CLIENT_ID }}
2020
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
21-
PROJECT_ID: ${{ vars.PROJECT_ID }}
21+
PROJECT_DOMAIN: ${{ vars.PROJECT_DOMAIN }}
2222

2323
jobs:
2424
lint-go:
@@ -73,6 +73,7 @@ jobs:
7373
--name sample
7474
--env CLIENT_ID
7575
--env CLIENT_SECRET
76+
--env ISSUER=$PROJECT_DOMAIN
7677
$SAMPLE_IMAGE
7778
- name: Sleep for a seconds
7879
run: sleep 1s
@@ -83,7 +84,7 @@ jobs:
8384
$TESTS_IMAGE
8485
--client-id $CLIENT_ID
8586
--client-secret $CLIENT_SECRET
86-
--project-id $PROJECT_ID
87+
--project-domain $PROJECT_DOMAIN
8788

8889
run-integration-tests-with-proxy:
8990
needs: build-docker
@@ -112,6 +113,7 @@ jobs:
112113
--name sample
113114
--env CLIENT_ID
114115
--env CLIENT_SECRET
116+
--env ISSUER=$PROJECT_DOMAIN
115117
--env PROXY_HOST=127.0.0.1
116118
--env PROXY_PORT=8080
117119
$SAMPLE_IMAGE
@@ -124,7 +126,7 @@ jobs:
124126
$TESTS_IMAGE
125127
--client-id $CLIENT_ID
126128
--client-secret $CLIENT_SECRET
127-
--project-id $PROJECT_ID
129+
--project-domain $PROJECT_DOMAIN
128130
--sample-name sample
129131
--proxy-host 127.0.0.1
130132
--proxy-port 8080

.github/workflows/nodejs.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
TESTS_IMAGE: ghcr.io/miracl/oidc-samples/integration-tests:latest
1919
CLIENT_ID: ${{ vars.CLIENT_ID }}
2020
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
21-
PROJECT_ID: ${{ vars.PROJECT_ID }}
21+
PROJECT_DOMAIN: ${{ vars.PROJECT_DOMAIN }}
2222

2323
jobs:
2424
lint-nodejs:
@@ -74,6 +74,7 @@ jobs:
7474
--publish 8000
7575
--env CLIENT_ID
7676
--env CLIENT_SECRET
77+
--env ISSUER=$PROJECT_DOMAIN
7778
$SAMPLE_IMAGE
7879
- name: Sleep for a seconds
7980
run: sleep 1s
@@ -84,7 +85,7 @@ jobs:
8485
$TESTS_IMAGE
8586
--client-id $CLIENT_ID
8687
--client-secret $CLIENT_SECRET
87-
--project-id $PROJECT_ID
88+
--project-domain $PROJECT_DOMAIN
8889

8990
run-integration-tests-with-proxy:
9091
needs: build-docker
@@ -113,6 +114,7 @@ jobs:
113114
--name sample
114115
--env CLIENT_ID
115116
--env CLIENT_SECRET
117+
--env ISSUER=$PROJECT_DOMAIN
116118
--env PROXY_HOST=127.0.0.1
117119
--env PROXY_PORT=8080
118120
$SAMPLE_IMAGE
@@ -125,7 +127,7 @@ jobs:
125127
$TESTS_IMAGE
126128
--client-id $CLIENT_ID
127129
--client-secret $CLIENT_SECRET
128-
--project-id $PROJECT_ID
130+
--project-domain $PROJECT_DOMAIN
129131
--sample-name sample
130132
--proxy-host 127.0.0.1
131133
--proxy-port 8080

.github/workflows/python.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
TESTS_IMAGE: ghcr.io/miracl/oidc-samples/integration-tests:latest
1919
CLIENT_ID: ${{ vars.CLIENT_ID }}
2020
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
21-
PROJECT_ID: ${{ vars.PROJECT_ID }}
21+
PROJECT_DOMAIN: ${{ vars.PROJECT_DOMAIN }}
2222

2323
jobs:
2424
pylint-check:
@@ -79,6 +79,7 @@ jobs:
7979
--name sample
8080
--env CLIENT_ID
8181
--env CLIENT_SECRET
82+
--env ISSUER=$PROJECT_DOMAIN
8283
$SAMPLE_IMAGE
8384
- name: Sleep for a seconds
8485
run: sleep 3s
@@ -89,7 +90,7 @@ jobs:
8990
$TESTS_IMAGE
9091
--client-id $CLIENT_ID
9192
--client-secret $CLIENT_SECRET
92-
--project-id $PROJECT_ID
93+
--project-domain $PROJECT_DOMAIN
9394

9495
run-integration-tests-with-proxy:
9596
needs: build-docker
@@ -118,6 +119,7 @@ jobs:
118119
--name sample
119120
--env CLIENT_ID
120121
--env CLIENT_SECRET
122+
--env ISSUER=$PROJECT_DOMAIN
121123
--env REQUESTS_CA_BUNDLE=/usr/local/share/ca-certificates/proxy.crt
122124
--env PROXY_HOST=127.0.0.1
123125
--env PROXY_PORT=8080
@@ -131,7 +133,7 @@ jobs:
131133
$TESTS_IMAGE
132134
--client-id $CLIENT_ID
133135
--client-secret $CLIENT_SECRET
134-
--project-id $PROJECT_ID
136+
--project-domain $PROJECT_DOMAIN
135137
--sample-name sample
136138
--proxy-host 127.0.0.1
137139
--proxy-port 8080

README.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ All samples work with the following environment variables:
1717

1818
- `HOST` - Host to listen on. The default is "localhost".
1919
- `PORT` - Port of the listening host. The default is "8000".
20-
- `ISSUER` - OpenID Connect Issuer. The default is "https://api.mpin.io".
21-
- `REDIRECT_URL` - The redirect URL of the app in the MIRACL Trust platform.
20+
- `ISSUER` - OpenID Connect Issuer. This must correspond to the OIDC Issuer
21+
configured for your project in the [MIRACL Trust Portal](https://trust.miracl.cloud).
22+
It has no default value and is mandatory.
23+
- `REDIRECT_URL` - The redirect URL of the application in the MIRACL Trust platform.
2224
The default value is "http://localhost:8000/login".
23-
- `CLIENT_ID` - The Client ID of the app in the MIRACL Trust platform. It has
24-
no default value and is mandatory.
25-
- `CLIENT_SECRET`- The Client Secret of the app in the MIRACL Trust platform.
25+
- `CLIENT_ID` - The Client ID of the application in the MIRACL Trust platform.
26+
It has no default value and is mandatory.
27+
- `CLIENT_SECRET`- The Client Secret of the application in the MIRACL Trust platform.
2628
It has no default value and is mandatory.
2729
- `PROXY_HOST`- The host address of the proxy behind which you run the sample.
2830
The default value is an empty string. It is used only when the setup requires
@@ -32,8 +34,8 @@ All samples work with the following environment variables:
3234
proxy, allowing us to validate that the OIDC client works behind a proxy.
3335

3436
To get those values, you'll need to [register](https://miracl.com/resources/docs/get-started/register/)
35-
and [create an app](https://miracl.com/resources/docs/get-started/low-code/) in
36-
our platform.
37+
and [create an application](https://miracl.com/resources/docs/get-started/low-code/)
38+
in our platform.
3739

3840
## Usage
3941

@@ -55,6 +57,7 @@ docker run \
5557
--publish 8000:8000 \
5658
--env CLIENT_ID=<client-id> \
5759
--env CLIENT_SECRET=<client-secret> \
60+
--env ISSUER=<oidc-issuer> \
5861
sample
5962
```
6063

@@ -69,6 +72,7 @@ docker run \
6972
--publish <custom-port>:8000 \
7073
--env CLIENT_ID=<client-id> \
7174
--env CLIENT_SECRET=<client-secret> \
75+
--env ISSUER=<oidc-issuer> \
7276
--env REDIRECT_URL=http://localhost:<custom_port>/login \
7377
sample
7478
```
@@ -103,6 +107,7 @@ docker run \
103107
--env PROXY_PORT=8080 \
104108
--env CLIENT_ID=<client-id> \
105109
--env CLIENT_SECRET=<client-secret> \
110+
--env ISSUER=<oidc-issuer> \
106111
sample
107112
```
108113

samples/dotnet/App_Start/Startup.Auth.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private async Task OnAuthorizationCodeReceived(AuthorizationCodeReceivedNotifica
6868
HttpClient client = new HttpClient();
6969
var response = await client.RequestAuthorizationCodeTokenAsync(new AuthorizationCodeTokenRequest
7070
{
71-
Address = "https://api.mpin.io/oidc/token",
71+
Address = OidcAuthority + "/oidc/token",
7272

7373
ClientId = c.TokenEndpointRequest.ClientId,
7474
ClientSecret = c.TokenEndpointRequest.ClientSecret,

samples/dotnet/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ as follows:
2424
<add key="REDIRECT_URL" value="http://localhost:59504/login" />
2525
<add key="CLIENT_ID" value="CLIENT_ID" />
2626
<add key="CLIENT_SECRET" value="CLIENT_SECRET" />
27+
<add key="ISSUER" value="OIDC_ISSUER" />
2728
</appSettings>
2829
```
2930

samples/dotnet/Web.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<appSettings>
88
<add key="HOST" value="localhost" />
99
<add key="PORT" value="8000" />
10-
<add key="ISSUER" value="https://api.mpin.io" />
10+
<add key="ISSUER" value="OIDC_ISSUER" />
1111
<add key="REDIRECT_URL" value="http://localhost:8000/login" />
1212
<add key="CLIENT_ID" value="CLIENT_ID" />
1313
<add key="CLIENT_SECRET" value="CLIENT_SECRET" />
@@ -112,4 +112,4 @@
112112
<remove name="TRACEVerbHandler" />
113113
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
114114
</handlers>
115-
</system.webServer></configuration>
115+
</system.webServer></configuration>

samples/dotnet6/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ variables as follows:
1919
``` bash
2020
export CLIENT_ID=<client-id>
2121
export CLIENT_SECRET=<client-secret>
22+
export ISSUER=<oidc-issuer>
2223
```
2324

2425
# Usage

0 commit comments

Comments
 (0)