Merge pull request #15 from kylecorbelli/add-react-native-support
Add react native support
This commit is contained in:
commit
f62a136ac2
78
dist/AsyncLocalStorage.js
vendored
Normal file
78
dist/AsyncLocalStorage.js
vendored
Normal file
|
@ -0,0 +1,78 @@
|
|||
"use strict";
|
||||
// import { AsyncStorage } from 'react-native'
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Rip this out into its own npm package:
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
var AsyncLocalStorage = {
|
||||
getItem: function (key) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var value = window.localStorage.getItem(key);
|
||||
resolve(value);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
setItem: function (key, value) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
window.localStorage.setItem(key, value);
|
||||
resolve(value);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
removeItem: function (key) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var value = window.localStorage.getItem(key);
|
||||
window.localStorage.removeItem(key);
|
||||
resolve(value);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
clear: function () { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
window.localStorage.clear();
|
||||
resolve(true);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
getAllKeys: function () { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var allKeys = Object.keys(window.localStorage);
|
||||
resolve(allKeys);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
multiGet: function (keys) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var values = keys.map(function (key) { return [key, window.localStorage.getItem(key)]; });
|
||||
resolve(values);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
multiSet: function (keyValuePairs) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
keyValuePairs.forEach(function (keyValuePair) { return window.localStorage.setItem(keyValuePair[0], keyValuePair[1]); });
|
||||
var newKeyValuePairs = keyValuePairs.map(function (keyValuePair) { return [keyValuePair[0], window.localStorage.getItem(keyValuePair[0])]; });
|
||||
resolve(newKeyValuePairs);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
};
|
||||
exports.default = AsyncLocalStorage;
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// ^ Rip this out into its own npm package
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//# sourceMappingURL=AsyncLocalStorage.js.map
|
1
dist/AsyncLocalStorage.js.map
vendored
Normal file
1
dist/AsyncLocalStorage.js.map
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
{"version":3,"file":"AsyncLocalStorage.js","sourceRoot":"","sources":["../src/AsyncLocalStorage.ts"],"names":[],"mappings":"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"}
|
79
dist/Storage.js
vendored
Normal file
79
dist/Storage.js
vendored
Normal file
|
@ -0,0 +1,79 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
var react_native_1 = require("react-native");
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Rip this out into its own npm package:
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
var AsyncLocalStorage = {
|
||||
getItem: function (key) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var value = window.localStorage.getItem(key);
|
||||
resolve(value);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
setItem: function (key, value) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
window.localStorage.setItem(key, value);
|
||||
resolve(value);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
removeItem: function (key) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var value = window.localStorage.getItem(key);
|
||||
window.localStorage.removeItem(key);
|
||||
resolve(value);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
clear: function () { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
window.localStorage.clear();
|
||||
resolve(true);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
getAllKeys: function () { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var allKeys = Object.keys(window.localStorage);
|
||||
resolve(allKeys);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
multiGet: function (keys) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
var values = keys.map(function (key) { return [key, window.localStorage.getItem(key)]; });
|
||||
resolve(values);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
multiSet: function (keyValuePairs) { return new Promise(function (resolve, reject) {
|
||||
try {
|
||||
keyValuePairs.forEach(function (keyValuePair) { return window.localStorage.setItem(keyValuePair[0], keyValuePair[1]); });
|
||||
var newKeyValuePairs = keyValuePairs.map(function (keyValuePair) { return [keyValuePair[0], window.localStorage.getItem(keyValuePair[0])]; });
|
||||
resolve(newKeyValuePairs);
|
||||
}
|
||||
catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}); },
|
||||
};
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// ^ Rip this out into its own npm package
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
var Storage = window.localStorage ? AsyncLocalStorage : react_native_1.AsyncStorage;
|
||||
exports.default = Storage;
|
||||
//# sourceMappingURL=Storage.js.map
|
1
dist/Storage.js.map
vendored
Normal file
1
dist/Storage.js.map
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
{"version":3,"file":"Storage.js","sourceRoot":"","sources":["../src/Storage.ts"],"names":[],"mappings":"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"}
|
102
dist/actions.js
vendored
102
dist/actions.js
vendored
|
@ -34,9 +34,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|||
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
||||
}
|
||||
};
|
||||
var _this = this;
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
var axios_1 = require("axios");
|
||||
var types_1 = require("./types");
|
||||
var AsyncLocalStorage_1 = require("./AsyncLocalStorage");
|
||||
var auth_1 = require("./services/auth"); // <- maybe this is where you pass in the platform paramter, specifying if it is for a browser or for React Native
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Pure Redux actions:
|
||||
|
@ -89,20 +91,9 @@ exports.signOutRequestFailed = function () { return ({
|
|||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Async Redux Thunk actions:
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// what is the second argument here? it needs to contain configs for (1) userRegistrationDetails, (2) userAttributes, (3) maybe even the authUrl... just make it a simple one-argument function
|
||||
// we'll also want the userAttributes to pertain to the end-user's initial state and heaven forbid reducers
|
||||
// actually, userSignInCredentials, userSignOutCredentials, and verificationParams are always the same as per devise token auth
|
||||
// const config = {
|
||||
// authUrl: 'http://url.com',
|
||||
// userAttributes: {
|
||||
// firstName: 'name' // <- key is how the frontend knows it, value is how the backend knows it
|
||||
// },
|
||||
// userRegistrationAttributes: { <- this is for keys/vals IN ADDITION TO email, password and passwordConfirmation
|
||||
// firstName: 'name'
|
||||
// },
|
||||
// }
|
||||
var generateAuthActions = function (config) {
|
||||
var authUrl = config.authUrl, userAttributes = config.userAttributes, userRegistrationAttributes = config.userRegistrationAttributes;
|
||||
var authUrl = config.authUrl, storage = config.storage, userAttributes = config.userAttributes, userRegistrationAttributes = config.userRegistrationAttributes;
|
||||
var Storage = Boolean(storage.flushGetRequests) ? storage : AsyncLocalStorage_1.default;
|
||||
var registerUser = function (userRegistrationDetails) { return function (dispatch) {
|
||||
return __awaiter(this, void 0, void 0, function () {
|
||||
var email, password, passwordConfirmation, data, response, userAttributesToSave, error_1;
|
||||
|
@ -132,7 +123,7 @@ var generateAuthActions = function (config) {
|
|||
response = _a.sent();
|
||||
auth_1.setAuthHeaders(response.headers);
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
auth_1.persistAuthHeadersInLocalStorage(response.headers);
|
||||
auth_1.persistAuthHeadersInDeviceStorage(Storage, response.headers);
|
||||
userAttributesToSave = auth_1.getUserAttributesFromResponse(userAttributes, response);
|
||||
dispatch(exports.registrationRequestSucceeded(userAttributesToSave)); // <- need to make this reducer more flexible
|
||||
return [3 /*break*/, 4];
|
||||
|
@ -164,7 +155,7 @@ var generateAuthActions = function (config) {
|
|||
response = _a.sent();
|
||||
auth_1.setAuthHeaders(response.headers);
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
auth_1.persistAuthHeadersInLocalStorage(response.headers);
|
||||
auth_1.persistAuthHeadersInDeviceStorage(Storage, response.headers);
|
||||
userAttributesToSave = auth_1.getUserAttributesFromResponse(userAttributes, response);
|
||||
dispatch(exports.verifyTokenRequestSucceeded(userAttributesToSave));
|
||||
return [3 /*break*/, 4];
|
||||
|
@ -200,7 +191,7 @@ var generateAuthActions = function (config) {
|
|||
response = _a.sent();
|
||||
auth_1.setAuthHeaders(response.headers);
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
auth_1.persistAuthHeadersInLocalStorage(response.headers);
|
||||
auth_1.persistAuthHeadersInDeviceStorage(Storage, response.headers);
|
||||
userAttributesToSave = auth_1.getUserAttributesFromResponse(userAttributes, response);
|
||||
dispatch(exports.signInRequestSucceeded(userAttributesToSave));
|
||||
return [3 /*break*/, 4];
|
||||
|
@ -215,51 +206,72 @@ var generateAuthActions = function (config) {
|
|||
}; };
|
||||
var signOutUser = function () { return function (dispatch) {
|
||||
return __awaiter(this, void 0, void 0, function () {
|
||||
var userSignOutCredentials, error_4;
|
||||
return __generator(this, function (_a) {
|
||||
switch (_a.label) {
|
||||
var userSignOutCredentials, _a, _b, error_4;
|
||||
return __generator(this, function (_c) {
|
||||
switch (_c.label) {
|
||||
case 0:
|
||||
userSignOutCredentials = {
|
||||
'access-token': localStorage.getItem('access-token'),
|
||||
client: localStorage.getItem('client'),
|
||||
uid: localStorage.getItem('uid'),
|
||||
};
|
||||
dispatch(exports.signOutRequestSent());
|
||||
_a.label = 1;
|
||||
_a = {};
|
||||
_b = 'access-token';
|
||||
return [4 /*yield*/, Storage.getItem('access-token')];
|
||||
case 1:
|
||||
_a.trys.push([1, 3, , 4]);
|
||||
_a[_b] = (_c.sent());
|
||||
return [4 /*yield*/, Storage.getItem('client')];
|
||||
case 2:
|
||||
_a.client = (_c.sent());
|
||||
return [4 /*yield*/, Storage.getItem('uid')];
|
||||
case 3:
|
||||
userSignOutCredentials = (_a.uid = (_c.sent()),
|
||||
_a);
|
||||
dispatch(exports.signOutRequestSent());
|
||||
_c.label = 4;
|
||||
case 4:
|
||||
_c.trys.push([4, 6, , 7]);
|
||||
return [4 /*yield*/, axios_1.default({
|
||||
method: 'DELETE',
|
||||
url: authUrl + "/sign_out",
|
||||
data: userSignOutCredentials,
|
||||
})];
|
||||
case 2:
|
||||
_a.sent();
|
||||
case 5:
|
||||
_c.sent();
|
||||
auth_1.deleteAuthHeaders();
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
auth_1.deleteAuthHeadersFromLocalStorage();
|
||||
auth_1.deleteAuthHeadersFromLocalStorage(Storage);
|
||||
dispatch(exports.signOutRequestSucceeded());
|
||||
return [3 /*break*/, 4];
|
||||
case 3:
|
||||
error_4 = _a.sent();
|
||||
return [3 /*break*/, 7];
|
||||
case 6:
|
||||
error_4 = _c.sent();
|
||||
dispatch(exports.signOutRequestFailed());
|
||||
throw error_4;
|
||||
case 4: return [2 /*return*/];
|
||||
case 7: return [2 /*return*/];
|
||||
}
|
||||
});
|
||||
});
|
||||
}; };
|
||||
var verifyCredentials = function (store) {
|
||||
// Gotta check what the platform is:
|
||||
if (localStorage.getItem('access-token')) {
|
||||
var verificationParams = {
|
||||
'access-token': localStorage.getItem('access-token'),
|
||||
client: localStorage.getItem('client'),
|
||||
uid: localStorage.getItem('uid'),
|
||||
};
|
||||
store.dispatch(verifyToken(verificationParams));
|
||||
}
|
||||
};
|
||||
var verifyCredentials = function (store) { return __awaiter(_this, void 0, void 0, function () {
|
||||
var verificationParams, _a, _b;
|
||||
return __generator(this, function (_c) {
|
||||
switch (_c.label) {
|
||||
case 0: return [4 /*yield*/, Storage.getItem('access-token')];
|
||||
case 1:
|
||||
if (!_c.sent()) return [3 /*break*/, 5];
|
||||
_a = {};
|
||||
_b = 'access-token';
|
||||
return [4 /*yield*/, Storage.getItem('access-token')];
|
||||
case 2:
|
||||
_a[_b] = (_c.sent());
|
||||
return [4 /*yield*/, Storage.getItem('client')];
|
||||
case 3:
|
||||
_a.client = (_c.sent());
|
||||
return [4 /*yield*/, Storage.getItem('uid')];
|
||||
case 4:
|
||||
verificationParams = (_a.uid = (_c.sent()),
|
||||
_a);
|
||||
store.dispatch(verifyToken(verificationParams));
|
||||
_c.label = 5;
|
||||
case 5: return [2 /*return*/];
|
||||
}
|
||||
});
|
||||
}); };
|
||||
return {
|
||||
registerUser: registerUser,
|
||||
verifyToken: verifyToken,
|
||||
|
|
2
dist/actions.js.map
vendored
2
dist/actions.js.map
vendored
File diff suppressed because one or more lines are too long
54
dist/services/auth.js
vendored
54
dist/services/auth.js
vendored
|
@ -1,4 +1,40 @@
|
|||
"use strict";
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __generator = (this && this.__generator) || function (thisArg, body) {
|
||||
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
||||
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
||||
function verb(n) { return function (v) { return step([n, v]); }; }
|
||||
function step(op) {
|
||||
if (f) throw new TypeError("Generator is already executing.");
|
||||
while (_) try {
|
||||
if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
|
||||
if (y = 0, t) op = [0, t.value];
|
||||
switch (op[0]) {
|
||||
case 0: case 1: t = op; break;
|
||||
case 4: _.label++; return { value: op[1], done: false };
|
||||
case 5: _.label++; y = op[1]; op = [0]; continue;
|
||||
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
||||
default:
|
||||
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
||||
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
||||
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
||||
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
||||
if (t[2]) _.ops.pop();
|
||||
_.trys.pop(); continue;
|
||||
}
|
||||
op = body.call(thisArg, _);
|
||||
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
||||
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
||||
}
|
||||
};
|
||||
var _this = this;
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
var axios_1 = require("axios");
|
||||
var utility_1 = require("./utility");
|
||||
|
@ -15,9 +51,10 @@ exports.setAuthHeaders = function (headers) {
|
|||
});
|
||||
};
|
||||
// Will have to take a parameter from the package user to determine if this is for a browser or for React Native:
|
||||
exports.persistAuthHeadersInLocalStorage = function (headers) {
|
||||
exports.persistAuthHeadersInDeviceStorage = function (Storage, headers) {
|
||||
// use multiSet:
|
||||
authHeaderKeys.forEach(function (key) {
|
||||
localStorage.setItem(key, headers[key]);
|
||||
Storage.setItem(key, headers[key]);
|
||||
});
|
||||
};
|
||||
exports.deleteAuthHeaders = function () {
|
||||
|
@ -26,11 +63,16 @@ exports.deleteAuthHeaders = function () {
|
|||
});
|
||||
};
|
||||
// Will have to take a parameter from the package user to determine if this is for a browser or for React Native:
|
||||
exports.deleteAuthHeadersFromLocalStorage = function () {
|
||||
authHeaderKeys.forEach(function (key) {
|
||||
localStorage.removeItem(key);
|
||||
exports.deleteAuthHeadersFromLocalStorage = function (Storage) { return __awaiter(_this, void 0, void 0, function () {
|
||||
return __generator(this, function (_a) {
|
||||
// can use multiRemove once you've written it:
|
||||
authHeaderKeys.forEach(function (key) {
|
||||
Storage.removeItem(key);
|
||||
// localStorage.removeItem(key)
|
||||
});
|
||||
return [2 /*return*/];
|
||||
});
|
||||
};
|
||||
}); };
|
||||
exports.getUserAttributesFromResponse = function (userAttributes, response) {
|
||||
var invertedUserAttributes = utility_1.invertMapKeysAndValues(userAttributes);
|
||||
var userAttributesBackendKeys = Object.keys(invertedUserAttributes);
|
||||
|
|
2
dist/services/auth.js.map
vendored
2
dist/services/auth.js.map
vendored
|
@ -1 +1 @@
|
|||
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/services/auth.ts"],"names":[],"mappings":";;AAAA,+BAAyB;AACzB,qCAAkD;AAOlD,IAAM,cAAc,GAAkB;IACpC,cAAc;IACd,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,KAAK;CACN,CAAA;AAEY,QAAA,cAAc,GAAG,UAAC,OAAoB;IACjD,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;QACjC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,iHAAiH;AACpG,QAAA,gCAAgC,GAAG,UAAC,OAAoB;IACnE,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;QACjC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAEY,QAAA,iBAAiB,GAAG;IAC/B,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;QACjC,OAAO,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,iHAAiH;AACpG,QAAA,iCAAiC,GAAG;IAC/C,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;QACjC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAEY,QAAA,6BAA6B,GAAG,UAC3C,cAAoC,EACpC,QAAsB;IAEtB,IAAM,sBAAsB,GAAyB,gCAAsB,CAAC,cAAc,CAAC,CAAA;IAC3F,IAAM,yBAAyB,GAAa,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IAC/E,IAAM,sBAAsB,GAAyB,EAAE,CAAA;IACvD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAC,GAAW;QAClD,EAAE,CAAC,CAAC,yBAAyB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,sBAAsB,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC/E,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,sBAAsB,CAAA;AAC/B,CAAC,CAAA"}
|
||||
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/services/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iBA4DA;;AA5DA,+BAAyB;AACzB,qCAAkD;AAQlD,IAAM,cAAc,GAAkB;IACpC,cAAc;IACd,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,KAAK;CACN,CAAA;AAEY,QAAA,cAAc,GAAG,UAAC,OAAoB;IACjD,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;QACjC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,iHAAiH;AACpG,QAAA,iCAAiC,GAAG,UAAC,OAAsB,EAAE,OAAoB;IAC5F,gBAAgB;IAChB,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;QACjC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAEY,QAAA,iBAAiB,GAAG;IAC/B,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;QACjC,OAAO,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,iHAAiH;AACpG,QAAA,iCAAiC,GAAG,UAAO,OAAsB;;QAC5E,8CAA8C;QAC9C,cAAc,CAAC,OAAO,CAAC,UAAC,GAAW;YACjC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YACvB,+BAA+B;QACjC,CAAC,CAAC,CAAA;;;KACH,CAAA;AAEY,QAAA,6BAA6B,GAAG,UAC3C,cAAoC,EACpC,QAAsB;IAEtB,IAAM,sBAAsB,GAAyB,gCAAsB,CAAC,cAAc,CAAC,CAAA;IAC3F,IAAM,yBAAyB,GAAa,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IAC/E,IAAM,sBAAsB,GAAyB,EAAE,CAAA;IACvD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAC,GAAW;QAClD,EAAE,CAAC,CAAC,yBAAyB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,sBAAsB,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC/E,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,sBAAsB,CAAA;AAC/B,CAAC,CAAA"}
|
3435
package-lock.json
generated
3435
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -46,9 +46,11 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@types/react": "^16.0.5",
|
||||
"@types/react-native": "^0.48.7",
|
||||
"@types/react-redux": "^5.0.9",
|
||||
"axios": "^0.16.2",
|
||||
"react": "^15.6.1",
|
||||
"react-native": "^0.48.4",
|
||||
"react-redux": "^5.0.6",
|
||||
"redux": "^3.7.2"
|
||||
}
|
||||
|
|
68
src/AsyncLocalStorage.ts
Normal file
68
src/AsyncLocalStorage.ts
Normal file
|
@ -0,0 +1,68 @@
|
|||
const AsyncLocalStorage = {
|
||||
getItem: (key: string): Promise<any> => new Promise((resolve, reject) => {
|
||||
try {
|
||||
const value: string | null = window.localStorage.getItem(key)
|
||||
resolve(value)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
}),
|
||||
|
||||
setItem: (key: string, value: string) => new Promise((resolve, reject) => {
|
||||
try {
|
||||
window.localStorage.setItem(key, value)
|
||||
resolve(value)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
}),
|
||||
|
||||
removeItem: (key: string): Promise<any> => new Promise((resolve, reject) => {
|
||||
try {
|
||||
const value: string | null = window.localStorage.getItem(key)
|
||||
window.localStorage.removeItem(key)
|
||||
resolve(value)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
}),
|
||||
|
||||
clear: () => new Promise((resolve, reject) => {
|
||||
try {
|
||||
window.localStorage.clear()
|
||||
resolve(true)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
}),
|
||||
|
||||
getAllKeys: () => new Promise((resolve, reject) => {
|
||||
try {
|
||||
const allKeys = Object.keys(window.localStorage)
|
||||
resolve(allKeys)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
}),
|
||||
|
||||
multiGet: (keys: string[]) => new Promise((resolve, reject) => {
|
||||
try {
|
||||
const values = keys.map(key => [ key, window.localStorage.getItem(key) ])
|
||||
resolve(values)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
}),
|
||||
|
||||
multiSet: (keyValuePairs: string[][]) => new Promise((resolve, reject) => {
|
||||
try {
|
||||
keyValuePairs.forEach(keyValuePair => window.localStorage.setItem(keyValuePair[0], keyValuePair[1]))
|
||||
const newKeyValuePairs = keyValuePairs.map(keyValuePair => [ keyValuePair[0], window.localStorage.getItem(keyValuePair[0]) ])
|
||||
resolve(newKeyValuePairs)
|
||||
} catch (error) {
|
||||
reject(error)
|
||||
}
|
||||
}),
|
||||
}
|
||||
|
||||
export default AsyncLocalStorage
|
|
@ -5,6 +5,7 @@ import {
|
|||
} from 'redux'
|
||||
import {
|
||||
AuthResponse,
|
||||
DeviceStorage,
|
||||
VerificationParams,
|
||||
UserAttributes,
|
||||
UserRegistrationDetails,
|
||||
|
@ -36,13 +37,14 @@ import {
|
|||
SignOutRequestSucceededAction,
|
||||
SignOutRequestFailedAction,
|
||||
} from './types'
|
||||
import AsyncLocalStorage from './AsyncLocalStorage'
|
||||
import {
|
||||
deleteAuthHeaders,
|
||||
deleteAuthHeadersFromLocalStorage,
|
||||
deleteAuthHeadersFromDeviceStorage,
|
||||
getUserAttributesFromResponse,
|
||||
persistAuthHeadersInLocalStorage,
|
||||
persistAuthHeadersInDeviceStorage,
|
||||
setAuthHeaders,
|
||||
} from './services/auth' // <- maybe this is where you pass in the platform paramter, specifying if it is for a browser or for React Native
|
||||
} from './services/auth'
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Pure Redux actions:
|
||||
|
@ -109,26 +111,16 @@ export const signOutRequestFailed = (): SignOutRequestFailedAction => ({
|
|||
// Async Redux Thunk actions:
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// what is the second argument here? it needs to contain configs for (1) userRegistrationDetails, (2) userAttributes, (3) maybe even the authUrl... just make it a simple one-argument function
|
||||
// we'll also want the userAttributes to pertain to the end-user's initial state and heaven forbid reducers
|
||||
// actually, userSignInCredentials, userSignOutCredentials, and verificationParams are always the same as per devise token auth
|
||||
// const config = {
|
||||
// authUrl: 'http://url.com',
|
||||
// userAttributes: {
|
||||
// firstName: 'name' // <- key is how the frontend knows it, value is how the backend knows it
|
||||
// },
|
||||
// userRegistrationAttributes: { <- this is for keys/vals IN ADDITION TO email, password and passwordConfirmation
|
||||
// firstName: 'name'
|
||||
// },
|
||||
// }
|
||||
|
||||
const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
|
||||
const {
|
||||
authUrl,
|
||||
storage,
|
||||
userAttributes,
|
||||
userRegistrationAttributes,
|
||||
} = config
|
||||
|
||||
const Storage: DeviceStorage = Boolean(storage.flushGetRequests) ? storage : AsyncLocalStorage
|
||||
|
||||
const registerUser = (
|
||||
userRegistrationDetails: UserRegistrationDetails,
|
||||
) => async function (dispatch: Dispatch<{}>): Promise<void> {
|
||||
|
@ -154,10 +146,9 @@ const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
|
|||
data,
|
||||
})
|
||||
setAuthHeaders(response.headers)
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
persistAuthHeadersInLocalStorage(response.headers)
|
||||
persistAuthHeadersInDeviceStorage(Storage, response.headers)
|
||||
const userAttributesToSave = getUserAttributesFromResponse(userAttributes, response)
|
||||
dispatch(registrationRequestSucceeded(userAttributesToSave)) // <- need to make this reducer more flexible
|
||||
dispatch(registrationRequestSucceeded(userAttributesToSave))
|
||||
} catch (error) {
|
||||
dispatch(registrationRequestFailed())
|
||||
throw error
|
||||
|
@ -175,8 +166,7 @@ const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
|
|||
params: verificationParams,
|
||||
})
|
||||
setAuthHeaders(response.headers)
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
persistAuthHeadersInLocalStorage(response.headers)
|
||||
persistAuthHeadersInDeviceStorage(Storage, response.headers)
|
||||
const userAttributesToSave = getUserAttributesFromResponse(userAttributes, response)
|
||||
dispatch(verifyTokenRequestSucceeded(userAttributesToSave))
|
||||
} catch (error) {
|
||||
|
@ -202,8 +192,7 @@ const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
|
|||
},
|
||||
})
|
||||
setAuthHeaders(response.headers)
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
persistAuthHeadersInLocalStorage(response.headers)
|
||||
persistAuthHeadersInDeviceStorage(Storage, response.headers)
|
||||
const userAttributesToSave = getUserAttributesFromResponse(userAttributes, response)
|
||||
dispatch(signInRequestSucceeded(userAttributesToSave))
|
||||
} catch (error) {
|
||||
|
@ -214,9 +203,9 @@ const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
|
|||
|
||||
const signOutUser = () => async function (dispatch: Dispatch<{}>): Promise<void> {
|
||||
const userSignOutCredentials: UserSignOutCredentials = {
|
||||
'access-token': localStorage.getItem('access-token') as string,
|
||||
client: localStorage.getItem('client') as string,
|
||||
uid: localStorage.getItem('uid') as string,
|
||||
'access-token': await Storage.getItem('access-token') as string,
|
||||
client: await Storage.getItem('client') as string,
|
||||
uid: await Storage.getItem('uid') as string,
|
||||
}
|
||||
dispatch(signOutRequestSent())
|
||||
try {
|
||||
|
@ -226,8 +215,7 @@ const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
|
|||
data: userSignOutCredentials,
|
||||
})
|
||||
deleteAuthHeaders()
|
||||
// Have to check what type of platform it is, depending on the key provided by the end-user... like "browser", "iphone", or "android", etc.:
|
||||
deleteAuthHeadersFromLocalStorage()
|
||||
deleteAuthHeadersFromDeviceStorage(Storage)
|
||||
dispatch(signOutRequestSucceeded())
|
||||
} catch (error) {
|
||||
dispatch(signOutRequestFailed())
|
||||
|
@ -235,13 +223,12 @@ const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
|
|||
}
|
||||
}
|
||||
|
||||
const verifyCredentials = (store: Store<{}>): void => {
|
||||
// Gotta check what the platform is:
|
||||
if (localStorage.getItem('access-token')) {
|
||||
const verifyCredentials = async (store: Store<{}>): Promise<void> => {
|
||||
if (await Storage.getItem('access-token')) {
|
||||
const verificationParams: VerificationParams = {
|
||||
'access-token': localStorage.getItem('access-token') as string,
|
||||
client: localStorage.getItem('client') as string,
|
||||
uid: localStorage.getItem('uid') as string,
|
||||
'access-token': await Storage.getItem('access-token') as string,
|
||||
client: await Storage.getItem('client') as string,
|
||||
uid: await Storage.getItem('uid') as string,
|
||||
}
|
||||
store.dispatch<any>(verifyToken(verificationParams))
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ import { invertMapKeysAndValues } from './utility'
|
|||
import {
|
||||
AuthHeaders,
|
||||
AuthResponse,
|
||||
DeviceStorage,
|
||||
SingleLayerStringMap,
|
||||
} from '../types'
|
||||
|
||||
|
@ -20,10 +21,9 @@ export const setAuthHeaders = (headers: AuthHeaders): void => {
|
|||
})
|
||||
}
|
||||
|
||||
// Will have to take a parameter from the package user to determine if this is for a browser or for React Native:
|
||||
export const persistAuthHeadersInLocalStorage = (headers: AuthHeaders): void => {
|
||||
export const persistAuthHeadersInDeviceStorage = (Storage: DeviceStorage, headers: AuthHeaders): void => {
|
||||
authHeaderKeys.forEach((key: string) => {
|
||||
localStorage.setItem(key, headers[key])
|
||||
Storage.setItem(key, headers[key])
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -33,10 +33,9 @@ export const deleteAuthHeaders = (): void => {
|
|||
})
|
||||
}
|
||||
|
||||
// Will have to take a parameter from the package user to determine if this is for a browser or for React Native:
|
||||
export const deleteAuthHeadersFromLocalStorage = (): void => {
|
||||
export const deleteAuthHeadersFromDeviceStorage = async (Storage: DeviceStorage): Promise<void> => {
|
||||
authHeaderKeys.forEach((key: string) => {
|
||||
localStorage.removeItem(key)
|
||||
Storage.removeItem(key)
|
||||
})
|
||||
}
|
||||
|
||||
|
|
10
src/types.ts
10
src/types.ts
|
@ -190,3 +190,13 @@ export interface GenerateRequireSignInWrapperConfig {
|
|||
}
|
||||
|
||||
export type RequireSignInWrapper = (PageComponent: ComponentClass) => ComponentClass
|
||||
|
||||
export interface DeviceStorage {
|
||||
readonly getItem: (key: string) => Promise<any>
|
||||
readonly setItem: (key: string, value: string) => Promise<any>
|
||||
readonly removeItem: (key: string) => Promise<any>
|
||||
readonly clear: () => Promise<any>
|
||||
readonly getAllKeys: () => Promise<any>
|
||||
readonly multiGet: (keys: string[]) => Promise<any>
|
||||
readonly multiSet: (keyValuePairs: string[][]) => Promise<any>
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user