@opencampus/ocid-connect-js 1.2.2 → 1.2.5

package/lib/react/LoginCallBack.js

@@ -27,6 +27,7 @@ var LoginCallBack = function LoginCallBack(_ref) {
     customErrorComponent = _ref.customErrorComponent,
     customLoadingComponent = _ref.customLoadingComponent;
   var _useOCAuth = (0, _OCContext.useOCAuth)(),
+    isInitialized = _useOCAuth.isInitialized,
     ocAuth = _useOCAuth.ocAuth,
     authState = _useOCAuth.authState,
     setAuthError = _useOCAuth.setAuthError;
@@ -68,7 +69,7 @@ var LoginCallBack = function LoginCallBack(_ref) {
       handleLogin();
     }
   }, [ocAuth]);
-  if (authState.error !== undefined && !errorCallback) {
+  if (isInitialized && authState.error !== undefined && !errorCallback) {
     return customErrorComponent ? customErrorComponent : /*#__PURE__*/_react["default"].createElement("div", null, "Error Logging in: ", authState.error.message);
   } else {
     return customLoadingComponent ? customLoadingComponent : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("h3", null, "Loading ......"));

package/lib/react/OCConnect.js

@@ -28,7 +28,7 @@ var OCConnect = function OCConnect(_ref) {
   var children = _ref.children,
     opts = _ref.opts,
     sandboxMode = _ref.sandboxMode;
-  var _useState = (0, _react.useState)({}),
+  var _useState = (0, _react.useState)(),
     _useState2 = _slicedToArray(_useState, 2),
     ocAuth = _useState2[0],
     setOcAuth = _useState2[1];
@@ -40,16 +40,18 @@ var OCConnect = function OCConnect(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     ethAddress = _useState6[0],
     setEthAddress = _useState6[1];
-  var _useState7 = (0, _react.useState)({
-      isAuthenticated: false
-    }),
+  var _useState7 = (0, _react.useState)(),
     _useState8 = _slicedToArray(_useState7, 2),
     authState = _useState8[0],
     setAuthState = _useState8[1];
-  var _useState9 = (0, _react.useState)(null),
+  var _useState9 = (0, _react.useState)(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    authError = _useState10[0],
-    setAuthError = _useState10[1];
+    isInitialized = _useState10[0],
+    setIsInitialized = _useState10[1];
+  var _useState11 = (0, _react.useState)(null),
+    _useState12 = _slicedToArray(_useState11, 2),
+    authError = _useState12[0],
+    setAuthError = _useState12[1];
   var updateAuthState = function updateAuthState(authState) {
     setAuthState(authState);
     setOCId(authState.OCId);
@@ -61,9 +63,10 @@ var OCConnect = function OCConnect(_ref) {
     var authSdk = sandboxMode ? new _auth.OCAuthSandbox(opts) : new _auth.OCAuthLive(opts);
     updateAuthState(authSdk.getAuthState());
     setOcAuth(authSdk);
+    setIsInitialized(true);
   }, []);
   (0, _react.useEffect)(function () {
-    if (ocAuth.authInfoManager) {
+    if (ocAuth && ocAuth.authInfoManager) {
       // reactively recieve update on the authstate change
       ocAuth.authInfoManager.subscribe(updateAuthState);
       return function () {
@@ -78,6 +81,7 @@ var OCConnect = function OCConnect(_ref) {
       ocAuth: ocAuth,
       authState: authState,
       authError: authError,
+      isInitialized: isInitialized,
       setAuthError: setAuthError
     }
   }, children);

package/lib/sdk/auth.js

@@ -65,21 +65,24 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
   }, {
     key: "logout",
     value: function () {
-      var _logout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var requestUrl;
+      var _logout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(logoutReturnTo) {
+        var url;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.clearStorage();
-              requestUrl = this.logoutEndPoint;
-              window.location.assign(requestUrl);
-            case 3:
+              url = new URL(this.logoutEndPoint);
+              if (logoutReturnTo) {
+                url.searchParams.append('returnTo', logoutReturnTo);
+              }
+              window.location.assign(url.toString());
+            case 4:
             case "end":
               return _context.stop();
           }
         }, _callee, this);
       }));
-      function logout() {
+      function logout(_x) {
         return _logout.apply(this, arguments);
       }
       return logout;
@@ -111,7 +114,7 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-      function signInWithRedirect(_x) {
+      function signInWithRedirect(_x2) {
         return _signInWithRedirect.apply(this, arguments);
       }
       return signInWithRedirect;
@@ -172,7 +175,7 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
         var _this$getParsedIdToke = this.getParsedIdToken(),
           edu_username = _this$getParsedIdToke.edu_username,
           eth_address = _this$getParsedIdToke.eth_address;
-        this.authInfoManager.setAuthState(this.getAccessToken(), this.getIdToken(), edu_username, eth_address, this.isAuthenticated());
+        this.authInfoManager.setAuthState(this.getAccessToken(), this.getIdToken(), edu_username, eth_address, true);
       }
     }
   }, {
@@ -250,7 +253,7 @@ var OCAuthLive = exports.OCAuthLive = /*#__PURE__*/function (_OCAuthCore2) {
     var storageClass = (0, _StorageManager.getStorageClass)(opts);
     var pkceTransactionManager = new _TransactionManager["default"](storageClass);
     var tokenManager = new _TokenManager["default"](storageClass, tokenEndpoint, publicKey);
-    return _callSuper(this, OCAuthLive, [loginEndpoint, redirectUri, pkceTransactionManager, tokenManager, referralCode, logoutEndpoint]);
+    return _callSuper(this, OCAuthLive, [loginEndpoint, redirectUri, pkceTransactionManager, tokenManager, referralCode, logoutEndpoint, false]);
   }
   _inherits(OCAuthLive, _OCAuthCore2);
   return _createClass(OCAuthLive);
@@ -264,7 +267,8 @@ var OCAuthSandbox = exports.OCAuthSandbox = /*#__PURE__*/function (_OCAuthCore3)
       overrideLogoutEndpoint = opts.logoutEndPoint,
       overridePublicKey = opts.publicKey,
       redirectUri = opts.redirectUri,
-      referralCode = opts.referralCode;
+      referralCode = opts.referralCode,
+      mode = opts.mode;
     var tokenEndpoint = overrideTokenEndpoint || 'https://api.login.sandbox.opencampus.xyz/auth/token';
     var loginEndpoint = overrideLoginEndpoint || 'https://api.login.sandbox.opencampus.xyz/auth/login';
     var logoutEndpoint = overrideLogoutEndpoint || 'https://api.login.sandbox.opencampus.xyz/auth/logout';
@@ -272,7 +276,7 @@ var OCAuthSandbox = exports.OCAuthSandbox = /*#__PURE__*/function (_OCAuthCore3)
     var storageClass = (0, _StorageManager.getStorageClass)(opts);
     var pkceTransactionManager = new _TransactionManager["default"](storageClass);
     var tokenManager = new _TokenManager["default"](storageClass, tokenEndpoint, publicKey);
-    return _callSuper(this, OCAuthSandbox, [loginEndpoint, redirectUri, pkceTransactionManager, tokenManager, referralCode, logoutEndpoint]);
+    return _callSuper(this, OCAuthSandbox, [loginEndpoint, redirectUri, pkceTransactionManager, tokenManager, referralCode, logoutEndpoint, true]);
   }
   _inherits(OCAuthSandbox, _OCAuthCore3);
   return _createClass(OCAuthSandbox);

package/lib/sdk/lib/AuthInfoManager.js

@@ -50,7 +50,10 @@ var AuthInfoManager = /*#__PURE__*/function () {
   }, {
     key: "clear",
     value: function clear() {
-      this._authState = null;
+      this._authState = {
+        isAuthenticated: false
+      };
+      this._emitter.emit(EVENT_AUTH_STATE_CHANGE, this._authState);
     }
   }, {
     key: "subscribe",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencampus/ocid-connect-js",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "author": "Animoca Brands",
   "license": "MIT",
   "description": "OCID Connector Library",