Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cs/src/Contracts/TunnelServiceProperties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ public class TunnelServiceProperties
internal const string PpeFirstPartyAppId = "54c45752-bacd-424a-b928-652f3eca2b18";

/// <summary>
/// Third-party app ID: `DEV-VSTunnelService-3P`
/// Third-party app ID for the DEV service environment.
/// </summary>
/// <remarks>
/// Used for authenticating AAD/MSA users, and service principals outside the AME tenant,
/// in the DEV service environment.
/// This is a 3P app registration in the Microsoft corp tenant, replacing the former 1P FPA.
/// A 3PA registered in the test tenant, used for authenticating AAD/MSA users
/// and service principals outside the AME tenant. Replaces the former 1P FPA
/// (9c63851a) which was disabled.
/// </remarks>
internal const string DevFirstPartyAppId = "906ce216-6f2e-40be-875d-7fe1a9bc288a";
internal const string DevServiceAppId = "686ab1c6-3cd9-4a62-b228-4f71eaaaf53e";

/// <summary>
/// Third-party app ID: `tunnels-prod-app-sp`
Expand Down Expand Up @@ -158,7 +158,7 @@ private TunnelServiceProperties(
/// </summary>
public static TunnelServiceProperties Development { get; } = new TunnelServiceProperties(
$"https://{DevDnsName}/",
DevFirstPartyAppId,
DevServiceAppId,
DevThirdPartyAppId,
DevGitHubAppClientId);

Expand All @@ -171,7 +171,7 @@ private TunnelServiceProperties(
/// </remarks>
public static TunnelServiceProperties Local { get; } = new TunnelServiceProperties(
$"https://{LocalDnsName}/",
DevFirstPartyAppId,
DevServiceAppId,
DevThirdPartyAppId,
LocalGitHubAppClientId);

Expand Down
4 changes: 2 additions & 2 deletions go/tunnels/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var PpeServiceProperties = TunnelServiceProperties{

var DevServiceProperties = TunnelServiceProperties{
ServiceURI: fmt.Sprintf("https://%s/", devDnsName),
ServiceAppID: devFirstPartyAppID,
ServiceAppID: devServiceAppID,
ServiceInternalAppID: devThirdPartyAppID,
GitHubAppClientID: devGitHubAppClientID,
}
Expand All @@ -42,7 +42,7 @@ var DevServiceProperties = TunnelServiceProperties{
// but a different GitHub app with localhost callback URLs.
var LocalServiceProperties = TunnelServiceProperties{
ServiceURI: fmt.Sprintf("https://%s/", localDnsName),
ServiceAppID: devFirstPartyAppID,
ServiceAppID: devServiceAppID,
ServiceInternalAppID: devThirdPartyAppID,
GitHubAppClientID: localGitHubAppClientID,
}
Expand Down
10 changes: 5 additions & 5 deletions go/tunnels/tunnel_service_properties.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ var prodFirstPartyAppID = "46da2f7e-b5ef-422a-88d4-2a7f9de6a0b2"
// in the PPE service environments.
var ppeFirstPartyAppID = "54c45752-bacd-424a-b928-652f3eca2b18"

// Third-party app ID: `DEV-VSTunnelService-3P`
// Third-party app ID for the DEV service environment.
//
// Used for authenticating AAD/MSA users, and service principals outside the AME tenant,
// in the DEV service environment. This is a 3P app registration in the Microsoft corp
// tenant, replacing the former 1P FPA.
var devFirstPartyAppID = "906ce216-6f2e-40be-875d-7fe1a9bc288a"
// A 3PA registered in the test tenant, used for authenticating AAD/MSA users and service
// principals outside the AME tenant. Replaces the former 1P FPA (9c63851a) which was
// disabled.
var devServiceAppID = "686ab1c6-3cd9-4a62-b228-4f71eaaaf53e"

// Third-party app ID: `tunnels-prod-app-sp`
//
Expand Down
2 changes: 1 addition & 1 deletion go/tunnels/tunnels.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/rodaine/table"
)

const PackageVersion = "0.1.24"
const PackageVersion = "0.1.25"

func (tunnel *Tunnel) requestObject() (*Tunnel, error) {
convertedTunnel := &Tunnel{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ public class TunnelServiceProperties {
static final String ppeFirstPartyAppId = "54c45752-bacd-424a-b928-652f3eca2b18";

/**
* Third-party app ID: `DEV-VSTunnelService-3P`
* Third-party app ID for the DEV service environment.
*
* Used for authenticating AAD/MSA users, and service principals outside the AME
* tenant, in the DEV service environment. This is a 3P app registration in the
* Microsoft corp tenant, replacing the former 1P FPA.
* A 3PA registered in the test tenant, used for authenticating AAD/MSA users and
* service principals outside the AME tenant. Replaces the former 1P FPA (9c63851a)
* which was disabled.
*/
static final String devFirstPartyAppId = "906ce216-6f2e-40be-875d-7fe1a9bc288a";
static final String devServiceAppId = "686ab1c6-3cd9-4a62-b228-4f71eaaaf53e";

/**
* Third-party app ID: `tunnels-prod-app-sp`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TunnelServicePropertiesStatics {
*/
static final TunnelServiceProperties development = new TunnelServiceProperties(
"https://" + TunnelServiceProperties.devDnsName + "/",
TunnelServiceProperties.devFirstPartyAppId,
TunnelServiceProperties.devServiceAppId,
TunnelServiceProperties.devThirdPartyAppId,
TunnelServiceProperties.devGitHubAppClientId);

Expand All @@ -43,7 +43,7 @@ class TunnelServicePropertiesStatics {
*/
static final TunnelServiceProperties local = new TunnelServiceProperties(
"https://" + TunnelServiceProperties.localDnsName + "/",
TunnelServiceProperties.devFirstPartyAppId,
TunnelServiceProperties.devServiceAppId,
TunnelServiceProperties.devThirdPartyAppId,
TunnelServiceProperties.localGitHubAppClientId);

Expand Down
4 changes: 2 additions & 2 deletions rs/src/contracts/tunnel_environments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub fn env_staging() -> TunnelServiceProperties {
pub fn env_development() -> TunnelServiceProperties {
TunnelServiceProperties {
service_uri: format!("https://{}", DEV_DNS_NAME),
service_app_id: DEV_FIRST_PARTY_APP_ID.to_owned(),
service_app_id: DEV_SERVICE_APP_ID.to_owned(),
service_internal_app_id: DEV_THIRD_PARTY_APP_ID.to_owned(),
github_app_client_id: DEV_GITHUB_APP_CLIENT_ID.to_owned(),
}
Expand All @@ -33,7 +33,7 @@ pub fn env_development() -> TunnelServiceProperties {
pub fn env_local() -> TunnelServiceProperties {
TunnelServiceProperties {
service_uri: format!("https://{}", LOCAL_DNS_NAME),
service_app_id: DEV_FIRST_PARTY_APP_ID.to_owned(),
service_app_id: DEV_SERVICE_APP_ID.to_owned(),
service_internal_app_id: DEV_THIRD_PARTY_APP_ID.to_owned(),
github_app_client_id: LOCAL_GITHUB_APP_CLIENT_ID.to_owned(),
}
Expand Down
10 changes: 5 additions & 5 deletions rs/src/contracts/tunnel_service_properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ pub const PROD_FIRST_PARTY_APP_ID: &str = "46da2f7e-b5ef-422a-88d4-2a7f9de6a0b2"
// in the PPE service environments.
pub const PPE_FIRST_PARTY_APP_ID: &str = "54c45752-bacd-424a-b928-652f3eca2b18";

// Third-party app ID: `DEV-VSTunnelService-3P`
// Third-party app ID for the DEV service environment.
//
// Used for authenticating AAD/MSA users, and service principals outside the AME tenant,
// in the DEV service environment. This is a 3P app registration in the Microsoft corp
// tenant, replacing the former 1P FPA.
pub const DEV_FIRST_PARTY_APP_ID: &str = "906ce216-6f2e-40be-875d-7fe1a9bc288a";
// A 3PA registered in the test tenant, used for authenticating AAD/MSA users and service
// principals outside the AME tenant. Replaces the former 1P FPA (9c63851a) which was
// disabled.
pub const DEV_SERVICE_APP_ID: &str = "686ab1c6-3cd9-4a62-b228-4f71eaaaf53e";

// Third-party app ID: `tunnels-prod-app-sp`
//
Expand Down
2 changes: 1 addition & 1 deletion ts/src/connections/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"buffer": "^5.2.1",
"debug": "^4.1.1",
"vscode-jsonrpc": "^4.0.0",
"@microsoft/dev-tunnels-contracts": "^1.3.38",
"@microsoft/dev-tunnels-contracts": ">1.3.43",
"@microsoft/dev-tunnels-management": "^1.3.38",
"uuid": "^3.3.3",
"await-semaphore": "^0.1.3",
Expand Down
10 changes: 5 additions & 5 deletions ts/src/contracts/tunnelServiceProperties.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ export const prodFirstPartyAppId = '46da2f7e-b5ef-422a-88d4-2a7f9de6a0b2';
export const ppeFirstPartyAppId = '54c45752-bacd-424a-b928-652f3eca2b18';

/**
* Third-party app ID: `DEV-VSTunnelService-3P`
* Third-party app ID for the DEV service environment.
*
* Used for authenticating AAD/MSA users, and service principals outside the AME tenant,
* in the DEV service environment. This is a 3P app registration in the Microsoft corp
* tenant, replacing the former 1P FPA.
* A 3PA registered in the test tenant, used for authenticating AAD/MSA users and service
* principals outside the AME tenant. Replaces the former 1P FPA (9c63851a) which was
* disabled.
*/
export const devFirstPartyAppId = '906ce216-6f2e-40be-875d-7fe1a9bc288a';
export const devServiceAppId = '686ab1c6-3cd9-4a62-b228-4f71eaaaf53e';

/**
* Third-party app ID: `tunnels-prod-app-sp`
Expand Down
6 changes: 3 additions & 3 deletions ts/src/contracts/tunnelServicePropertiesStatics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
TunnelServiceProperties as ITunnelServiceProperties,
prodFirstPartyAppId,
ppeFirstPartyAppId,
devFirstPartyAppId,
devServiceAppId,
prodThirdPartyAppId,
ppeThirdPartyAppId,
devThirdPartyAppId,
Expand Down Expand Up @@ -44,7 +44,7 @@ export const staging = <ITunnelServiceProperties>{
*/
export const development = <ITunnelServiceProperties>{
serviceUri: `https://${devDnsName}/`,
serviceAppId: devFirstPartyAppId,
serviceAppId: devServiceAppId,
serviceInternalAppId: devThirdPartyAppId,
gitHubAppClientId: devGitHubAppClientId,
};
Expand All @@ -57,7 +57,7 @@ export const development = <ITunnelServiceProperties>{
*/
export const local = <ITunnelServiceProperties>{
serviceUri: `https://${localDnsName}/`,
serviceAppId: devFirstPartyAppId,
serviceAppId: devServiceAppId,
serviceInternalAppId: devThirdPartyAppId,
gitHubAppClientId: localGitHubAppClientId,
};
Expand Down
2 changes: 1 addition & 1 deletion ts/src/management/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"buffer": "^5.2.1",
"debug": "^4.1.1",
"vscode-jsonrpc": "^4.0.0",
"@microsoft/dev-tunnels-contracts": "^1.3.38",
"@microsoft/dev-tunnels-contracts": ">1.3.43",
"axios": "^1.8.4"
}
}
Loading