peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove basic

Browse Source
This commit is contained in:
Peter Maquiran
2024-11-06 09:13:36 +01:00
parent ecb2f6c08e
commit 0889e82405
15 changed files with 138 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gabinete-digital-fo.code-workspace
+3
View File
@@ -9,6 +9,9 @@
},
{
"path": "../sentium-api"
},
{
"path": "../src"
}
],
"settings": {
src/app/app.module.ts
+3 -1
View File
@@ -104,6 +104,7 @@ import { openTelemetryLogging } from './services/monitoring/opentelemetry/loggin
import { registerLocaleData } from '@angular/common';
import localePt from '@angular/common/locales/pt';
import { LogsDatabase } from './infra/database/dexie/instance/logs/service';
import { UserModule } from './module/user/user.module';
// Register the locale data
registerLocaleData(localePt, 'pt');
@@ -209,7 +210,8 @@ registerLocaleData(localePt, 'pt');
MatMenuModule,
MatIconModule,
// module
ChatModule
ChatModule,
UserModule
],
entryComponents: [
DiplomaOptionsPage,
src/app/core/user/use-case/user-login-use-case.service.ts
+1 -3
View File
@@ -9,9 +9,7 @@ import { AESEncrypt } from 'src/app/services/aesencrypt.service';
const UserLoginInputSchema = z.object({
username: z.string(),
password: z.string(),
domainName: z.string(),
BasicAuthKey: z.string()
password: z.string()
})
export type UserLoginInput = z.infer<typeof UserLoginInputSchema>
src/app/models/user.model.ts
-2
View File
@@ -7,7 +7,6 @@ export class UserForm {
export class LoginUserRespose {
BasicAuthKey: string;
UserId: number;
Authorization: string;
Email: string
@@ -29,7 +28,6 @@ export class calendarInterface {
}
export class UserSession {
BasicAuthKey: string;
UserId: number;
Authorization: string;
Email: string
src/app/module/user/data/datasource/user-remote-repository.service.ts
+14 -2
View File
@@ -4,16 +4,28 @@ import { environment } from 'src/environments/environment';
import { IProfilePictureInputDTO } from '../dto/profilePictureInputDTO';
import { HttpHeaders } from '@angular/common/http';
import { TracingType } from 'src/app/services/monitoring/opentelemetry/tracer';
import { HttpAdapter } from 'src/app/infra/http/adapter';
import { IUserRepositoryLoginParams } from 'src/app/core/user/repository/user-remote-repository';
import { UserLoginOutput } from 'src/app/core/user/use-case/user-login-use-case.service';
@Injectable({
providedIn: 'root'
})
export class UserRemoteRepositoryService {
private baseUrl = 'https://gdapi-dev.dyndns.info/stage/api/v2'; // Your base URL
constructor(
private httpService: HttpService
private httpService: HttpService,
private http: HttpAdapter,
) { }
// @APIReturn(MessageOutPutDTOSchema, 'get/Messages')
async login(input: IUserRepositoryLoginParams) {
return await this.http.post<UserLoginOutput>(`${this.baseUrl}/Users/login`, input)
}
getUserProfilePhoto(guid: string, tracing?: TracingType) {
const geturl = environment.apiURL + 'UserAuthentication/GetPhoto';
src/app/module/user/domain/user.service.ts
+1 -1
View File
@@ -18,7 +18,7 @@ export class UserService {
if(result.isOk()) {
SessionStore.reset(new UserEntity({...result.value, ...result.value.user}))
// SessionStore.reset(new UserEntity({...result.value, ...result.value.user}))
}
return result
src/app/pages/login/login.module.ts
+1
View File
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { LoginPageRoutingModule } from './login-routing.module';
import { LoginPage } from './login.page';
import { UserModule } from 'src/app/module/user/user.module';
@NgModule({
imports: [
src/app/pages/login/login.page.ts
+8 -2
View File
@@ -21,7 +21,7 @@ import { NotificationRepositoryService } from 'src/app/module/notification/data/
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room/room-local-repository.service'
import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service'
import { UserService } from 'src/app/module/user/domain/user.service'
@Component({
selector: 'app-login',
@@ -63,7 +63,8 @@ export class LoginPage implements OnInit {
private NotificationRepositoryService: NotificationRepositoryService,
private ChatServiceService: ChatServiceService,
private RoomLocalRepository: RoomLocalRepository,
private MessageLocalDataSourceService: MessageLocalDataSourceService
private MessageLocalDataSourceService: MessageLocalDataSourceService,
private UserService:UserService
) { }
ngOnInit() { }
@@ -132,6 +133,11 @@ export class LoginPage implements OnInit {
const loader = this.toastService.loading()
this.UserService.login({
username: newUserName.trim(),
password: this.password.trim(),
})
let attempt = await this.authService.login(this.userattempt, { saveSession: false })
/* const data = await this.authService.loginContenteProduction(this.userattempt, { saveSession: true }) */
src/app/services/auth.service.ts
-1
View File
@@ -164,7 +164,6 @@ export class AuthService {
}
session.Password = user.password
session.BasicAuthKey = user.BasicAuthKey
SessionStore.reset(session)
return true;
src/app/services/monitoring/opentelemetry/opentelemetry.ts
+1
View File
@@ -37,6 +37,7 @@ function createProvider(serviceName) {
// Example usage:
export const OpentelemetryChatProvider = createProvider('FO-chat-service');
export const OpentelemetryUserProvider = createProvider('FO-User-service');
export const OpentelemetryAgendaProvider = createProvider('FO-agenda-service');
export const OpentelemetryNotificationProvider = createProvider('FO-notification');
export const OpentelemetryInterceptorProvider = createProvider('FO-interceptor');
src/app/services/monitoring/opentelemetry/tracer.ts
+7 -2
View File
@@ -1,7 +1,7 @@
import { v4 as uuidv4 } from 'uuid';
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
import { Tracer, Span } from '@opentelemetry/sdk-trace-base';
import { OpentelemetryAgendaProvider, OpentelemetryChatProvider, OpentelemetryInterceptorProvider, OpentelemetryLogging, OpentelemetryNotificationProvider } from './opentelemetry';
import { OpentelemetryAgendaProvider, OpentelemetryChatProvider, OpentelemetryInterceptorProvider, OpentelemetryLogging, OpentelemetryNotificationProvider, OpentelemetryUserProvider } from './opentelemetry';
import { Device, DeviceInfo } from '@capacitor/device';
import { SessionStore } from 'src/app/store/session.service';
import { environment } from 'src/environments/environment';
@@ -14,6 +14,9 @@ import { Logger } from '../../logger/main/service';
const tracerInstance = OpentelemetryAgendaProvider.getTracer('example-tracer-hole', '111', {})
const tracerNotificationInstance = OpentelemetryNotificationProvider.getTracer('example-tracer-hole', '111', {})
const tracerChat = OpentelemetryChatProvider.getTracer('OpentelemetryChatProvider','some' ,{})
const tracerUser = OpentelemetryUserProvider.getTracer('OpentelemetryUserProvider','some' ,{})
let device: DeviceInfo;
Device.getInfo().then(e => {
@@ -49,6 +52,8 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish, waitNThrow =
_tracerInstance = tracerNotificationInstance
} else if (module == 'chat') {
_tracerInstance = tracerChat
} else if (module == 'user') {
_tracerInstance = tracerUser
} else {
_tracerInstance = tracerInstance
}
@@ -161,7 +166,7 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish, waitNThrow =
data.errors.push(message)
data.status = {code: SpanStatusCode.ERROR, message}
span.setStatus({code: SpanStatusCode.ERROR, message})
Logger.error(message, {...obj, spanId, name})
Logger.error(message, {...obj, spanId, name, ...data})
},
createSpan: (name, parent?: any) => {
return tracerInstance.startSpan(name, { root: false }, parent) as Span;
src/app/services/notification/notifications-ends-points.service.ts
+4 -4
View File
@@ -16,7 +16,7 @@ export class NotificationsEndsPointsService {
postToken(token) {
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
// const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const body = {
UserId: SessionStore.user.UserId,
TokenId: token,
@@ -24,17 +24,17 @@ export class NotificationsEndsPointsService {
Service: 1
};
return this.http.post<Token>(`${environment.apiURL}+ 'notifications/token'`, body, { headers })
return this.http.post<Token>(`${environment.apiURL}+ 'notifications/token'`, body, { })
}
DeleteToken(token) {
const geturl = environment.apiURL + `notifications/token?userId=${SessionStore.user.UserId}&tokenId=${token}`;
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const body = {};
return this.http.delete<Token>(`${geturl}`, { headers, body })
return this.http.delete<Token>(`${geturl}`, { body })
}
}
src/app/services/notification/notifications-trigger.service.ts
+40 -40
View File
@@ -16,55 +16,55 @@ export class NotificationsTriggerService {
sendNotificationWithSend(userID, title, bodymsg, roomId) {
const geturl = environment.apiURL + `notifications/send`;
// sendNotificationWithSend(userID, title, bodymsg, roomId) {
// const geturl = environment.apiURL + `notifications/send`;
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const message = {
"Service": "chat",
"IdObject": roomId
}
let id = 437
this.http.post<Token>(geturl + `?userId=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
// const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
// const message = {
// "Service": "chat",
// "IdObject": roomId
// }
// let id = 437
// this.http.post<Token>(geturl + `?userId=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
}, (error) => {
// }, (error) => {
})
}
// })
// }
ChatSendMessageNotification(userID, title, bodymsg, roomId) {
const geturl = environment.apiURL + `notifications/sendbyUsername`;
// ChatSendMessageNotification(userID, title, bodymsg, roomId) {
// const geturl = environment.apiURL + `notifications/sendbyUsername`;
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const message = {
"Service": "chat",
"IdObject": roomId
}
let id = 437
this.http.post<Token>(geturl + `?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
// this.active = true
}, (error) => {
// const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
// const message = {
// "Service": "chat",
// "IdObject": roomId
// }
// let id = 437
// this.http.post<Token>(geturl + `?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
// // this.active = true
// }, (error) => {
})
}
// })
// }
ChatSendMessageNotificationGrup(usersID, title, bodymsg, roomId) {
const geturl = environment.apiURL + `notifications/sendByUsernames`;
// ChatSendMessageNotificationGrup(usersID, title, bodymsg, roomId) {
// const geturl = environment.apiURL + `notifications/sendByUsernames`;
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const message = {
"Users": usersID,
"NotificationData": {
"Service": "chat",
"IdObject": roomId
}
}
// const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
// const message = {
// "Users": usersID,
// "NotificationData": {
// "Service": "chat",
// "IdObject": roomId
// }
// }
this.http.post<Token>(geturl + `?title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
// this.active = true
}, (error) => {
// this.http.post<Token>(geturl + `?title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
// // this.active = true
// }, (error) => {
})
}
// })
// }
}
src/app/services/notifications.service.ts
+49 -49
View File
@@ -158,9 +158,9 @@ export class NotificationsService {
tracing.setAttribute('outcome', 'success')
},
(error) => {
console.error('Permission denied:', error);
tracing.setAttribute('notification.token', 'false')
tracing.setAttribute('outcome', 'failed')
tracing.hasError('Permission denied: request token');
}
);
}
@@ -174,7 +174,7 @@ export class NotificationsService {
}
postToken(token, geturl, tracing: TracingType) {
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
//const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const body = {
UserId: SessionStore.user.UserId,
TokenId: token,
@@ -183,7 +183,7 @@ export class NotificationsService {
};
tracing.setAttribute('token.data', token)
this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => {
this.http.post<Tokenn>(`${geturl}`, body, { }).subscribe(data => {
this.active = true
tracing.setAttribute('outcome','success')
tracing.finish()
@@ -196,10 +196,10 @@ export class NotificationsService {
DeleteToken(geturl) {
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const body = {};
this.http.delete<Tokenn>(`${geturl}`, { headers, body }).subscribe(data => {
this.http.delete<Tokenn>(`${geturl}`, { body }).subscribe(data => {
this.active = true
}, (error) => {
@@ -300,57 +300,57 @@ export class NotificationsService {
}
sendNotificationWithSend(userID, title, bodymsg, roomId) {
const geturl = environment.apiURL + `notifications/send`;
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const message = {
"Service": "chat",
"IdObject": roomId
}
let id = 437
this.http.post<Tokenn>(geturl + `?userId=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
this.active = true
}, (error) => {
})
}
// sendNotificationWithSend(userID, title, bodymsg, roomId) {
// const geturl = environment.apiURL + `notifications/send`;
ChatSendMessageNotification(userID, title, bodymsg, roomId) {
const geturl = environment.apiURL + `notifications/sendbyUsername`;
// const message = {
// "Service": "chat",
// "IdObject": roomId
// }
// let id = 437
// this.http.post<Tokenn>(geturl + `?userId=${userID}&title=${title}&body=${bodymsg}`, message, { }).subscribe(data => {
// this.active = true
// }, (error) => {
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const message = {
"Service": "chat",
"IdObject": roomId
}
let id = 437
this.http.post<Tokenn>(geturl + `?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
this.active = true
}, (error) => {
// })
// }
})
}
ChatSendMessageNotificationGrup(usersID, title, bodymsg, roomId) {
const geturl = environment.apiURL + `notifications/sendByUsernames`;
// ChatSendMessageNotification(userID, title, bodymsg, roomId) {
// const geturl = environment.apiURL + `notifications/sendbyUsername`;
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
const message = {
"Users": usersID,
"NotificationData": {
"Service": "chat",
"IdObject": roomId
}
}
this.http.post<Tokenn>(geturl + `?title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
this.active = true
}, (error) => {
// const message = {
// "Service": "chat",
// "IdObject": roomId
// }
// let id = 437
// this.http.post<Tokenn>(geturl + `?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
// this.active = true
// }, (error) => {
})
}
// })
// }
// ChatSendMessageNotificationGrup(usersID, title, bodymsg, roomId) {
// const geturl = environment.apiURL + `notifications/sendByUsernames`;
// const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
// const message = {
// "Users": usersID,
// "NotificationData": {
// "Service": "chat",
// "IdObject": roomId
// }
// }
// this.http.post<Tokenn>(geturl + `?title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
// this.active = true
// }, (error) => {
// })
// }
tempClearArray(data) {
this.DataArray = new Array;
version/git-version.ts
+6 -6
View File
@@ -1,11 +1,11 @@
export let versionData = {
"shortSHA": "52d333ad1",
"SHA": "52d333ad167e7e87cfe1bfafd9574101affc32af",
"shortSHA": "ecb2f6c08",
"SHA": "ecb2f6c08ec1b5c587d400f3ba2c85e96c1ed243",
"branch": "feature/login-v2",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Oct 29 16:05:47 2024 +0100'",
"lastCommitMessage": "filter contact by name",
"lastCommitNumber": "6123",
"changeStatus": "On branch feature/login-v2\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: src/app/core/user/entity/preference.ts\n\tnew file: src/app/core/user/entity/userEntity.ts\n\tnew file: src/app/core/user/repository/user-remote-repository.ts\n\tnew file: src/app/core/user/use-case/user-login-use-case.service.ts\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/guards/inactivity.guard.ts\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/interceptors/chatToken.interceptor.ts\n\tmodified: src/app/models/permission/agenda-permission.ts\n\tmodified: src/app/models/user.model.ts\n\tnew file: src/app/module/user/domain/service/session.service.ts\n\tnew file: src/app/module/user/domain/user.service.ts\n\tnew file: src/app/module/user/user.module.ts\n\tmodified: src/app/pages/inactivity/inactivity.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/first-enter.service.ts\n\tmodified: src/app/shared/API/middleware/middleware-service.service.ts\n\tmodified: src/app/shared/utils/utils.ts\n\tmodified: src/app/store/session.service.ts\n\tmodified: src/app/ui/chat/component/edit-group/edit-group.page.ts\n\tmodified: src/app/ui/chat/component/new-group/new-group.page.ts\n\tmodified: src/app/ui/chat/modal/messages/contacts/contacts.page.ts\n\tmodified: src/app/ui/chat/modal/new-group/new-group.page.ts\n\tnew file: src/app/ui/login/inactivity/inactivity-routing.module.ts\n\tnew file: src/app/ui/login/inactivity/inactivity.module.ts\n\tnew file: src/app/ui/login/inactivity/inactivity.page.html\n\tnew file: src/app/ui/login/inactivity/inactivity.page.scss\n\tnew file: src/app/ui/login/inactivity/inactivity.page.spec.ts\n\tnew file: src/app/ui/login/inactivity/inactivity.page.ts\n\tnew file: src/app/ui/login/login/login-routing.module.ts\n\tnew file: src/app/ui/login/login/login.module.ts\n\tnew file: src/app/ui/login/login/login.page.html\n\tnew file: src/app/ui/login/login/login.page.scss\n\tnew file: src/app/ui/login/login/login.page.spec.ts\n\tnew file: src/app/ui/login/login/login.page.ts\n\tmodified: src/app/ui/shared/components/header/header.page.html",
"lastCommitTime": "'Wed Nov 6 08:24:37 2024 +0100'",
"lastCommitMessage": "remove chat data and ownerCalendar",
"lastCommitNumber": "6124",
"changeStatus": "On branch feature/login-v2\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: gabinete-digital-fo.code-workspace\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/core/user/use-case/user-login-use-case.service.ts\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/module/user/data/datasource/user-remote-repository.service.ts\n\tmodified: src/app/module/user/domain/user.service.ts\n\tmodified: src/app/pages/login/login.module.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/monitoring/opentelemetry/opentelemetry.ts\n\tmodified: src/app/services/monitoring/opentelemetry/tracer.ts\n\tmodified: src/app/services/notification/notifications-ends-points.service.ts\n\tmodified: src/app/services/notification/notifications-trigger.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}