@overmap-ai/core 1.0.60-sdk-refactor.4 → 1.0.60-sdk-refactor.6

package/dist/forms/fields/BaseField/hooks.d.ts

@@ -64,7 +64,7 @@ export declare const useFormikInput: <TField extends AnyField>(props: ComponentP
     readonly results?: number | undefined;
     readonly security?: string | undefined;
     readonly unselectable?: "on" | "off" | undefined;
-    readonly inputMode?: "search" | "text" | "email" | "none" | "url" | "numeric" | "tel" | "decimal" | undefined;
+    readonly inputMode?: "search" | "text" | "email" | "url" | "none" | "numeric" | "tel" | "decimal" | undefined;
     readonly is?: string | undefined;
     readonly "aria-activedescendant"?: string | undefined;
     readonly "aria-atomic"?: (boolean | "true" | "false") | undefined;
@@ -280,10 +280,10 @@ export declare const useFormikInput: <TField extends AnyField>(props: ComponentP
     readonly onAnimationIterationCapture?: import("react").AnimationEventHandler<HTMLElement> | undefined;
     readonly onTransitionEnd?: import("react").TransitionEventHandler<HTMLElement> | undefined;
     readonly onTransitionEndCapture?: import("react").TransitionEventHandler<HTMLElement> | undefined;
-    readonly href?: string | undefined;
-    readonly download?: any;
     readonly headers?: string | undefined;
     readonly method?: string | undefined;
+    readonly href?: string | undefined;
+    readonly download?: any;
     readonly placeholder?: string | undefined;
     readonly required?: boolean | undefined;
     readonly target?: string | undefined;

package/dist/overmap-core.js

@@ -15432,9 +15432,6 @@ function parseTokens(response) {
 class JWTService extends BaseAuthService {
   constructor() {
     super(...arguments);
-    // AUTH below
-    __publicField(this, "_getAccessToken", () => this.client.store.getState().authReducer.accessToken);
-    __publicField(this, "_getRefreshToken", () => this.client.store.getState().authReducer.refreshToken);
     // _getTokenPair and _getRenewedTokens don't need to use enqueueRequest from the BaseApiService because
     // they are very simple. However, if we need robust error handling or want these operations to queue in the Outbox,
     // we will use enqueueRequest.
@@ -15448,7 +15445,7 @@ class JWTService extends BaseAuthService {
       const promise = this.enqueueRequest({
         description: "Get renewed tokens",
         method: HttpMethod.POST,
-        url: "/api/token/refresh/",
+        url: this.refreshTokensUrl,
         payload: { refresh: refreshToken },
         isAuthNeeded: false,
         blockers: [],
@@ -15459,14 +15456,14 @@ class JWTService extends BaseAuthService {
         immediate: true
       }).catch((e) => {
         console.error("Could not renew tokens; logging out due to error:", e);
-        void this.logout();
+        void this.clearAuth();
         return void 0;
       });
       let response = void 0;
       try {
         response = await promise;
       } catch (e) {
-        await this.logout();
+        await this.clearAuth();
       }
       if (!response)
         return void 0;
@@ -15480,9 +15477,9 @@ class JWTService extends BaseAuthService {
   /**
    * Logs the user out
    */
-  async logout() {
+  async clearAuth() {
     this.dispatch(setLoggedIn(false));
-    this.dispatch(clearTokens());
+    this.clearTokens();
     this.dispatch(setActiveProjectId(null));
     this.dispatch(setActiveWorkspaceId(null));
     this.dispatch({ type: RESET_STATE });
@@ -15494,7 +15491,7 @@ class JWTService extends BaseAuthService {
    * Attempts to renew tokens
    */
   async renewTokens() {
-    const dyingRefreshToken = this._getRefreshToken();
+    const dyingRefreshToken = this.getRefreshToken();
     if (!dyingRefreshToken) {
       throw new Error("No refresh token found");
     }
@@ -15503,12 +15500,11 @@ class JWTService extends BaseAuthService {
       if (!tokens) {
         return void 0;
       }
-      const { accessToken, refreshToken } = tokens;
       console.log("Got renewed tokens");
-      this.dispatch(setTokens({ accessToken, refreshToken }));
+      this.setTokens(tokens);
     } catch (e) {
       console.error("Could not renew tokens; logging out.");
-      await this.logout();
+      await this.clearAuth();
       throw e;
     }
   }
@@ -15517,7 +15513,7 @@ class JWTService extends BaseAuthService {
    * @returns {boolean}
    */
   tokenIsExpiringSoon() {
-    const accessToken = this._getAccessToken();
+    const accessToken = this.getAccessToken();
     if (!accessToken) {
       return false;
     }
@@ -15532,7 +15528,7 @@ class JWTService extends BaseAuthService {
     return secondsUntilExpiry < EXPIRING_SOON_THRESHOLD;
   }
   getAuthHeader() {
-    const accesseToken = selectAccessToken(this.client.store.getState());
+    const accesseToken = this.getAccessToken();
     return `Bearer ${accesseToken}`;
   }
   async prepareAuth() {
@@ -15542,7 +15538,7 @@ class JWTService extends BaseAuthService {
       await this.renewTokens();
     } catch (e) {
       if (e instanceof APIError) {
-        await this.logout();
+        await this.clearAuth();
       }
       return Promise.reject(e);
     }
@@ -15554,7 +15550,7 @@ class JWTService extends BaseAuthService {
       if (state.authReducer.isLoggedIn) {
         console.warn("No signed-in user to sign out.");
       }
-      await this.logout();
+      await this.clearAuth();
       throw new APIError({
         message: "You have been signed out due to inactivity.",
         response,
@@ -15583,7 +15579,7 @@ class JWTService extends BaseAuthService {
       uuid,
       description: "Get token pair",
       method: HttpMethod.POST,
-      url: "/api/token/",
+      url: this.initTokensUrl,
       payload: { username, password },
       isAuthNeeded: false,
       checkAuth: false,
@@ -15603,87 +15599,12 @@ class JWTService extends BaseAuthService {
       if (timedOut) {
         return void 0;
       }
-      this.dispatch(setTokens(tokens));
+      this.setTokens(tokens);
       this.dispatch(setLoggedIn(true));
       this.dispatch({ type: "rehydrated/setRehydrated", payload: true });
     });
     return Promise.race([timeoutPromise, successPromise]);
   }
-  /**
-   * Register a new user
-   */
-  register(payload) {
-    return this.enqueueRequest({
-      description: "Register",
-      method: HttpMethod.POST,
-      url: "/authentication/users/register/",
-      isAuthNeeded: false,
-      payload,
-      blockers: [],
-      blocks: []
-    });
-  }
-  async resetPassword(email) {
-    return this.enqueueRequest({
-      description: "Reset password",
-      method: HttpMethod.PATCH,
-      url: "/authentication/users/reset-password/",
-      isAuthNeeded: false,
-      payload: {
-        email
-      },
-      blockers: [],
-      blocks: []
-    });
-  }
-  async replaceProfilePicture(file) {
-    const hash = await hashFile(file);
-    await this.client.files.addCache(file, hash);
-    const [fileProps] = await this.client.files.uploadFileToS3(hash);
-    this.dispatch(setProfilePicture({ file: `/files/${fileProps.file}`, file_sha1: hash }));
-    return this.enqueueRequest({
-      description: "Replace profile picture",
-      method: HttpMethod.PATCH,
-      url: "/authentication/users/profile-details/",
-      payload: fileProps,
-      blockers: [],
-      blocks: []
-    });
-  }
-  async addFavouriteProjectId(projectId) {
-    this.dispatch(addFavouriteProjectId(projectId));
-    return this.enqueueRequest({
-      description: "Add favourite project",
-      method: HttpMethod.POST,
-      url: `/authentication/users/favourite-project/${projectId}/`,
-      blockers: [],
-      blocks: []
-    });
-  }
-  async removeFavouriteProjectId(projectId) {
-    this.dispatch(removeFavouriteProjectId(projectId));
-    return this.enqueueRequest({
-      description: "Add favourite project",
-      method: HttpMethod.POST,
-      url: `/authentication/users/unfavourite-project/${projectId}/`,
-      blockers: [`favorite-project-${projectId}`],
-      blocks: [`favorite-project-${projectId}`]
-    });
-  }
-  async joinApplication(projectInviteId, verification_code, username, password) {
-    return this.enqueueRequest({
-      description: "Join application",
-      method: HttpMethod.PATCH,
-      url: `/authentication/join-app/${projectInviteId}/${verification_code}/`,
-      payload: {
-        username,
-        password
-      },
-      isAuthNeeded: false,
-      blockers: [],
-      blocks: []
-    });
-  }
 }
 const CLASS_NAME_TO_SERVICE = {};
 class BaseApiService {