IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into

Browse Source 
3235-feature-gms-new-menu-item-userplayground
This commit is contained in:
Claus-Peter Huebner 2024-04-03 22:58:56 +02:00
commit f6797f42db
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/jest.config.js
View File

@ -7,7 +7,7 @@ module.exports = {
collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'],
coverageThreshold: {
global: {
lines: 84,
lines: 83,
},
},
setupFiles: ['<rootDir>/test/testSetup.ts'],

6
backend/src/apis/gms/GmsClient.ts
View File

@ -202,7 +202,7 @@ export async function verifyAuthToken(
}
try {
const result = await axios.get(baseUrl.concat(service), config)
console.log('GET-Response of verify-auth-token:', result)
logger.debug('GET-Response of verify-auth-token:', result)
if (result.status !== 200) {
throw new LogError(
'HTTP Status Error in verify-auth-token:',
@ -210,10 +210,10 @@ export async function verifyAuthToken(
result.statusText,
)
}
console.log('responseData:', result.data.responseData)
logger.debug('responseData:', result.data.responseData)
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
const token: string = result.data.responseData.token
console.log('verifyAuthToken=', token)
logger.debug('verifyAuthToken=', token)
return token
} catch (error: any) {
logger.error('Error in verifyAuthToken:', error)

4
backend/src/graphql/resolver/UserResolver.ts
View File

@ -25,6 +25,7 @@ import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
import { UserContactType } from '@enum/UserContactType'
import { SearchAdminUsersResult } from '@model/AdminUser'
// import { Location } from '@model/Location'
import { GmsUserAuthenticationResult } from '@model/GmsUserAuthenticationResult'
import { User } from '@model/User'
import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
@ -79,7 +80,6 @@ import { Location2Point } from './util/Location2Point'
import { setUserRole, deleteUserRole } from './util/modifyUserRole'
import { sendUserToGms } from './util/sendUserToGms'
import { validateAlias } from './util/validateAlias'
import { GmsUserAuthenticationResult } from '../model/GmsUserAuthenticationResult'
const LANGUAGES = ['de', 'en', 'es', 'fr', 'nl']
const DEFAULT_LANGUAGE = 'de'
@ -684,7 +684,7 @@ export class UserResolver {
let result: GmsUserAuthenticationResult
if (context.token) {
result = await authenticateGmsUserPlayground(context.token, dbUser)
console.log('authUserForGmsUserSearch=', result)
logger.info('authUserForGmsUserSearch=', result)
} else {
throw new LogError('authUserForGmsUserSearch without token')
}

3
backend/src/graphql/resolver/util/authenticateGmsUserPlayground.ts
View File

@ -3,6 +3,7 @@ import { User as DbUser } from '@entity/User'
import { verifyAuthToken } from '@/apis/gms/GmsClient'
import { CONFIG } from '@/config'
import { GmsUserAuthenticationResult } from '@/graphql/model/GmsUserAuthenticationResult'
import { backendLogger as logger } from '@/server/logger'
export async function authenticateGmsUserPlayground(
token: string,
@ -11,6 +12,6 @@ export async function authenticateGmsUserPlayground(
const result = new GmsUserAuthenticationResult()
result.url = CONFIG.GMS_URL.concat('/playground')
result.token = await verifyAuthToken(dbUser.communityUuid, token)
console.log('GmsUserAuthenticationResult:', result)
logger.info('GmsUserAuthenticationResult:', result)
return result
}