- *
- * | Token |
- * Meaning |
- * Example |
- *
- *
- * | d |
- * Day of month (no leading zero) |
- * 5 |
- *
- *
- * | dd |
- * Day of month (leading zero) |
- * 05 |
- *
- *
- * | ddd |
- * Day name (abbreviated) |
- * Sat |
- *
- *
- * | dddd |
- * Day name (full) |
- * Saturday |
- *
- *
- * | M |
- * Month of year (no leading zero) |
- * 9 |
- *
- *
- * | MM |
- * Month of year (leading zero) |
- * 09 |
- *
- *
- * | MMM |
- * Month name (abbreviated) |
- * Sep |
- *
- *
- * | MMMM |
- * Month name (full) |
- * September |
- *
- *
- * | yy |
- * Year (two digits) |
- * 55 |
- *
- *
- * | yyyy |
- * Year (four digits) |
- * 1955 |
- *
- *
- * | 'literal' |
- * Literal Text |
- * 'of the clock' |
- *
- *
- * | \' |
- * Single Quote |
- * 'o'\''clock' |
- *
- *
- * | m |
- * Minutes (no leading zero) |
- * 9 |
- *
- *
- * | mm |
- * Minutes (leading zero) |
- * 09 |
- *
- *
- * | h |
- * Hours (12 hour time, no leading zero) |
- * 6 |
- *
- *
- * | hh |
- * Hours (12 hour time, leading zero) |
- * 06 |
- *
- *
- * | H |
- * Hours (24 hour time, no leading zero) |
- * 5 (5am) 15 (3pm) |
- *
- *
- * | HH |
- * Hours (24 hour time, leading zero) |
- * 05 (5am) 15 (3pm) |
- *
- *
- * | s |
- * Seconds (no leading zero) |
- * 9 |
- *
- *
- * | ss |
- * Seconds (leading zero) |
- * 09 |
- *
- *
- * | f |
- * Deciseconds |
- * 1 |
- *
- *
- * | ff |
- * Centiseconds |
- * 11 |
- *
- *
- * | fff |
- * Milliseconds |
- * 111 |
- *
- *
- * | t |
- * AM/PM indicator (first letter) |
- * A or P |
- *
- *
- * | tt |
- * AM/PM indicator (full) |
- * AM or PM |
- *
- *
- * | z |
- * Timezone offset (hours only, no leading zero) |
- * -8 |
- *
- *
- * | zz |
- * Timezone offset (hours only, leading zero) |
- * -08 |
- *
- *
- * | zzz |
- * Timezone offset (full hours/minutes) |
- * -08:00 |
- *
- *
- * | g or gg |
- * Era name |
- * A.D. |
- *
- *
- */
- format: function (value, format, culture) {
- return globalize.format(value, format, culture || activeCulture);
- },
-
- /**
- * @ngdoc function
- * @name w20CoreCulture.service:CultureService#parseInt
- * @methodOf w20CoreCulture.service:CultureService
- * @param {String} value The value to parse as an integer.
- * @param {int} [radix] The radix used for the conversion (10 by default).
- * @param {String} [culture] If specified this culture selector will be used to do the parsing.
- * @returns {int} The integer parsed.
- *
- * @description
- *
- * Parses a string representing a whole number in the given radix (10 by default),
- * taking into account any formatting rules followed by the given culture (or the
- * current culture, if not specified).
- *
- * // assuming a culture where "," is the group separator
- * // and "." is the decimal separator
- * CultureService.parseInt( "1,234.56" ); // 1234
- * // assuming a culture where "." is the group separator
- * // and "," is the decimal separator
- * CultureService.parseInt( "1.234,56" ); // 1234
- */
- parseInt: function (value, radix, culture) {
- return globalize.parseInt(value, radix, culture || activeCulture);
- },
-
- /**
- * @ngdoc function
- * @name w20CoreCulture.service:CultureService#parseFloat
- * @methodOf w20CoreCulture.service:CultureService
- * @param {String} value The value to parse as a float.
- * @param {int} [radix] The radix used for the conversion (10 by default).
- * @param {String} [culture] If specified this culture selector will be used to do the parsing.
- * @returns {Number} The float parsed.
- *
- * @description
- *
- * Parses a string representing a floating point number in the given radix (10 by
- * default), taking into account any formatting rules followed by the given
- * culture (or the current culture, if not specified).
- *
- * // assuming a culture where "," is the group separator
- * // and "." is the decimal separator
- * CultureService.parseFloat( "1,234.56" ); // 1234.56
- * // assuming a culture where "." is the group separator
- * // and "," is the decimal separator
- * CultureService.parseFloat( "1.234,56" ); // 1234.56
- */
- parseFloat: function (value, radix, culture) {
- return globalize.parseFloat(value, radix, culture || activeCulture);
- },
- /**
- * @ngdoc function
- * @name w20CoreCulture.service:CultureService#culture
- * @methodOf w20CoreCulture.service:CultureService
- * @param {String} value The value to parse as a date.
- * @param {String} [formats] The formats used to do the parsing.
- * @param {String} [culture] If specified this culture selector will be used to do the parsing.
- * @returns {Date} The date object parsed.
- *
- * @description
- *
- * Parses a string representing a date into a JavaScript Date object, taking into
- * account the given possible formats (or the given culture's set of default
- * formats if not given). As before, the current culture is used if one is not
- * specified.
- *
- * cultureService.culture( "en" );
- * cultureService.parseDate( "1/2/2003" ); // Thu Jan 02 2003
- * cultureService.culture( "fr" );
- * cultureService.parseDate( "1/2/2003" ); // Sat Feb 01 2003
- */
- parseDate: function (value, formats, culture) {
- return globalize.parseDate(value, formats, culture || activeCulture);
- },
-
- /**
- * @ngdoc function
- * @name w20CoreCulture.service:CultureService#addCultureInfo
- * @methodOf w20CoreCulture.service:CultureService
- * @param {String} [cultureName] If supplied it will create a culture with this name.
- * @param {String} [baseCultureName] If supplied it will extend this culture to create the new one.
- * @param {String} info The culture information to add, according to the culture object format.
- *
- * @description
- *
- * This method allows you to create a new culture based on an existing culture or add to existing culture info.
- * If the optional argument `baseCultureName` is not supplied, it will extend the existing culture if it
- * exists or create a new culture based on the default culture if it doesn't exist. If `cultureName` is not
- * supplied, it will add the supplied info to the current culture.
- */
- addCultureInfo: function (cultureName, baseCultureName, info) {
- return globalize.addCultureInfo(cultureName, baseCultureName, info);
- },
-
- /**
- * @ngdoc function
- * @name w20CoreCulture.service:CultureService#displayName
- * @methodOf w20CoreCulture.service:CultureService
- * @param {String} object The object to compute the display name of.
- * @param {String} [values] The values used to localize the i18n key if any.
- * @returns {String} The display name of the object.
- *
- * @description
- *
- * Compute the display name of an object by following these steps:
- *
- * * Return its `label` attribute if it exists, or,
- * * Return the localized form of its `i18n` attribute if it exists, or,
- * * Return an empty string.
- */
- displayName: function (object, values) {
- if (typeof object.label !== 'undefined') {
- return object.label;
- }
- else if (typeof object.i18n !== 'undefined') {
- return service.localize(object.i18n, values);
- }
- else {
- return '';
+ return result.replace(placeholderRegexp, function (item) {
+ return values[parseInt(item.substring(1, item.length - 1))] || '';
+ });
+ },
+
+ /**
+ * @ngdoc function
+ * @name w20CoreCulture.service:CultureService#format
+ * @methodOf w20CoreCulture.service:CultureService
+ * @param {*} value The value to format.
+ * @param {String} format Pattern used for the formatting.
+ * @param {String} [culture] If specified this culture selector will be used to do the formatting.
+ * @returns {String} The value formatted.
+ *
+ * @description
+ *
+ * Format any value according to the format parameter. The current culture is used for formatting rules,
+ * except if a selector is specified as the culture parameter.
+ *
+ * ##### Number formatting
+ *
+ * When formatting a number with format(), the main purpose is to convert the
+ * number into a human readable string using the culture's standard grouping and
+ * decimal rules. The rules between cultures can vary a lot. For example, in some
+ * cultures, the grouping of numbers is done unevenly. In the "te-IN" culture
+ * (Telugu in India), groups have 3 digits and then 2 digits. The number 1000000
+ * (one million) is written as "10,00,000". Some cultures do not group numbers at
+ * all.
+
+ * There are four main types of number formatting:
+ *
+ *
+ * | Token |
+ * Meaning |
+ * Example |
+ *
+ *
+ * | d |
+ * Day of month (no leading zero) |
+ * 5 |
+ *
+ *
+ * | dd |
+ * Day of month (leading zero) |
+ * 05 |
+ *
+ *
+ * | ddd |
+ * Day name (abbreviated) |
+ * Sat |
+ *
+ *
+ * | dddd |
+ * Day name (full) |
+ * Saturday |
+ *
+ *
+ * | M |
+ * Month of year (no leading zero) |
+ * 9 |
+ *
+ *
+ * | MM |
+ * Month of year (leading zero) |
+ * 09 |
+ *
+ *
+ * | MMM |
+ * Month name (abbreviated) |
+ * Sep |
+ *
+ *
+ * | MMMM |
+ * Month name (full) |
+ * September |
+ *
+ *
+ * | yy |
+ * Year (two digits) |
+ * 55 |
+ *
+ *
+ * | yyyy |
+ * Year (four digits) |
+ * 1955 |
+ *
+ *
+ * | 'literal' |
+ * Literal Text |
+ * 'of the clock' |
+ *
+ *
+ * | \' |
+ * Single Quote |
+ * 'o'\''clock' |
+ *
+ *
+ * | m |
+ * Minutes (no leading zero) |
+ * 9 |
+ *
+ *
+ * | mm |
+ * Minutes (leading zero) |
+ * 09 |
+ *
+ *
+ * | h |
+ * Hours (12 hour time, no leading zero) |
+ * 6 |
+ *
+ *
+ * | hh |
+ * Hours (12 hour time, leading zero) |
+ * 06 |
+ *
+ *
+ * | H |
+ * Hours (24 hour time, no leading zero) |
+ * 5 (5am) 15 (3pm) |
+ *
+ *
+ * | HH |
+ * Hours (24 hour time, leading zero) |
+ * 05 (5am) 15 (3pm) |
+ *
+ *
+ * | s |
+ * Seconds (no leading zero) |
+ * 9 |
+ *
+ *
+ * | ss |
+ * Seconds (leading zero) |
+ * 09 |
+ *
+ *
+ * | f |
+ * Deciseconds |
+ * 1 |
+ *
+ *
+ * | ff |
+ * Centiseconds |
+ * 11 |
+ *
+ *
+ * | fff |
+ * Milliseconds |
+ * 111 |
+ *
+ *
+ * | t |
+ * AM/PM indicator (first letter) |
+ * A or P |
+ *
+ *
+ * | tt |
+ * AM/PM indicator (full) |
+ * AM or PM |
+ *
+ *
+ * | z |
+ * Timezone offset (hours only, no leading zero) |
+ * -8 |
+ *
+ *
+ * | zz |
+ * Timezone offset (hours only, leading zero) |
+ * -08 |
+ *
+ *
+ * | zzz |
+ * Timezone offset (full hours/minutes) |
+ * -08:00 |
+ *
+ *
+ * | g or gg |
+ * Era name |
+ * A.D. |
+ *
+ *
+ */
+ format: function (value, format, culture) {
+ return globalize.format(value, format, culture || activeCulture);
+ },
+
+ /**
+ * @ngdoc function
+ * @name w20CoreCulture.service:CultureService#parseInt
+ * @methodOf w20CoreCulture.service:CultureService
+ * @param {String} value The value to parse as an integer.
+ * @param {int} [radix] The radix used for the conversion (10 by default).
+ * @param {String} [culture] If specified this culture selector will be used to do the parsing.
+ * @returns {int} The integer parsed.
+ *
+ * @description
+ *
+ * Parses a string representing a whole number in the given radix (10 by default),
+ * taking into account any formatting rules followed by the given culture (or the
+ * current culture, if not specified).
+ *
+ * // assuming a culture where "," is the group separator
+ * // and "." is the decimal separator
+ * CultureService.parseInt( "1,234.56" ); // 1234
+ * // assuming a culture where "." is the group separator
+ * // and "," is the decimal separator
+ * CultureService.parseInt( "1.234,56" ); // 1234
+ */
+ parseInt: function (value, radix, culture) {
+ return globalize.parseInt(value, radix, culture || activeCulture);
+ },
+
+ /**
+ * @ngdoc function
+ * @name w20CoreCulture.service:CultureService#parseFloat
+ * @methodOf w20CoreCulture.service:CultureService
+ * @param {String} value The value to parse as a float.
+ * @param {int} [radix] The radix used for the conversion (10 by default).
+ * @param {String} [culture] If specified this culture selector will be used to do the parsing.
+ * @returns {Number} The float parsed.
+ *
+ * @description
+ *
+ * Parses a string representing a floating point number in the given radix (10 by
+ * default), taking into account any formatting rules followed by the given
+ * culture (or the current culture, if not specified).
+ *
+ * // assuming a culture where "," is the group separator
+ * // and "." is the decimal separator
+ * CultureService.parseFloat( "1,234.56" ); // 1234.56
+ * // assuming a culture where "." is the group separator
+ * // and "," is the decimal separator
+ * CultureService.parseFloat( "1.234,56" ); // 1234.56
+ */
+ parseFloat: function (value, radix, culture) {
+ return globalize.parseFloat(value, radix, culture || activeCulture);
+ },
+ /**
+ * @ngdoc function
+ * @name w20CoreCulture.service:CultureService#culture
+ * @methodOf w20CoreCulture.service:CultureService
+ * @param {String} value The value to parse as a date.
+ * @param {String} [formats] The formats used to do the parsing.
+ * @param {String} [culture] If specified this culture selector will be used to do the parsing.
+ * @returns {Date} The date object parsed.
+ *
+ * @description
+ *
+ * Parses a string representing a date into a JavaScript Date object, taking into
+ * account the given possible formats (or the given culture's set of default
+ * formats if not given). As before, the current culture is used if one is not
+ * specified.
+ *
+ * cultureService.culture( "en" );
+ * cultureService.parseDate( "1/2/2003" ); // Thu Jan 02 2003
+ * cultureService.culture( "fr" );
+ * cultureService.parseDate( "1/2/2003" ); // Sat Feb 01 2003
+ */
+ parseDate: function (value, formats, culture) {
+ return globalize.parseDate(value, formats, culture || activeCulture);
+ },
+
+ /**
+ * @ngdoc function
+ * @name w20CoreCulture.service:CultureService#addCultureInfo
+ * @methodOf w20CoreCulture.service:CultureService
+ * @param {String} [cultureName] If supplied it will create a culture with this name.
+ * @param {String} [baseCultureName] If supplied it will extend this culture to create the new one.
+ * @param {String} info The culture information to add, according to the culture object format.
+ *
+ * @description
+ *
+ * This method allows you to create a new culture based on an existing culture or add to existing culture info.
+ * If the optional argument `baseCultureName` is not supplied, it will extend the existing culture if it
+ * exists or create a new culture based on the default culture if it doesn't exist. If `cultureName` is not
+ * supplied, it will add the supplied info to the current culture.
+ */
+ addCultureInfo: function (cultureName, baseCultureName, info) {
+ return globalize.addCultureInfo(cultureName, baseCultureName, info);
+ },
+
+ /**
+ * @ngdoc function
+ * @name w20CoreCulture.service:CultureService#displayName
+ * @methodOf w20CoreCulture.service:CultureService
+ * @param {String} object The object to compute the display name of.
+ * @param {String} [values] The values used to localize the i18n key if any.
+ * @returns {String} The display name of the object.
+ *
+ * @description
+ *
+ * Compute the display name of an object by following these steps:
+ *
+ * * Return its `label` attribute if it exists, or,
+ * * Return the localized form of its `i18n` attribute if it exists, or,
+ * * Return an empty string.
+ */
+ displayName: function (object, values) {
+ if (typeof object.label !== 'undefined') {
+ return object.label;
+ }
+ else if (typeof object.i18n !== 'undefined') {
+ return service.localize(object.i18n, values);
+ }
+ else {
+ return '';
+ }
}
- }
- };
+ };
return service;
}]);
@@ -1247,19 +1281,6 @@ define([
angularModules: ['w20CoreCulture'],
lifecycle: {
pre: function (modules, fragments, callback) {
- allBundles = {};
- availableCultures = [];
- availableCultureObjects = [];
- loadedCultures = [];
-
- function addBundles(language, newBundles) {
- if (typeof allBundles[language] === 'undefined') {
- allBundles[language] = [];
- }
-
- allBundles[language] = allBundles[language].concat(newBundles);
- }
-
// gather all fragments bundles and add them to the configuration
_.each(fragments || {}, function (fragment) {
if (typeof fragment.definition.i18n === 'string') {
@@ -1279,7 +1300,6 @@ define([
}), function (elt) {
return '{globalize}/cultures/globalize.culture.' + elt;
}), function () {
-
availableCultures = _.pluck(_.filter(globalize.cultures, function (elt, key) {
return key !== 'default' && (key !== 'en' || _.contains(config.available, 'en'));
}), 'name');
@@ -1288,29 +1308,17 @@ define([
return globalize.cultures[name];
});
- if (window.localStorage) {
- persistedCulture = localStorage.getItem('w20.state.' + w20.fragments['w20-core'].configuration.modules.application.id + '.culture');
- if (persistedCulture) {
- persistedCulture = globalize.findClosestCulture(JSON.parse(persistedCulture).first);
- persistedCulture = _.contains(availableCultureObjects, persistedCulture) ? persistedCulture : undefined;
- }
- }
-
if (typeof config['default'] !== 'undefined') {
defaultCulture = globalize.findClosestCulture(config['default']) || defaultCulture;
- }
- else {
+ } else {
defaultCulture = globalize.findClosestCulture(window.navigator.language || window.navigator.userLanguage) || defaultCulture;
}
- w20.console.log('Available cultures: ' + availableCultures);
-
- var culturesToLoad = [persistedCulture || defaultCulture];
- if (config.translationFallback === true) {
- culturesToLoad.push(defaultCulture);
+ var bundlesToLoad = [getPreferredCulture()];
+ if (translationFallback === true) {
+ bundlesToLoad.push(defaultCulture);
}
-
- $.when.apply(undefined, _.uniq(culturesToLoad, false, 'name').map(loadCultureBundles)).then(function (persistedCulture, defaultCulture) {
+ $.when.apply(undefined, _.uniq(bundlesToLoad, false, 'name').map(loadCultureBundles)).then(function (persistedCulture, defaultCulture) {
switchCulture(persistedCulture || defaultCulture).done(function (culture) {
w20CoreCulture.config(['$provide', function ($provide) {
// define $locale values based on default culture
diff --git a/modules/env.js b/modules/env.js
index 4835c9f..3639963 100644
--- a/modules/env.js
+++ b/modules/env.js
@@ -43,7 +43,7 @@ define([
*
*
*/
- var w20CoreEnv = angular.module('w20CoreEnv', [ 'w20CoreSecurity', 'w20CoreApplication' ]),
+ var w20CoreEnv = angular.module('w20CoreEnv', ['w20CoreSecurity', 'w20CoreApplication']),
config = module && module.config() || {};
/**
@@ -81,7 +81,7 @@ define([
* The StateService provides key/value storage for data that needs to be persisted across sessions.
*
*/
- w20CoreEnv.factory('StateService', [ '$rootScope', '$log', '$window', 'ApplicationService', function ($rootScope, $log, $window, applicationService) {
+ w20CoreEnv.factory('StateService', ['$rootScope', '$log', '$window', 'ApplicationService', function ($rootScope, $log, $window, applicationService) {
var states = {};
return {
@@ -114,7 +114,7 @@ define([
throw new Error('Key argument is required for using a state, got undefined');
}
- var prefix = 'w20.state.' + applicationService.applicationId + '.' + namespace,
+ var prefix = 'w20.' + applicationService.applicationId + '.state.' + namespace,
storage = session ? $window.sessionStorage : $window.localStorage;
if (!storage) {
@@ -172,7 +172,7 @@ define([
}
if (typeof states[namespace] === 'undefined') {
- states[namespace] = $window.localStorage.getItem('w20.state.' + applicationService.applicationId + '.' + namespace) || {};
+ states[namespace] = $window.localStorage.getItem('w20.' + applicationService.applicationId + '.state.' + namespace) || {};
}
return _.keys(states[namespace]);
@@ -190,7 +190,7 @@ define([
* The PreferencesService provides an abstraction over the StateService dedicated to application preference storage.
*
*/
- w20CoreEnv.factory('PreferencesService', [ 'StateService',
+ w20CoreEnv.factory('PreferencesService', ['StateService',
function (stateService) {
var preferences = {}, icons = {}, meta = {};
@@ -323,7 +323,7 @@ define([
* uses AngularJS events on the root scope.
*
*/
- w20CoreEnv.factory('EventService', [ '$rootScope', '$injector', function ($rootScope, $injector) {
+ w20CoreEnv.factory('EventService', ['$rootScope', '$injector', function ($rootScope, $injector) {
var viewListeners = [];
$rootScope.$on('$routeChangeSuccess', function () {
@@ -407,7 +407,7 @@ define([
return deregisterFn;
}
};
- } ]);
+ }]);
/**
* @ngdoc service
@@ -422,7 +422,7 @@ define([
* * unknown : the application connectivity state is unknown.
*
*/
- w20CoreEnv.factory('ConnectivityService', [ '$window', '$log', 'EventService', function ($window, $log, eventService) {
+ w20CoreEnv.factory('ConnectivityService', ['$window', '$log', 'EventService', function ($window, $log, eventService) {
var beforeSendTime, lastState = {
httpStatus: undefined,
online: undefined,
@@ -516,15 +516,15 @@ define([
return lastState;
}
};
- } ]);
+ }]);
- w20CoreEnv.run([ 'ConnectivityService', '$window', '$injector', '$rootScope', function (connectivityService, $window, $injector, $rootScope) {
+ w20CoreEnv.run(['ConnectivityService', '$window', '$injector', '$rootScope', function (connectivityService, $window, $injector, $rootScope) {
w20.injector = $injector;
Object.getPrototypeOf($rootScope).$safeApply = function (fn) {
fn = fn || function () {
- };
+ };
if (this.$$phase) {
fn();
}
@@ -541,9 +541,9 @@ define([
});
connectivityService.check();
- } ]);
+ }]);
return {
- angularModules: [ 'w20CoreEnv' ]
+ angularModules: ['w20CoreEnv']
};
});
diff --git a/modules/security.js b/modules/security.js
index e089276..29e8987 100644
--- a/modules/security.js
+++ b/modules/security.js
@@ -31,8 +31,6 @@ define([
*
* Authentication is handled through authentication providers. You can register additional providers with the API.
*
- * BasicAuthentication provider is built-in and handles http basic authentication.
- *
* Configuration
* -------------
*
@@ -61,53 +59,68 @@ define([
* }
* }
*
+ * Basic authentication
+ * --------------------
+ *
+ * A provider handling basic authentication is built-in and available under the name `BasicAuthentication`. Its
+ * configuration in the fragment definition is as follows:
+ *
+ * "security" : {
+ * "provider" : "BasicAuthentication",
+ * "config" : {
+ * "authentication": "url/of/the/authentication/resource",
+ * "authorizations" : "url/of/the/authorizations/resource",
+ * "clearCredentials": true|false
+ * }
+ * }
+ *
+ * The authentication resource is where the basic authentication challenge must take place:
+ *
+ * * The first request issued to this resource is a GET without credentials,
+ * * The resource triggers the credentials input dialog of the browser by returning a 401 status code,
+ * * The browser issues a second GET request with the entered credentials to the resource which will return either
+ * a success status code (200 or 204) if the credentials are valid, or return a 401 status code again if credentials
+ * are invalid.
+ *
+ * Upon logout a DELETE request is made to the authentication resource which must invalidate the server-side security
+ * session for the authenticated subject. The resource must return a success status code (200 or 204) upon successful
+ * logout. A best-effort try is made to force the browser to forget the credentials but keep in mind that this is not
+ * standardized across browsers and may not work under some circumstances. To disable this attempt, specify `false`
+ * in the `clearCredentials` option.
+ *
+ * The authorizations resource is requested after successful authentication to return the profile of the authenticated
+ * subject along with its authorizations.
*/
var w20CoreSecurity = angular.module('w20CoreSecurity', ['w20CoreEnv', 'ngResource']),
config = module && module.config() || {},
allProviders = {},
allRealms = {};
- var BasicAuthenticationProvider = ['$resource', '$document', '$q', function ($resource, $document, $q) {
+ var BasicAuthenticationProvider = ['$resource', '$window', '$q', function ($resource, $window, $q) {
var AuthenticationResource, AuthorizationsResource, realm, authenticationUrl, clearCredentials;
- function doCleanCredentials(loginUrl) {
- var done;
-
- // For IE/Edge browsers
- if ($document.execCommand) {
- done = $document.execCommand('ClearAuthenticationCache', 'false');
- }
-
- // Others
- if (!done) {
- $.ajax({
- type: 'GET',
- url: loginUrl,
- async: true,
- username: 'logmeout',
- password: '123456',
- headers: { Authorization: 'Basic xxx' }
- });
+ function randomString(length) {
+ var chars = [];
+ var possible = 'abcdefghijklmnopqrstuvwxyz0123456789';
+ for (var i = 0; i < length; i++) {
+ chars[i] = possible.charAt(Math.floor(Math.random() * possible.length));
}
+ return chars.join('');
}
return {
setConfig: function (providerConfig) {
-
- clearCredentials = providerConfig.clearCredentials;
+ clearCredentials = providerConfig.clearCredentials || true;
if (typeof providerConfig.authentication === 'undefined') {
throw new Error('Authentication URL is required for BasicAuthentication provider, got undefined');
}
-
authenticationUrl = require.toUrl(providerConfig.authentication).replace(/:(?!\/\/)/, '\\:');
-
AuthenticationResource = $resource(authenticationUrl);
if (typeof providerConfig.authorizations === 'undefined') {
throw new Error('Authorizations URL is required for BasicAuthentication provider, got undefined');
}
-
AuthorizationsResource = $resource(require.toUrl(providerConfig.authorizations).replace(/:(?!\/\/)/, '\\:'));
},
@@ -141,7 +154,18 @@ define([
var deferred = $q.defer();
AuthenticationResource.remove(function () {
if (clearCredentials) {
- doCleanCredentials(authenticationUrl);
+ if (!$window.document.execCommand('ClearAuthenticationCache', 'false')) {
+ $.ajax({
+ type: 'GET',
+ url: authenticationUrl,
+ async: true,
+ username: randomString(8),
+ password: randomString(8),
+ headers: {
+ Authorization: 'Basic ' + randomString(20)
+ }
+ });
+ }
}
deferred.resolve(realm);
}, function () {
diff --git a/specs/culture.spec.js b/specs/culture.spec.js
index 7efedb6..725a068 100644
--- a/specs/culture.spec.js
+++ b/specs/culture.spec.js
@@ -10,8 +10,9 @@ define([
'{angular}/angular',
'w20',
'{w20-core}/modules/culture',
+ '{w20-core}/modules/application',
'{angular-mocks}/angular-mocks'
-], function (angular, w20, culture) {
+], function (angular, w20, culture, application) {
'use strict';
describe('The Culture Service', function () {
@@ -68,13 +69,13 @@ define([
expect($rootScope.$emit).toHaveBeenCalledWith('w20.culture.culture-changed', cultureService.culture());
});
- it('should persist the culture name to local storage when switching culture', function(done) {
+ it('should persist the culture name to local storage when switching culture', function (done) {
expect(cultureService.culture().name).toBe('en-GB');
- expect(localStorage.getItem('w20.state.' + w20.fragments['w20-core'].configuration.modules.application.id + '.culture')).toBeNull();
+ expect(localStorage.getItem('w20.' + application.id + '.preferred-culture')).toBeNull();
var unregister = $rootScope.$on('w20.culture.culture-changed', function () {
expect(cultureService.culture().name).toBe('fr-FR');
- expect(JSON.parse(localStorage.getItem('w20.state.' + w20.fragments['w20-core'].configuration.modules.application.id + '.culture'))).toEqual({first:cultureService.culture().name});
+ expect(localStorage.getItem('w20.' + application.id + '.preferred-culture')).toEqual(cultureService.culture().name);
unregister();
done();
});
diff --git a/test-main.js b/test-main.js
index 9699c9c..1df9054 100644
--- a/test-main.js
+++ b/test-main.js
@@ -27,7 +27,8 @@ window.w20 = {
'en-GB',
'fr-FR'
],
- default: 'en-GB'
+ default: 'en-GB',
+ translationFallback: true
},
ui: {
'expandedRouteCategories': ['category1.category11']