@opencampus/ocid-connect-js 1.1.2 → 1.2.1

package/lib/sdk/auth.js

@@ -38,18 +38,20 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
-  function OCAuthCore(loginEndpoint, redirectUri, transactionManager, tokenManager, referralCode) {
+  function OCAuthCore(loginEndpoint, redirectUri, transactionManager, tokenManager, referralCode, logoutEndPoint) {
     _classCallCheck(this, OCAuthCore);
     _defineProperty(this, "tokenManager", void 0);
     _defineProperty(this, "authInfoManager", void 0);
     _defineProperty(this, "transactionManager", void 0);
     _defineProperty(this, "redirectUri", void 0);
     _defineProperty(this, "loginEndPoint", void 0);
+    _defineProperty(this, "logoutEndPoint", void 0);
     _defineProperty(this, "referralCode", void 0);
     this.transactionManager = transactionManager;
     this.tokenManager = tokenManager;
     this.authInfoManager = new _AuthInfoManager["default"]();
     this.loginEndPoint = loginEndpoint;
+    this.logoutEndPoint = logoutEndPoint;
     this.redirectUri = redirectUri;
     this.referralCode = referralCode;
     this.syncAuthInfo();
@@ -61,21 +63,43 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
       this.tokenManager.clear();
     }
   }, {
-    key: "signInWithRedirect",
+    key: "logout",
     value: function () {
-      var _signInWithRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-        var paramsClone, signinParams, meta, requestUrl;
+      var _logout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var requestUrl;
         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:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function logout() {
+        return _logout.apply(this, arguments);
+      }
+      return logout;
+    }()
+  }, {
+    key: "signInWithRedirect",
+    value: function () {
+      var _signInWithRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+        var paramsClone, signinParams, meta, requestUrl;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               // we use ONLY code flow with PKCE, so lacks a lot of options
               // available in other OAuth SDKs.
               paramsClone = Object.assign({}, params);
               paramsClone.redirectUri = this.redirectUri;
-              _context.next = 4;
+              _context2.next = 4;
               return (0, _utils.prepareTokenParams)(paramsClone);
             case 4:
-              signinParams = _context.sent;
+              signinParams = _context2.sent;
               meta = (0, _utils.createPkceMeta)(signinParams);
               this.transactionManager.save(meta);
               signinParams.referralCode = this.referralCode;
@@ -83,9 +107,9 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
               window.location.assign(requestUrl);
             case 10:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function signInWithRedirect(_x) {
         return _signInWithRedirect.apply(this, arguments);
@@ -95,38 +119,38 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
   }, {
     key: "handleLoginRedirect",
     value: function () {
-      var _handleLoginRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _handleLoginRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var urlParams, meta, codeVerifier;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               urlParams = (0, _utils.parseUrl)(); // Again we only handle PKCE code flow
               if (!urlParams.code) {
-                _context2.next = 13;
+                _context3.next = 13;
                 break;
               }
               meta = this.transactionManager.getTransactionMeta();
               codeVerifier = meta.codeVerifier;
               if (!codeVerifier) {
-                _context2.next = 12;
+                _context3.next = 12;
                 break;
               }
-              _context2.next = 7;
+              _context3.next = 7;
               return this.tokenManager.exchangeTokenFromCode(urlParams.code, codeVerifier);
             case 7:
               // clear transaction meta, coz it's completed
               this.transactionManager.clear();
               this.syncAuthInfo();
-              return _context2.abrupt("return", this.getAuthState());
+              return _context3.abrupt("return", this.getAuthState());
             case 12:
               throw new _errors.AuthError('codeVerifier not found, cannot complete flow');
             case 13:
-              return _context2.abrupt("return", {});
+              return _context3.abrupt("return", {});
             case 14:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function handleLoginRedirect() {
         return _handleLoginRedirect.apply(this, arguments);
@@ -145,10 +169,9 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
       if (this.tokenManager.hasExpired()) {
         this.authInfoManager.clear();
       } else {
-        var idToken = this.tokenManager.getIdToken();
-        var _parseJwt = (0, _utils.parseJwt)(idToken),
-          edu_username = _parseJwt.edu_username,
-          eth_address = _parseJwt.eth_address;
+        var _this$getParsedIdToke = this.getParsedIdToken(),
+          edu_username = _this$getParsedIdToke.edu_username,
+          eth_address = _this$getParsedIdToke.eth_address;
         this.authInfoManager.setIdInfo({
           edu_username: edu_username,
           eth_address: eth_address
@@ -180,6 +203,26 @@ var OCAuthCore = exports.OCAuthCore = /*#__PURE__*/function () {
     value: function getAccessToken() {
       return this.tokenManager.getAccessToken();
     }
+  }, {
+    key: "getParsedIdToken",
+    value: function getParsedIdToken() {
+      // return all info in id token
+      var idToken = this.tokenManager.getIdToken();
+      if (idToken) {
+        return (0, _utils.parseJwt)(idToken);
+      }
+      return {};
+    }
+  }, {
+    key: "getParsedAccessToken",
+    value: function getParsedAccessToken() {
+      // return all info in access token
+      var accessToken = this.tokenManager.getAccessToken();
+      if (accessToken) {
+        return (0, _utils.parseJwt)(accessToken);
+      }
+      return {};
+    }
   }]);
 }();
 var LIVE_PUBLIC_KEY = 'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEBIDHtLbgVM76SXZ4iuIjuO+ERQPnVpJzagOsZdYxFG3ZJmvfdpr/Z29SLUbdZWafrOlAVlKe1Ovf/tcH671tTw==';
@@ -190,16 +233,18 @@ var OCAuthLive = exports.OCAuthLive = /*#__PURE__*/function (_OCAuthCore2) {
     _classCallCheck(this, OCAuthLive);
     var overrideTokenEndpoint = opts.tokenEndPoint,
       overrideLoginEndpoint = opts.loginEndPoint,
+      overrideLogoutEndpoint = opts.logoutEndPoint,
       overridePublicKey = opts.publicKey,
       redirectUri = opts.redirectUri,
       referralCode = opts.referralCode;
     var tokenEndpoint = overrideTokenEndpoint || 'https://api.login.opencampus.xyz/auth/token';
     var loginEndpoint = overrideLoginEndpoint || 'https://api.login.opencampus.xyz/auth/login';
+    var logoutEndpoint = overrideLogoutEndpoint || 'https://api.login.opencampus.xyz/auth/logout';
     var publicKey = overridePublicKey || LIVE_PUBLIC_KEY;
     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]);
+    return _callSuper(this, OCAuthLive, [loginEndpoint, redirectUri, pkceTransactionManager, tokenManager, referralCode, logoutEndpoint]);
   }
   _inherits(OCAuthLive, _OCAuthCore2);
   return _createClass(OCAuthLive);
@@ -210,16 +255,18 @@ var OCAuthSandbox = exports.OCAuthSandbox = /*#__PURE__*/function (_OCAuthCore3)
     _classCallCheck(this, OCAuthSandbox);
     var overrideTokenEndpoint = opts.tokenEndPoint,
       overrideLoginEndpoint = opts.loginEndPoint,
+      overrideLogoutEndpoint = opts.logoutEndPoint,
       overridePublicKey = opts.publicKey,
       redirectUri = opts.redirectUri,
       referralCode = opts.referralCode;
     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';
     var publicKey = overridePublicKey || SANDBOX_PUBLIC_KEY;
     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]);
+    return _callSuper(this, OCAuthSandbox, [loginEndpoint, redirectUri, pkceTransactionManager, tokenManager, referralCode, logoutEndpoint]);
   }
   _inherits(OCAuthSandbox, _OCAuthCore3);
   return _createClass(OCAuthSandbox);

package/lib/sdk/lib/CookieStorageProvider.js

@@ -38,13 +38,17 @@ var CookieStorageProvider = exports.CookieStorageProvider = /*#__PURE__*/functio
     value: function setItem(key, value) {
       return _jsCookie["default"].set(key, value, {
         expires: 365,
+        path: '/',
         domain: this.domain
       });
     }
   }, {
     key: "removeItem",
     value: function removeItem(key) {
-      return _jsCookie["default"].remove(key);
+      return _jsCookie["default"].remove(key, {
+        path: '/',
+        domain: this.domain
+      });
     }
   }]);
 }();

package/package.json

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