Skip to content

Commit

Permalink
update ngrok urls
Browse files Browse the repository at this point in the history
  • Loading branch information
Pawank-MSFT committed Apr 27, 2023
1 parent 90645b6 commit aaf02c8
Show file tree
Hide file tree
Showing 295 changed files with 525 additions and 525 deletions.
12 changes: 6 additions & 6 deletions samples/account-linking/csharp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ Account {{REDACTED}}
Version 2.3.40
Region United States (us)
Web Interface http://127.0.0.1:4040
Forwarding http://590a2d6f8b31.ngrok.io -> https://localhost:5001
Forwarding https://590a2d6f8b31.ngrok.io -> https://localhost:5001
Forwarding http://590a2d6f8b31.ngrok-free.app -> https://localhost:5001
Forwarding https://590a2d6f8b31.ngrok-free.app -> https://localhost:5001
Connections ttl opn rt1 rt5 p50 p90
0 0 0.00 0.00 0.00 0.00
```

For this example, we'll use the `590a2d6f8b31.ngrok.io` as our domain name.
For this example, we'll use the `590a2d6f8b31.ngrok-free.app` as our domain name.

### 2. Provision an Azure AD application for Tab SSO
Please follow the instructions on [creating an Azure AD application with Tab SSO](https://docs.microsoft.com/en-us/microsoftteams/platform/tabs/how-to/authentication/auth-aad-sso?tabs=dotnet#1-create-your-azure-ad-application). The fully qualified domain name will be the ngrok url from before.
Expand All @@ -87,7 +87,7 @@ Please save
### 4. Provision a GitHub app
Please follow the instructions on [creating a GitHub App](https://docs.github.com/en/developers/apps/building-github-apps/creating-a-github-app).

The "callback url" will be `https://{{your-domain}}/oauth/end`, e.g. `https://590a2d6f8b31.ngrok.io/oauth/end`.
The "callback url" will be `https://{{your-domain}}/oauth/end`, e.g. `https://590a2d6f8b31.ngrok-free.app/oauth/end`.

Please save
1. The `Client ID`
Expand All @@ -100,8 +100,8 @@ Please fill in the following values into the `Manifest/Manifest.json` file (call
|---|---|
| Bot Id | The "Application (client) id" from step 3. |
| Azure Ad Application Id | the "Application (client) id" from step 2|
|Base Url | The base url of your application. For example, if you are using ngrok then your base URL will be like: `https://590a2d6f8b31.ngrok.io`.
|Base Url Domain| The base url domain of your application. For example, if you are using ngrok then your domain name will be like: `590a2d6f8b31.ngrok.io`.
|Base Url | The base url of your application. For example, if you are using ngrok then your base URL will be like: `https://590a2d6f8b31.ngrok-free.app`.
|Base Url Domain| The base url domain of your application. For example, if you are using ngrok then your domain name will be like: `590a2d6f8b31.ngrok-free.app`.

### 6. Clone the repository

Expand Down
2 changes: 1 addition & 1 deletion samples/app-anonymous-users/csharp/FacebookAuth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
8. From the products section select `Facebook login` and click setup.
![Facebook Service](products-page.png)

9. In the prodcuts section, `Facebook Login` will be added. Go to its settings section and add the below valid domains inside the valid domain area. (Note here base-url refers to your app's base url. For eg when using ngrok if our url is `https://1234.ngrok.io` then base-url will be `1234.ngrok.io`).
9. In the prodcuts section, `Facebook Login` will be added. Go to its settings section and add the below valid domains inside the valid domain area. (Note here base-url refers to your app's base url. For eg when using ngrok if our url is `https://1234.ngrok-free.app` then base-url will be `1234.ngrok-free.app`).
`https://<base-url>/`, `https://<base-url>/facebook-auth-end`, `https://token.botframework.com/.auth/web/redirect`.

![Valid Domains](valid-domains.png)
8 changes: 4 additions & 4 deletions samples/app-anonymous-users/csharp/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ This sample shows anonymous users support in meeting apps.
3. On the overview page, copy and save the **Application (client) ID, Directory (tenant) ID**. You’ll need those later when updating your Teams application manifest and in the appsettings.json.
4. Under **Manage**, select **Expose an API**.
5. Select the **Set** link to generate the Application ID URI in the form of `api://{base-url}/botid-{AppID}`. Insert your fully qualified domain name (with a forward slash "/" appended to the end) between the double forward slashes and the GUID. The entire ID should have the form of: `api://fully-qualified-domain-name/botid-{AppID}`
* ex: `api://%ngrokDomain%.ngrok.io/botid-00000000-0000-0000-0000-000000000000`.
* ex: `api://%ngrokDomain%.ngrok-free.app/botid-00000000-0000-0000-0000-000000000000`.
6. Select the **Add a scope** button. In the panel that opens, enter `access_as_user` as the **Scope name**.
7. Set **Who can consent?** to `Admins and users`
8. Fill in the fields for configuring the admin and user consent prompts with values that are appropriate for the `access_as_user` scope:
Expand All @@ -66,7 +66,7 @@ This sample shows anonymous users support in meeting apps.
9. Ensure that **State** is set to **Enabled**
10. Select **Add scope**
* The domain part of the **Scope name** displayed just below the text field should automatically match the **Application ID** URI set in the previous step, with `/access_as_user` appended to the end:
* `api://[ngrokDomain].ngrok.io/botid-00000000-0000-0000-0000-000000000000/access_as_user.
* `api://[ngrokDomain].ngrok-free.app/botid-00000000-0000-0000-0000-000000000000/access_as_user.
11. In the **Authorized client applications** section, identify the applications that you want to authorize for your app’s web application. Each of the following IDs needs to be entered:
* `1fec8e78-bce4-4aaf-ab1b-5451cc387264` (Teams mobile/desktop application)
* `5e3ce6c0-2b1f-4285-8d4b-75ee78787346` (Teams web application)
Expand Down Expand Up @@ -129,7 +129,7 @@ This sample shows anonymous users support in meeting apps.
- `{{Microsoft-App-id}}` - Generated from Step 1 (Application (client) ID)is the application app id
- `{{TenantId}}` - Generated from Step 1(Directory (tenant) ID) is the tenant id
- `{{MicrosoftAppPassword}}` - Generated from Step 1.14, also referred to as Client secret
- `{{domain-name}}` - Your application's base url. E.g. https://12345.ngrok.io if you are using ngrok.
- `{{domain-name}}` - Your application's base url. E.g. https://12345.ngrok-free.app if you are using ngrok.
- `{{FacebookAppId}} and {{FacebookAppPassword}}`- Generated from step 16.
7) Modify the .env file in your project folder (or in Visual Studio) and fill in below details:
Expand All @@ -140,7 +140,7 @@ This sample shows anonymous users support in meeting apps.
- **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id `<<YOUR-MICROSOFT-APP-ID>>` (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<<YOUR-MICROSOFT-APP-ID>>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`)
- **Edit** the `manifest.json` for `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok.io` then your domain-name will be `1234.ngrok.io`.
- **Edit** the `manifest.json` for `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app`.
- **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package)
Expand Down
2 changes: 1 addition & 1 deletion samples/app-anonymous-users/nodejs/FacebookAuth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
8. From the products section select `Facebook login` and click setup.
![Facebook Service](products-page.png)

9. In the prodcuts section, `Facebook Login` will be added. Go to its settings section and add the below valid domains inside the valid domain area. (Note here base-url refers to your app's base url. For eg when using ngrok if our url is `https://1234.ngrok.io` then base-url will be `1234.ngrok.io`).
9. In the prodcuts section, `Facebook Login` will be added. Go to its settings section and add the below valid domains inside the valid domain area. (Note here base-url refers to your app's base url. For eg when using ngrok if our url is `https://1234.ngrok-free.app` then base-url will be `1234.ngrok-free.app`).
`https://<base-url>/`, `https://<base-url>/facebook-auth-end`, `https://token.botframework.com/.auth/web/redirect`.

![Valid Domains](valid-domains.png)
8 changes: 4 additions & 4 deletions samples/app-anonymous-users/nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ This sample shows anonymous users support in Teams meeting apps.
3. On the overview page, copy and save the **Application (client) ID, Directory (tenant) ID**. You’ll need those later when updating your Teams application manifest and in the .env.
4. Under **Manage**, select **Expose an API**.
5. Select the **Set** link to generate the Application ID URI in the form of `api://{base-url}/botid-{AppID}`. Insert your fully qualified domain name (with a forward slash "/" appended to the end) between the double forward slashes and the GUID. The entire ID should have the form of: `api://fully-qualified-domain-name/botid-{AppID}`
* ex: `api://%ngrokDomain%.ngrok.io/botid-00000000-0000-0000-0000-000000000000`.
* ex: `api://%ngrokDomain%.ngrok-free.app/botid-00000000-0000-0000-0000-000000000000`.
6. Select the **Add a scope** button. In the panel that opens, enter `access_as_user` as the **Scope name**.
7. Set **Who can consent?** to `Admins and users`
8. Fill in the fields for configuring the admin and user consent prompts with values that are appropriate for the `access_as_user` scope:
Expand All @@ -66,7 +66,7 @@ This sample shows anonymous users support in Teams meeting apps.
9. Ensure that **State** is set to **Enabled**
10. Select **Add scope**
* The domain part of the **Scope name** displayed just below the text field should automatically match the **Application ID** URI set in the previous step, with `/access_as_user` appended to the end:
* `api://[ngrokDomain].ngrok.io/botid-00000000-0000-0000-0000-000000000000/access_as_user.
* `api://[ngrokDomain].ngrok-free.app/botid-00000000-0000-0000-0000-000000000000/access_as_user.
11. In the **Authorized client applications** section, identify the applications that you want to authorize for your app’s web application. Each of the following IDs needs to be entered:
* `1fec8e78-bce4-4aaf-ab1b-5451cc387264` (Teams mobile/desktop application)
* `5e3ce6c0-2b1f-4285-8d4b-75ee78787346` (Teams web application)
Expand Down Expand Up @@ -107,7 +107,7 @@ This sample shows anonymous users support in Teams meeting apps.
- `{{MicrosoftAppPassword}}` - Generated from Step 1.14, also referred to as Client secret
- `{{TenantId}}` - Generated from Step 1(Directory (tenant) ID) is the tenant id
- `{{FacebookAppId}} and {{FacebookAppPassword}}`- Generated from step 16.
- `{{domain-name}}` - Your application's base url. E.g. https://12345.ngrok.io if you are using ngrok.
- `{{domain-name}}` - Your application's base url. E.g. https://12345.ngrok-free.app if you are using ngrok.

5. Open .env file from this path folder `samples/app-anonymous-users/nodejs/ClientApp` and update
- `{{Microsoft-App-id}}` - Generated from Step 1 (Application (client) ID)is the application app id
Expand Down Expand Up @@ -144,7 +144,7 @@ This sample shows anonymous users support in Teams meeting apps.

- **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id `<<YOUR-MICROSOFT-APP-ID>>` (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<<YOUR-MICROSOFT-APP-ID>>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`)
- **Edit** the `manifest.json` for `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok.io` then your domain-name will be `1234.ngrok.io`.
- **Edit** the `manifest.json` for `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app`.
- **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package)
Expand Down
2 changes: 1 addition & 1 deletion samples/app-cache-meetings/nodejs/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ This sample feature shows how to improve the subsequent loading time of an App t

4) __*This step is specific to Teams.*__
- **Edit** the `manifest.json` contained in the `appPackage` folder to replace your `<<MANIFEST-ID>>`, You can use any GUID Id in place of `<<Manifest-ID>>` or [Generate Guid](https://guidgenerator.com/)
- **Edit** the `manifest.json` for `<<Valid_Domain>>` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok.io` then your domain-name will be `1234.ngrok.io`. Replace it at all the places in your manifest.json.
- **Edit** the `manifest.json` for `<<Valid_Domain>>` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app`. Replace it at all the places in your manifest.json.
- **Zip** up the contents of the `appPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package)
- **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.)
- Sideload the app In meetings (Supported scopes)
Expand Down
4 changes: 2 additions & 2 deletions samples/app-checkin-location/csharp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can
- Modify the `/appsettings.json` and fill in the following details:
- `{{Microsoft-App-Id}}` - Generated from Step 1 while doing AAd app registration in Azure portal.
- `{{ Microsoft-App-Password}}` - Generated from Step 1, also referred to as Client secret
- `{{ Application Base Url }}` - Your application's base url. E.g. https://12345.ngrok.io if you are using ngrok.
- `{{ Application Base Url }}` - Your application's base url. E.g. https://12345.ngrok-free.app if you are using ngrok.
- Run the bot from a terminal or from Visual Studio:
Expand All @@ -96,7 +96,7 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can
4) Setup Manifest for Teams
- __*This step is specific to Teams.*__
- **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`)
- **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok.io` then your domain-name will be `1234.ngrok.io`.
- **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app`.
- **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package)
- Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
8. From the products section select `Facebook login` and click setup.
![Facebook Service](products-page.png)

9. In the prodcuts section, `Facebook Login` will be added. Go to its settings section and add the below valid domains inside the valid domain area. (Note here base-url refers to your app's base url. For eg when using ngrok if our url is `https://1234.ngrok.io` then base-url will be `1234.ngrok.io`).
9. In the prodcuts section, `Facebook Login` will be added. Go to its settings section and add the below valid domains inside the valid domain area. (Note here base-url refers to your app's base url. For eg when using ngrok if our url is `https://1234.ngrok-free.app` then base-url will be `1234.ngrok-free.app`).
`https://<base-url>/`, `https://<base-url>/facebook-auth-end`, `https://token.botframework.com/.auth/web/redirect`.

![Valid Domains](valid-domains.png)
Loading

0 comments on commit aaf02c8

Please sign in to comment.