Skip to content

FOCI #957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bgavrilMS merged 13 commits into from
Mar 19, 2019
Merged

FOCI #957

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f29f14b
Remove unused dev app (SampleApp)
bgavrilMS Mar 7, 2019
b3d3ad8
Add netfx console sample app that exercises foci
bgavrilMS Mar 7, 2019
a7d6fdc
Add AppMetadata to token cache obj model + ios key refactoring
bgavrilMS Mar 8, 2019
f0e685a
AppMetadata serialization support
bgavrilMS Mar 10, 2019
5777055
Add support for FRT
bgavrilMS Mar 10, 2019
cbf87ff
Add support for feature flags
bgavrilMS Mar 11, 2019
196b1db
Create app metadata when receiving token responses
bgavrilMS Mar 11, 2019
f94f946
Fix a serialization issue and add better assert in ut
bgavrilMS Mar 12, 2019
36fd99b
Token cache changes for saving AppMetadada and FRT
bgavrilMS Mar 15, 2019
e60b558
Do not write FRTs to ADAL legacy cache
bgavrilMS Mar 16, 2019
e0c1289
SilentRequest logic and E2E FOCI tests
bgavrilMS Mar 16, 2019
87a44c1
Update test app with non-foci app
bgavrilMS Mar 16, 2019
12ac5c1
Foci - minor rebase fixes and PR comments
bgavrilMS Mar 16, 2019
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
Prev Previous commit
Next Next commit
Update test app with non-foci app
  • Loading branch information
@bgavrilMS
bgavrilMS committed Mar 16, 2019
commit 87a44c1e25e2f7e8f045fb263542d2d71420193c
149 changes: 91 additions & 58 deletions tests/devapps/NetFxConsoleTestApp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,31 +41,42 @@ namespace NetCoreTestApp
public class Program
{
// TODO: replace with FOCI family members IDs
private const string FAMILY_MEMBER_1 = "";
private const string FAMILY_MEMBER_2 = "";
// DO NOT CHECK THESE IN
private const string FAMILY_MEMBER_1 = ""; // Office
private const string FAMILY_MEMBER_2 = ""; // Teams
private const string NON_FAMILY_MEMBER = "0615b6ca-88d4-4884-8729-b178178f7c27";


private static readonly string[] s_scopes = new[] { "https://graph.microsoft.com/.default" };

private static readonly string s_cacheFilePath = System.Reflection.Assembly.GetExecutingAssembly().Location + ".msalcache.bin";
private static readonly string s_cacheFilePath = System.Reflection.Assembly.GetExecutingAssembly().Location + ".msalcache.json";

// These 2 apps share the cache
private static IPublicClientApplication s_pca1;
private static IPublicClientApplication s_pca2;
private static IPublicClientApplication s_pcaFam1;
private static IPublicClientApplication s_pcaFam2;
private static IPublicClientApplication s_pcaNonFam;

public static void Main(string[] args)
{
s_pca1 = PublicClientApplicationBuilder
s_pcaFam1 = PublicClientApplicationBuilder
.Create(FAMILY_MEMBER_1)
.WithLogging(Log, LogLevel.Verbose, true)
.Build();

s_pca2 = PublicClientApplicationBuilder
s_pcaFam2 = PublicClientApplicationBuilder
.Create(FAMILY_MEMBER_2)
.WithLogging(Log, LogLevel.Verbose, true)
.Build();

s_pcaNonFam = PublicClientApplicationBuilder
.Create(NON_FAMILY_MEMBER)
.WithLogging(Log, LogLevel.Verbose, true)
.Build();


SetCacheSerializationToFile(s_pca1);
SetCacheSerializationToFile(s_pcaFam1);
SetCacheSerializationToFile(s_pcaFam2);
SetCacheSerializationToFile(s_pcaNonFam);

RunConsoleAppLogicAsync().Wait();
}
Expand Down Expand Up @@ -95,15 +106,19 @@ private static async Task RunConsoleAppLogicAsync()
{
Console.Clear();

await DisplayAccountsAsync(s_pca1).ConfigureAwait(false);
await DisplayAccountsAsync(s_pcaFam1).ConfigureAwait(false);

// display menu
Console.WriteLine(@"
1. Acquire Token App1
2. Acquire Token App2
3. Acquire Token Silent App1
4. Acquire Token Silent App2
5. Clear cache
1. Acquire Token App1 (family member)
2. Acquire Token App2 (family member)
3. Acquire Token App3 (non-family member)
4. Acquire Token Silent App1 (family member)
5. Acquire Token Silent App2 (family member)
6. Acquire Token Silent App3 (non-family member)


7. Clear cache
0. Exit App
Enter your Selection: ");
int.TryParse(Console.ReadLine(), out var selection);
Expand All @@ -114,35 +129,47 @@ 0. Exit App
{
switch (selection)
{
case 1:
authTask = GetInteractiveAuthTaskAsync(s_pca1);
FetchTokenAsync(s_pca2, authTask).GetAwaiter().GetResult();
break;
case 2:
authTask = GetInteractiveAuthTaskAsync(s_pca2);
FetchTokenAsync(s_pca2, authTask).GetAwaiter().GetResult();
break;
case 3:
authTask = GetSilentAuthTaskAsync(s_pca1);
FetchTokenAsync(s_pca1, authTask).GetAwaiter().GetResult();
break;
case 4:
authTask = GetSilentAuthTaskAsync(s_pca2);
FetchTokenAsync(s_pca2, authTask).GetAwaiter().GetResult();
break;

case 5:
var accounts = await s_pca1.GetAccountsAsync().ConfigureAwait(false);
foreach (var acc in accounts)
{
await s_pca1.RemoveAsync(acc).ConfigureAwait(false);
}

break;
case 0:
return;
default:
break;
case 1:
authTask = GetInteractiveAuthTaskAsync(s_pcaFam1);
FetchTokenAsync(s_pcaNonFam, authTask).GetAwaiter().GetResult();
break;
case 2:
authTask = GetInteractiveAuthTaskAsync(s_pcaFam2);
FetchTokenAsync(s_pcaNonFam, authTask).GetAwaiter().GetResult();
break;
case 3:
authTask = GetInteractiveAuthTaskAsync(s_pcaNonFam);
FetchTokenAsync(s_pcaNonFam, authTask).GetAwaiter().GetResult();
break;
case 4:
authTask = GetSilentAuthTaskAsync(s_pcaFam1);
FetchTokenAsync(s_pcaFam1, authTask).GetAwaiter().GetResult();
break;
case 5:
authTask = GetSilentAuthTaskAsync(s_pcaFam2);
FetchTokenAsync(s_pcaNonFam, authTask).GetAwaiter().GetResult();
break;
case 6:
authTask = GetSilentAuthTaskAsync(s_pcaNonFam);
FetchTokenAsync(s_pcaNonFam, authTask).GetAwaiter().GetResult();
break;

case 7:
var accounts1 = await s_pcaFam1.GetAccountsAsync().ConfigureAwait(false);
var accounts2 = await s_pcaFam1.GetAccountsAsync().ConfigureAwait(false);
var accounts3 = await s_pcaFam1.GetAccountsAsync().ConfigureAwait(false);


foreach (var acc in accounts1)
{
await s_pcaFam1.RemoveAsync(acc).ConfigureAwait(false);
}

break;
case 0:
return;
default:
break;
}

}
Expand All @@ -162,20 +189,26 @@ private static Task<AuthenticationResult> GetInteractiveAuthTaskAsync(IPublicCli
return pca.AcquireTokenInteractive(s_scopes, null).ExecuteAsync();
}


private static Task<AuthenticationResult> GetSilentAuthTaskAsync(IPublicClientApplication pca)
{
// get all serialized accounts
// get all RTs WHERE rt.client == app.client OR app is part of family or unkown
// JOIN acounts and RTs ON homeAccountID

// A -> interactive auth -> account, RT1
// B -> GetAccounts -> NULL

var accounts = pca.GetAccountsAsync().GetAwaiter().GetResult();
if (accounts.Count() > 1)
{
Log(LogLevel.Error, "Not expecting to handle multiple accounts", false);
return null;
}

return pca.AcquireTokenSilent(s_scopes, accounts.FirstOrDefault()).ExecuteAsync();
}

//return pca.AcquireTokenSilent(s_scopes, accounts.FirstOrDefault()).ExecuteAsync();
return pca.AcquireTokenSilent(s_scopes, "[email protected]").ExecuteAsync();

}

private static async Task FetchTokenAsync(IPublicClientApplication pca, Task<AuthenticationResult> authTask)
{
Expand Down Expand Up @@ -220,17 +253,17 @@ private static void Log(LogLevel level, string message, bool containsPii)

switch (level)
{
case LogLevel.Error:
Console.ForegroundColor = ConsoleColor.Red;
break;
case LogLevel.Warning:
Console.ForegroundColor = ConsoleColor.Yellow;
break;
case LogLevel.Verbose:
Console.ForegroundColor = ConsoleColor.Gray;
break;
default:
break;
case LogLevel.Error:
Console.ForegroundColor = ConsoleColor.Red;
break;
case LogLevel.Warning:
Console.ForegroundColor = ConsoleColor.Yellow;
break;
case LogLevel.Verbose:
Console.ForegroundColor = ConsoleColor.Gray;
break;
default:
break;
}

Console.WriteLine($"{level} {message}");
Expand Down