Merge branch 'master' into v5

This commit is contained in:
Daniel
2018-09-15 11:46:46 +02:00
parent 8f8aeb6e6a
commit d2d1f4889e
13 changed files with 1511 additions and 37 deletions
+9 -6
View File
@@ -1,8 +1,8 @@
import { checkAvailability, CordovaInstance, InstanceProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Injectable } from '@angular/core';
import { checkAvailability, CordovaInstance, InstanceProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
export interface AuthenticationResult {
accessToken: string;
accesSTokenType: string;
expiresOn: Date;
@@ -18,7 +18,6 @@ export interface AuthenticationResult {
* @returns {String} The authorization header.
*/
createAuthorizationHeader(): string;
}
export interface TokenCache {
@@ -52,7 +51,6 @@ export interface UserInfo {
uniqueId: string;
}
/**
* @name MS ADAL
* @description
@@ -101,12 +99,17 @@ export class MSAdal extends IonicNativePlugin {
createAuthenticationContext(authority: string, validateAuthority = true) {
let authContext: any;
if (checkAvailability(MSAdal.getPluginRef(), null, MSAdal.getPluginName()) === true) {
authContext = new (MSAdal.getPlugin()).AuthenticationContext(authority);
if (
checkAvailability(MSAdal.getPluginRef(), null, MSAdal.getPluginName()) ===
true
) {
authContext = new (MSAdal.getPlugin()).AuthenticationContext(
authority,
validateAuthority
);
}
return new AuthenticationContext(authContext);
}
}
/**