authscape 1.0.182 → 1.0.188

package/index.js

@@ -50,8 +50,8 @@ function AuthScapeApp(_ref) {
 
   (0, _react.useEffect)(function () {
     if (loadedUser) {
-      if (process.env.authscape.googleAnalytics4 != null) {
-        init(process.env.authscape.googleAnalytics4);
+      if (process.env.googleAnalytics4 != null) {
+        init(process.env.googleAnalytics4);
       }
       if (router.query.r != null) {
         localStorage.setItem("ref", router.query.r);
@@ -72,7 +72,7 @@ function AuthScapeApp(_ref) {
     theme: muiTheme
   }, loadingLogin && /*#__PURE__*/_react["default"].createElement(_material.Box, null, "Please wait. Loading..."), !loadingLogin && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(AuthorizationComponent, {
     setCurrentUser: setCurrentUser,
-    isEnabled: process.env.authscape.enableAuth,
+    isEnabled: process.env.enableAuth,
     userLoaded: function userLoaded() {
       setLoadedUser(true);
       if (onAuthenticationLoaded != null) {
@@ -93,9 +93,9 @@ function AuthScapeApp(_ref) {
     open: isLoading
   }, /*#__PURE__*/_react["default"].createElement(_CircularProgress["default"], {
     color: "inherit"
-  })), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null))), process.env.authscape.microsoftClarityTrackingCode != null && /*#__PURE__*/_react["default"].createElement("script", {
+  })), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null))), process.env.microsoftClarityTrackingCode != null && /*#__PURE__*/_react["default"].createElement("script", {
     dangerouslySetInnerHTML: {
-      __html: "\n                        (function(c,l,a,r,i,t,y){\n                            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };\n                            t=l.createElement(r);\n                            t.async=1;\n                            t.src=\"https://www.clarity.ms/tag/\"+i;\n                            y=l.getElementsByTagName(r)[0];\n                            y.parentNode.insertBefore(t,y);\n                        })(window, document, \"clarity\", \"script\", \"" + process.env.authscape.microsoftClarityTrackingCode + "\");"
+      __html: "\n                        (function(c,l,a,r,i,t,y){\n                            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };\n                            t=l.createElement(r);\n                            t.async=1;\n                            t.src=\"https://www.clarity.ms/tag/\"+i;\n                            y=l.getElementsByTagName(r)[0];\n                            y.parentNode.insertBefore(t,y);\n                        })(window, document, \"clarity\", \"script\", \"" + process.env.microsoftClarityTrackingCode + "\");"
     }
   }));
 }
@@ -1375,7 +1375,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
               elements: elements,
               redirect: "if_required"
               // confirmParams: {
-              //   return_url: process.env.authscape.websiteBaseUri + '/confirmSetup?redirectUrl=' + encodeURIComponent(window.location.search),
+              //   return_url: process.env.websiteBaseUri + '/confirmSetup?redirectUrl=' + encodeURIComponent(window.location.search),
               // },
             });
           case 7:
@@ -1432,7 +1432,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
               elements: elements,
               redirect: "if_required",
               confirmParams: {
-                return_url: process.env.authscape.websiteBaseUri + '/confirmPayment?redirectUrl=' + encodeURIComponent(window.location.search)
+                return_url: process.env.websiteBaseUri + '/confirmPayment?redirectUrl=' + encodeURIComponent(window.location.search)
               }
             });
           case 37:
@@ -1928,7 +1928,7 @@ var RefreshToken = /*#__PURE__*/function () {
           accessToken = (0, _nookies.parseCookies)().access_token || '';
           refreshToken = (0, _nookies.parseCookies)().refresh_token || '';
           _context2.next = 4;
-          return instance.post(process.env.authscape.authorityUri + "/connect/token", _queryString["default"].stringify({
+          return instance.post(process.env.authorityUri + "/connect/token", _queryString["default"].stringify({
             grant_type: 'refresh_token',
             client_id: process.env.client_id,
             client_secret: process.env.client_secret,
@@ -1950,7 +1950,7 @@ var RefreshToken = /*#__PURE__*/function () {
           return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: process.env.authscape.cookieDomain,
+            domain: process.env.cookieDomain,
             secure: true
           });
         case 9:
@@ -1958,7 +1958,7 @@ var RefreshToken = /*#__PURE__*/function () {
           return (0, _nookies.setCookie)(null, "expires_in", response.data.expires_in, {
             maxAge: 2147483647,
             path: '/',
-            domain: process.env.authscape.cookieDomain,
+            domain: process.env.cookieDomain,
             secure: true
           });
         case 11:
@@ -1966,7 +1966,7 @@ var RefreshToken = /*#__PURE__*/function () {
           return (0, _nookies.setCookie)(null, "refresh_token", response.data.refresh_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: process.env.authscape.cookieDomain,
+            domain: process.env.cookieDomain,
             secure: true
           });
         case 13:
@@ -1981,11 +1981,11 @@ var RefreshToken = /*#__PURE__*/function () {
 }();
 var apiService = function apiService() {
   var ctx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  var env = process.env.authscape.stage;
+  var env = process.env.stage;
   if (env == "development") {
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
   }
-  var baseUri = process.env.authscape.apiUri + "/api";
+  var baseUri = process.env.apiUri + "/api";
   var instance = _axios["default"].create({
     baseURL: baseUri,
     //timeout: 10000,
@@ -2029,17 +2029,17 @@ var apiService = function apiService() {
                 (0, _nookies.destroyCookie)(null, "access_token", {
                   maxAge: 2147483647,
                   path: '/',
-                  domain: process.env.authscape.cookieDomain
+                  domain: process.env.cookieDomain
                 });
                 (0, _nookies.destroyCookie)(null, "refresh_token", {
                   maxAge: 2147483647,
                   path: '/',
-                  domain: process.env.authscape.cookieDomain
+                  domain: process.env.cookieDomain
                 });
                 (0, _nookies.destroyCookie)(null, "expires_in", {
                   maxAge: 2147483647,
                   path: '/',
-                  domain: process.env.authscape.cookieDomain
+                  domain: process.env.cookieDomain
                 });
               }
             return _context3.abrupt("return", Promise.reject(error));
@@ -2441,7 +2441,7 @@ var authService = function authService() {
               challenge = _context2.sent;
               window.localStorage.setItem("verifier", verifier);
               redirectUri = window.location.origin + "/signin-oidc";
-              loginUri = process.env.authscape.authorityUri + "/connect/authorize?response_type=code&state=" + state + "&client_id=" + process.env.client_id + "&scope=email%20openid%20offline_access%20profile%20api1&redirect_uri=" + redirectUri + "&code_challenge=" + challenge + "&code_challenge_method=S256";
+              loginUri = process.env.authorityUri + "/connect/authorize?response_type=code&state=" + state + "&client_id=" + process.env.client_id + "&scope=email%20openid%20offline_access%20profile%20api1&redirect_uri=" + redirectUri + "&code_challenge=" + challenge + "&code_challenge_method=S256";
               if (deviceId) {
                 loginUri += "&deviceId=" + deviceId; // will be for chrome extention and mobile apps later
               }
@@ -2460,7 +2460,7 @@ var authService = function authService() {
     }(),
     signUp: function signUp() {
       var redirectUrl = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-      var AuthUri = process.env.authscape.authorityUri;
+      var AuthUri = process.env.authorityUri;
       var url = "";
       if (redirectUrl == null) {
         url = AuthUri + "/Identity/Account/Register?returnUrl=" + window.location.href;
@@ -2476,7 +2476,7 @@ var authService = function authService() {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              window.location.href = process.env.authscape.authorityUri + "/Identity/Account/Manage";
+              window.location.href = process.env.authorityUri + "/Identity/Account/Manage";
             case 1:
             case "end":
               return _context3.stop();
@@ -2498,8 +2498,8 @@ var authService = function authService() {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               redirectUri = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : null;
-              AuthUri = process.env.authscape.authorityUri;
-              cookieDomain = process.env.authscape.cookieDomain;
+              AuthUri = process.env.authorityUri;
+              cookieDomain = process.env.cookieDomain;
               (0, _nookies.destroyCookie)({}, "access_token", {
                 maxAge: 2147483647,
                 path: '/',
@@ -2576,13 +2576,13 @@ var signInValidator = /*#__PURE__*/function () {
             code_verifier: codeVerifier
           });
           _context.next = 6;
-          return _axios["default"].post(process.env.authscape.authorityUri + '/connect/token', queryString, {
+          return _axios["default"].post(process.env.authorityUri + '/connect/token', queryString, {
             headers: headers
           });
         case 6:
           response = _context.sent;
           window.localStorage.removeItem("verifier");
-          domain = process.env.authscape.cookieDomain;
+          domain = process.env.cookieDomain;
           _context.next = 11;
           return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
             maxAge: 2147483647,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.182",
+  "version": "1.0.188",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/AuthScapeApp.js

@@ -18,9 +18,9 @@ export function AuthScapeApp({Component, pageProps, muiTheme = null, onAuthentic
     useEffect(() => {
         if (loadedUser)
         {
-          if (process.env.authscape.googleAnalytics4 != null)
+          if (process.env.googleAnalytics4 != null)
           {
-            init(process.env.authscape.googleAnalytics4);
+            init(process.env.googleAnalytics4);
           }
     
           if (router.query.r != null)
@@ -58,7 +58,7 @@ export function AuthScapeApp({Component, pageProps, muiTheme = null, onAuthentic
 
                 {!loadingLogin &&
                 <>
-                    <AuthorizationComponent setCurrentUser={setCurrentUser} isEnabled={process.env.authscape.enableAuth} userLoaded={() => {
+                    <AuthorizationComponent setCurrentUser={setCurrentUser} isEnabled={process.env.enableAuth} userLoaded={() => {
                         setLoadedUser(true);
 
                         if (onAuthenticationLoaded != null)
@@ -78,7 +78,7 @@ export function AuthScapeApp({Component, pageProps, muiTheme = null, onAuthentic
                 }
             </ThemeProvider>
 
-            {process.env.authscape.microsoftClarityTrackingCode != null &&
+            {process.env.microsoftClarityTrackingCode != null &&
                 <script
                 dangerouslySetInnerHTML={{
                     __html: `
@@ -89,7 +89,7 @@ export function AuthScapeApp({Component, pageProps, muiTheme = null, onAuthentic
                             t.src="https://www.clarity.ms/tag/"+i;
                             y=l.getElementsByTagName(r)[0];
                             y.parentNode.insertBefore(t,y);
-                        })(window, document, "clarity", "script", "` + process.env.authscape.microsoftClarityTrackingCode + `");`,
+                        })(window, document, "clarity", "script", "` + process.env.microsoftClarityTrackingCode + `");`,
                 }}
                 />
             }

package/src/components/StripePayment.js

@@ -48,7 +48,7 @@ const CheckoutForm = ({payButtonText, clientSecret, onResponse, amount}) => {
           elements,
           redirect:"if_required",
           // confirmParams: {
-          //   return_url: process.env.authscape.websiteBaseUri + '/confirmSetup?redirectUrl=' + encodeURIComponent(window.location.search),
+          //   return_url: process.env.websiteBaseUri + '/confirmSetup?redirectUrl=' + encodeURIComponent(window.location.search),
           // },
         });
     
@@ -103,7 +103,7 @@ const CheckoutForm = ({payButtonText, clientSecret, onResponse, amount}) => {
           elements,
           redirect:"if_required",
           confirmParams: {
-            return_url: process.env.authscape.websiteBaseUri + '/confirmPayment?redirectUrl=' + encodeURIComponent(window.location.search),
+            return_url: process.env.websiteBaseUri + '/confirmPayment?redirectUrl=' + encodeURIComponent(window.location.search),
           },
         });
     

package/src/services/apiService.js

@@ -40,7 +40,7 @@ const RefreshToken = async (originalRequest, instance) => {
     let accessToken = parseCookies().access_token || '';
     let refreshToken = parseCookies().refresh_token || '';
 
-    let response = await instance.post(process.env.authscape.authorityUri + "/connect/token",
+    let response = await instance.post(process.env.authorityUri + "/connect/token",
         querystring.stringify({
             grant_type: 'refresh_token',
             client_id: process.env.client_id,
@@ -61,7 +61,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: process.env.authscape.cookieDomain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     
@@ -69,7 +69,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: process.env.authscape.cookieDomain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     
@@ -77,7 +77,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: process.env.authscape.cookieDomain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     }
@@ -85,13 +85,13 @@ const RefreshToken = async (originalRequest, instance) => {
 
 export const apiService = (ctx = null) => {
 
-    let env = process.env.authscape.stage;
+    let env = process.env.stage;
     if (env == "development")
     {
         process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
     }
 
-    let baseUri = process.env.authscape.apiUri + "/api";
+    let baseUri = process.env.apiUri + "/api";
 
     const instance = axios.create({
         baseURL: baseUri,
@@ -126,19 +126,19 @@ export const apiService = (ctx = null) => {
                         destroyCookie(null, "access_token", {
                             maxAge: 2147483647,
                             path: '/',
-                            domain: process.env.authscape.cookieDomain
+                            domain: process.env.cookieDomain
                         });
 
                         destroyCookie(null, "refresh_token", {
                             maxAge: 2147483647,
                             path: '/',
-                            domain: process.env.authscape.cookieDomain
+                            domain: process.env.cookieDomain
                         });
 
                         destroyCookie(null, "expires_in", {
                             maxAge: 2147483647,
                             path: '/',
-                            domain: process.env.authscape.cookieDomain
+                            domain: process.env.cookieDomain
                         });
                     }
 

package/src/services/authService.js

@@ -49,7 +49,7 @@ export const authService = () => {
             window.localStorage.setItem("verifier", verifier);
 
             let redirectUri = window.location.origin + "/signin-oidc";
-            let loginUri = process.env.authscape.authorityUri + "/connect/authorize?response_type=code&state=" + state + "&client_id=" + process.env.client_id + "&scope=email%20openid%20offline_access%20profile%20api1&redirect_uri=" + redirectUri + "&code_challenge=" + challenge + "&code_challenge_method=S256";
+            let loginUri = process.env.authorityUri + "/connect/authorize?response_type=code&state=" + state + "&client_id=" + process.env.client_id + "&scope=email%20openid%20offline_access%20profile%20api1&redirect_uri=" + redirectUri + "&code_challenge=" + challenge + "&code_challenge_method=S256";
             
             if (deviceId)
             {
@@ -60,7 +60,7 @@ export const authService = () => {
         },
         signUp: (redirectUrl = null) => {
 
-            let AuthUri = process.env.authscape.authorityUri;
+            let AuthUri = process.env.authorityUri;
 
             let url = "";
             if (redirectUrl == null)
@@ -78,13 +78,13 @@ export const authService = () => {
         },
         manageAccount: async () => {
 
-            window.location.href = process.env.authscape.authorityUri + "/Identity/Account/Manage";
+            window.location.href = process.env.authorityUri + "/Identity/Account/Manage";
 
         },
         logout: async (redirectUri = null) => {
 
-            let AuthUri = process.env.authscape.authorityUri;
-            let cookieDomain = process.env.authscape.cookieDomain;
+            let AuthUri = process.env.authorityUri;
+            let cookieDomain = process.env.cookieDomain;
 
             destroyCookie({}, "access_token", {
                 maxAge: 2147483647,

package/src/services/signInValidator.js

@@ -19,13 +19,13 @@ export const signInValidator = async (queryCode) => {
           code_verifier: codeVerifier
         });
 
-        let response = await axios.post(process.env.authscape.authorityUri + '/connect/token', queryString, {
+        let response = await axios.post(process.env.authorityUri + '/connect/token', queryString, {
           headers: headers
         });
 
         window.localStorage.removeItem("verifier");
 
-        let domain = process.env.authscape.cookieDomain;
+        let domain = process.env.cookieDomain;
 
         await setCookie(null, "access_token", response.data.access_token,
         {