diff --git a/src/app/interceptors/token.interceptors.ts b/src/app/interceptors/token.interceptors.ts index 1adb5e9fb..3965126fe 100644 --- a/src/app/interceptors/token.interceptors.ts +++ b/src/app/interceptors/token.interceptors.ts @@ -45,11 +45,18 @@ export class TokenInterceptor implements HttpInterceptor { } private addToken(request: HttpRequest, token: string) { - return request.clone({ - setHeaders: { - Authorization: `Bearer ${token}`, - }, - }); + + if(request.url.includes("login") && request.url.includes("Login")) { + return request.clone({}); + } else { + + return request.clone({ + setHeaders: { + Authorization: `Bearer ${token}`, + }, + }); + } + } private handle401Error(request: HttpRequest, next: HttpHandler) { diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 8c38f6345..1e5042d85 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -10,12 +10,12 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { PublicationFolderService } from 'src/app/store/publication-folder.service'; import { FilePicker } from '@capawesome/capacitor-file-picker'; import { checkFileTypeService } from 'src/app/services/checkFileType.service'; -import { FileValidatorService } from "src/app/services/file/file-validator.service" -import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service" +import { FileValidatorService } from "src/app/services/file/file-validator.service"; +import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service"; import { LakefsRepositoryService } from '../../repository/lakefs/lakefs-repository.service'; import { ok, err, Result } from 'neverthrow'; import { SocketConnectionMCRService } from "src/app/services/socket-connection-mcr.service" -import { CMAPIService } from "src/app/shared/repository/CMAPI/cmapi.service" +import { CMAPIService } from "src/app/shared/repository/CMAPI/cmapi.service"; enum ActionType { newRapid = "1", @@ -400,14 +400,19 @@ export class NewPublicationPage implements OnInit { Files: this.seletedContent, } - // this.publication.Files = this.publication.Files.map( e => ({ - // FileBase64: e.FileBase64, - // FileExtension: e.FileExtension, - // OriginalFileName: 'foto' - // })) - //this.publicationFormMV.setDataToFrom(this.publication) - //this.publicationFormMV.uploadVideosFiles() + + let a = this.publication + + this.publicationFormMV.setDataToFrom(a) + this.publicationFormMV.uploadVideosFiles() + + + this.publication.Files = this.publication.Files.map( e => ({ + FileBase64: e.FileBase64, + FileExtension: e.FileExtension, + OriginalFileName: 'foto' + })) const loader = this.toastService.loading()