acsi-core 1.1.3 → 1.2.5

package/dist/containers/Login/apiClient/index.d.ts

@@ -1,5 +1,5 @@
-export declare const getGoogleClientId: () => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiLoginGoogle: (body: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiSendEmailCode: (body: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiCheckEmailCode: (params: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiGetImage: () => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const getGoogleClientId: () => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiLoginGoogle: (body: any) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiSendEmailCode: (body: any) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiCheckEmailCode: (params: any) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiGetImage: () => Promise<import("axios").AxiosResponse<any, any>>;

package/dist/index.js

@@ -28,7 +28,6 @@ var amplitude = require('@amplitude/analytics-browser');
 var Sentry = require('@sentry/react');
 var fa = require('react-icons/fa');
 var CreatableSelect = _interopDefault(require('react-select/creatable'));
-var moment$1 = _interopDefault(require('moment-timezone'));
 
 var setLoading = toolkit.createAction("common/setLoading");
 var setLoadingPage = toolkit.createAction("common/setLoadingPage");
@@ -1933,7 +1932,8 @@ var BlockLogin = function BlockLogin(_ref) {
   });
   var fnLoginMicrosoft = function fnLoginMicrosoft() {
     try {
-      var msalInstance = new msalBrowser.PublicClientApplication(msalConfig(MICROSOFT_CLIENT_ID, MICROSOFT_URL_DIRECT));
+      var redirectUri = window.location.origin + "/auth-redirect.html";
+      var msalInstance = new msalBrowser.PublicClientApplication(msalConfig(MICROSOFT_CLIENT_ID, redirectUri));
       if (!msalInstance) {
         console.error("MSAL instance not initialized");
         return Promise.resolve();
@@ -1941,7 +1941,8 @@ var BlockLogin = function BlockLogin(_ref) {
       return Promise.resolve(_catch(function () {
         return Promise.resolve(msalInstance.initialize()).then(function () {
           var loginRequest = {
-            scopes: ["openid", "profile", "email"]
+            scopes: ["openid", "profile", "email"],
+            redirectUri: redirectUri
           };
           var silentRequest = _extends({}, loginRequest, {
             prompt: "select_account"
@@ -3469,31 +3470,14 @@ var utcToLocalTime = (function (time, FORMAT) {
   }
 });
 
-var timeSpanToLocalMoment = (function (time, timezone) {
+var timeSpanToLocalMoment = (function (time) {
   if (!time) return null;
-  if (time.split(":").length !== 3) return null;
-  if (!timezone) {
-    var totalSeconds = +time.split(":")[0] * 60 * 60 + +time.split(":")[1] * 60 + +time.split(":")[2];
-    var startOfDay = moment$1.utc().startOf("day");
-    var _dateTime = startOfDay.add(totalSeconds, "seconds");
-    return _dateTime.local();
-  }
-  var dateTime;
-  var isOffset = /^(UTC|GMT)?[+-]/.test(timezone);
-  console.log({
-    isOffset: isOffset
-  });
-  if (isOffset) {
-    var cleanOffset = timezone.replace(/UTC|GMT/gi, '').trim();
-    console.log({
-      cleanOffset: cleanOffset
-    });
-    dateTime = moment$1.utc(time, "HH:mm:ss").utcOffset(cleanOffset, true);
-  } else {
-    dateTime = moment$1.tz(time, "HH:mm:ss", timezone);
-  }
-  console.log("run time", dateTime.format("HH:mm:ss"), timezone);
-  return dateTime;
+  var times = time.split(":");
+  if (times.length !== 3) return null;
+  var totalSeconds = +times[0] * 60 * 60 + +times[1] * 60 + +times[2];
+  var startOfDay = moment.utc().startOf("day");
+  var dateTime = startOfDay.add(totalSeconds, "seconds");
+  return dateTime.local();
 });
 
 var historyCore = history.createBrowserHistory();