Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit d7d9ee1

Browse files
committed
Merge pull request #74 from RWOverdijk/hotfix/release
Hotfix/release
2 parents 6fa3a36 + 31c098d commit d7d9ee1

14 files changed

+288
-184
lines changed

dist/amd/aurelia-authentication.d.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,25 @@ declare module 'aurelia-authentication' {
1212
import {
1313
Redirect
1414
} from 'aurelia-router';
15+
export class authUtils {
16+
static isDefined(value: any): any;
17+
static camelCase(name: any): any;
18+
static parseQueryString(keyValue: any): any;
19+
static isString(value: any): any;
20+
static isObject(value: any): any;
21+
static isArray: any;
22+
static isFunction(value: any): any;
23+
static joinUrl(baseUrl: any, url: any): any;
24+
static isBlankObject(value: any): any;
25+
static isArrayLike(obj: any): any;
26+
static isWindow(obj: any): any;
27+
static extend(dst: any): any;
28+
static merge(dst: any): any;
29+
static forEach(obj: any, iterator: any, context: any): any;
30+
}
1531
export class AuthFilterValueConverter {
1632
toView(routes: any, isAuthenticated: any): any;
1733
}
18-
export {
19-
authUtils
20-
};
2134
export class BaseConfig {
2235
configure(incomingConfig: any): any;
2336
current: any;

dist/amd/authUtils.js

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ define(['exports'], function (exports) {
1111
return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
1212
};
1313

14+
function _classCallCheck(instance, Constructor) {
15+
if (!(instance instanceof Constructor)) {
16+
throw new TypeError("Cannot call a class as a function");
17+
}
18+
}
19+
20+
var _class, _temp;
21+
1422
var slice = [].slice;
1523

1624
function setHashKey(obj, h) {
@@ -49,18 +57,22 @@ define(['exports'], function (exports) {
4957
return dst;
5058
}
5159

52-
var authUtils = {
53-
isDefined: function isDefined(value) {
60+
var authUtils = exports.authUtils = (_temp = _class = function () {
61+
function authUtils() {
62+
_classCallCheck(this, authUtils);
63+
}
64+
65+
authUtils.isDefined = function isDefined(value) {
5466
return typeof value !== 'undefined';
55-
},
67+
};
5668

57-
camelCase: function camelCase(name) {
69+
authUtils.camelCase = function camelCase(name) {
5870
return name.replace(/([\:\-\_]+(.))/g, function (_, separator, letter, offset) {
5971
return offset ? letter.toUpperCase() : letter;
6072
});
61-
},
73+
};
6274

63-
parseQueryString: function parseQueryString(keyValue) {
75+
authUtils.parseQueryString = function parseQueryString(keyValue) {
6476
var obj = {};
6577
var key = void 0;
6678
var value = void 0;
@@ -73,22 +85,21 @@ define(['exports'], function (exports) {
7385
}
7486
});
7587
return obj;
76-
},
88+
};
7789

78-
isString: function isString(value) {
90+
authUtils.isString = function isString(value) {
7991
return typeof value === 'string';
80-
},
92+
};
8193

82-
isObject: function isObject(value) {
94+
authUtils.isObject = function isObject(value) {
8395
return value !== null && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object';
84-
},
85-
isArray: Array.isArray,
96+
};
8697

87-
isFunction: function isFunction(value) {
98+
authUtils.isFunction = function isFunction(value) {
8899
return typeof value === 'function';
89-
},
100+
};
90101

91-
joinUrl: function joinUrl(baseUrl, url) {
102+
authUtils.joinUrl = function joinUrl(baseUrl, url) {
92103
if (/^(?:[a-z]+:)?\/\//i.test(url)) {
93104
return url;
94105
}
@@ -100,25 +111,31 @@ define(['exports'], function (exports) {
100111
};
101112

102113
return normalize(joined);
103-
},
104-
isBlankObject: function isBlankObject(value) {
114+
};
115+
116+
authUtils.isBlankObject = function isBlankObject(value) {
105117
return value !== null && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && !Object.getPrototypeOf(value);
106-
},
107-
isArrayLike: function isArrayLike(obj) {
118+
};
119+
120+
authUtils.isArrayLike = function isArrayLike(obj) {
108121
if (obj === null || authUtils.isWindow(obj)) {
109122
return false;
110123
}
111-
},
112-
isWindow: function isWindow(obj) {
124+
};
125+
126+
authUtils.isWindow = function isWindow(obj) {
113127
return obj && obj.window === obj;
114-
},
115-
extend: function extend(dst) {
128+
};
129+
130+
authUtils.extend = function extend(dst) {
116131
return baseExtend(dst, slice.call(arguments, 1), false);
117-
},
118-
merge: function merge(dst) {
132+
};
133+
134+
authUtils.merge = function merge(dst) {
119135
return baseExtend(dst, slice.call(arguments, 1), true);
120-
},
121-
forEach: function (_forEach) {
136+
};
137+
138+
authUtils.forEach = function (_forEach) {
122139
function forEach(_x, _x2, _x3) {
123140
return _forEach.apply(this, arguments);
124141
}
@@ -168,9 +185,8 @@ define(['exports'], function (exports) {
168185
}
169186
}
170187
}
171-
})
172-
173-
};
188+
});
174189

175-
exports.authUtils = authUtils;
190+
return authUtils;
191+
}(), _class.isArray = Array.isArray, _temp);
176192
});

dist/amd/baseConfig.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
6262

6363
signupRedirect: '#/login',
6464

65-
baseUrl: '/auth',
65+
baseUrl: '',
6666

67-
loginUrl: '/login',
67+
loginUrl: '/auth/login',
6868

69-
signupUrl: '/signup',
69+
signupUrl: '/auth/signup',
7070

71-
profileUrl: '/me',
71+
profileUrl: '/auth/me',
7272

73-
unlinkUrl: '/unlink/',
73+
unlinkUrl: '/auth/unlink/',
7474

7575
unlinkMethod: 'get',
7676

@@ -97,7 +97,7 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
9797
providers: {
9898
google: {
9999
name: 'google',
100-
url: '/google',
100+
url: '/auth/google',
101101
authorizationEndpoint: 'https://accounts.google.com/o/oauth2/auth',
102102
redirectUri: window.location.origin || window.location.protocol + '//' + window.location.host,
103103
scope: ['profile', 'email'],
@@ -115,7 +115,7 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
115115
},
116116
facebook: {
117117
name: 'facebook',
118-
url: '/facebook',
118+
url: '/auth/facebook',
119119
authorizationEndpoint: 'https://www.facebook.com/v2.3/dialog/oauth',
120120
redirectUri: window.location.origin + '/' || window.location.protocol + '//' + window.location.host + '/',
121121
scope: ['email'],
@@ -133,7 +133,7 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
133133
},
134134
linkedin: {
135135
name: 'linkedin',
136-
url: '/linkedin',
136+
url: '/auth/linkedin',
137137
authorizationEndpoint: 'https://www.linkedin.com/uas/oauth2/authorization',
138138
redirectUri: window.location.origin || window.location.protocol + '//' + window.location.host,
139139
requiredUrlParams: ['state'],
@@ -148,7 +148,7 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
148148
},
149149
github: {
150150
name: 'github',
151-
url: '/github',
151+
url: '/auth/github',
152152
authorizationEndpoint: 'https://github.com/login/oauth/authorize',
153153
redirectUri: window.location.origin || window.location.protocol + '//' + window.location.host,
154154
optionalUrlParams: ['scope'],
@@ -162,7 +162,7 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
162162
},
163163
yahoo: {
164164
name: 'yahoo',
165-
url: '/yahoo',
165+
url: '/auth/yahoo',
166166
authorizationEndpoint: 'https://api.login.yahoo.com/oauth2/request_auth',
167167
redirectUri: window.location.origin || window.location.protocol + '//' + window.location.host,
168168
scope: [],
@@ -175,7 +175,7 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
175175
},
176176
twitter: {
177177
name: 'twitter',
178-
url: '/twitter',
178+
url: '/auth/twitter',
179179
authorizationEndpoint: 'https://api.twitter.com/oauth/authenticate',
180180
type: '1.0',
181181
popupOptions: {
@@ -200,7 +200,7 @@ define(['exports', './authUtils'], function (exports, _authUtils) {
200200
},
201201
instagram: {
202202
name: 'instagram',
203-
url: '/instagram',
203+
url: '/auth/instagram',
204204
authorizationEndpoint: 'https://api.instagram.com/oauth/authorize',
205205
redirectUri: window.location.origin || window.location.protocol + '//' + window.location.host,
206206
requiredUrlParams: ['scope'],

dist/commonjs/aurelia-authentication.d.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,25 @@ declare module 'aurelia-authentication' {
1212
import {
1313
Redirect
1414
} from 'aurelia-router';
15+
export class authUtils {
16+
static isDefined(value: any): any;
17+
static camelCase(name: any): any;
18+
static parseQueryString(keyValue: any): any;
19+
static isString(value: any): any;
20+
static isObject(value: any): any;
21+
static isArray: any;
22+
static isFunction(value: any): any;
23+
static joinUrl(baseUrl: any, url: any): any;
24+
static isBlankObject(value: any): any;
25+
static isArrayLike(obj: any): any;
26+
static isWindow(obj: any): any;
27+
static extend(dst: any): any;
28+
static merge(dst: any): any;
29+
static forEach(obj: any, iterator: any, context: any): any;
30+
}
1531
export class AuthFilterValueConverter {
1632
toView(routes: any, isAuthenticated: any): any;
1733
}
18-
export {
19-
authUtils
20-
};
2134
export class BaseConfig {
2235
configure(incomingConfig: any): any;
2336
current: any;

0 commit comments

Comments
 (0)