Skip to content
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

Jump to bottom

Refactor Acquire Token APIs Internally #792

Merged
merged 22 commits into from Jul 22, 2019
Merged

Refactor Acquire Token APIs Internally #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
002681f
Refactoring interactive APIs
Jun 26, 2019
d6a43fe
Moving around code, renaming isCallback
Jun 26, 2019
979ec39
Fixing failed tests, adding final changes for renaming
Jun 27, 2019
9a21af4
Made changes based on feedback, moved functions to separate classes f…
Jul 2, 2019
5cb5a8a
Changed strings to variables
Jul 2, 2019
b7c0636
Added changes from feedback during review meeting
Jul 3, 2019
5144589
Update Utils.ts
Jul 3, 2019
8f2badc
Changing scopes used during helper call
Jul 3, 2019
a94d996
Adding updates from feedback
Jul 17, 2019
77e35e0
Update Utils.ts
Jul 17, 2019
a78ee01
Updating from dev
Jul 17, 2019
271c5d7
Fixing forceRefresh
Jul 17, 2019
a440e03
Update Utils.ts
Jul 19, 2019
d2b30c6
Update UserAgentApplication.ts
Jul 19, 2019
0481dc8
Adding comments
Jul 19, 2019
dad8e70
Update UserAgentApplication.ts
Jul 19, 2019
33ccfcc
Update UserAgentApplication.ts
Jul 19, 2019
6a93c4d
Update UserAgentApplication.ts
Jul 19, 2019
1d22b53
adding error checks for interactionType
Jul 19, 2019
0aa9200
Update UserAgentApplication.ts
Jul 22, 2019
9e9d7ad
Update UserAgentApplication.ts
Jul 22, 2019
836c05e
Merge branch 'dev' into refactor_acquireToken
Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 5 additions & 10 deletions lib/msal-core/src/Constants.ts
View file
Open in desktop
Expand Up @@ -82,6 +82,9 @@ export class Constants {

static get cacheLocationLocal(): CacheLocation { return "localStorage"; }
static get cacheLocationSession(): CacheLocation { return "sessionStorage"; }

static get interactionTypeRedirect(): InteractionType { return "redirectInteraction"; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be better to use an enum here

enum InteractionType {
    Redirect, 
    PopUp
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will keep this consistent with cache location for now, update to enums in a future PR

static get interactionTypePopup(): InteractionType { return "popupInteraction"; }
DarylThayil marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down Expand Up @@ -128,6 +131,8 @@ export const BlacklistedEQParams = [
SSOTypes.LOGIN_HINT
];

export type InteractionType = "redirectInteraction" | "popupInteraction";

/**
* we considered making this "enum" in the request instead of string, however it looks like the allowed list of
* prompt values kept changing over past couple of years. There are some undocumented prompt values for some
Expand All @@ -147,13 +152,3 @@ export const PromptState = {
export const Library = {
version: "1.0.2"
};

/**
* @hidden
* Readable shortcut for Interaction Required Errors
*/
export const InteractionErrorType = {
LOGIN: InteractionError.loginRequired.code,
CONSENT: InteractionError.consentRequired.code,
INTERACTION: InteractionError.interactionRequired.code
};