COR-476: add user/id endpoint

frontend/apps/core-app/App.tsx

@@ -16,7 +16,7 @@ import {
 } from '@expo-google-fonts/roboto';
 
 import { AuthWrapper } from './src/components/AuthWrapper';
-import { formsClient } from './src/clients/formsClient';
+import { adminClient, formsClient } from './src/clients';
 import { RootNavigator } from './src/navigation';
 import { linkingConfig } from './src/navigation/linking.config';
 
@@ -40,10 +40,15 @@ const App: React.FC = () => {
 
   if (!fontsLoaded) return null;
 
+  const handleTokenChange = (token: string) => {
+    formsClient.setToken(token);
+    adminClient.setToken(token);
+  };
+
   return (
     <NativeBaseProvider theme={theme}>
       <NavigationContainer linking={linkingConfig} theme={navTheme}>
-        <AuthWrapper onTokenChange={formsClient.setToken}>
+        <AuthWrapper onTokenChange={handleTokenChange}>
           <RootNavigator />
         </AuthWrapper>
       </NavigationContainer>

frontend/apps/core-app/src/clients/adminClient.ts

@@ -0,0 +1,6 @@
+import Constants from 'expo-constants';
+import { AdminClient } from 'core-api-client';
+
+export const adminClient = new AdminClient(
+  Constants.manifest?.extra?.server_uri,
+);

frontend/apps/core-app/src/clients/index.ts

@@ -0,0 +1,2 @@
+export { formsClient } from './client';
+export { adminClient } from './adminClient';

frontend/apps/core-app/src/components/Recipient/RecipientEditor/__tests__/RecipientEditor.components.test.tsx

@@ -6,7 +6,7 @@ import {
 } from 'core-api-client';
 import { Recipient } from 'core-api-client/src/types/client/Recipient';
 
-import { formsClient } from '../../../../clients/formsClient';
+import { formsClient } from '../../../../clients';
 import { render } from '../../../../testUtils/render';
 import { RecipientEditorComponent } from '../RecipientEditor.component';
 

frontend/apps/core-app/src/components/Recipient/RecipientViewer/__tests__/RecipientViewer.component.test.tsx

@@ -6,7 +6,7 @@ import {
 } from 'core-api-client';
 import { Recipient } from 'core-api-client/src/types/client/Recipient';
 
-import { formsClient } from '../../../../clients/formsClient';
+import { formsClient } from '../../../../clients';
 import { render } from '../../../../testUtils/render';
 import { RecipientViewerComponent } from '../RecipientViewer.component';
 

frontend/apps/core-app/src/components/RecordEditor/FieldInput/ReferenceFieldInput.component.tsx

@@ -3,7 +3,7 @@ import { FormControl, Select } from 'native-base';
 import { useFormContext, useController } from 'react-hook-form';
 import { FormDefinition, Record, Validation } from 'core-api-client';
 
-import { formsClient } from '../../../clients/formsClient';
+import { formsClient } from '../../../clients';
 
 type Props = {
   formId: string;

frontend/apps/core-app/src/components/RecordEditor/FieldInput/SubFormFieldInput.component.tsx

@@ -18,7 +18,7 @@ import {
 
 import { RecordEditor } from '..';
 import * as ReactHookFormTransformer from '../../../utils/ReactHookFormTransformer';
-import { formsClient } from '../../../clients/formsClient';
+import { formsClient } from '../../../clients';
 import { SubFormTable } from '../../SubFormTable';
 
 type Props = {

frontend/apps/core-app/src/components/RecordEditor/FieldInput/__tests__/ReferenceFieldInput.component.test.tsx

@@ -1,7 +1,7 @@
 import { act, fireEvent, waitFor } from '@testing-library/react-native';
 import { FormDefinition, Record } from 'core-api-client';
 
-import { formsClient } from '../../../../clients/formsClient';
+import { formsClient } from '../../../../clients';
 import { render } from '../../../../testUtils/render';
 import { withFormContext } from '../../../../testUtils/withFormContext';
 import { ReferenceFieldInput } from '../ReferenceFieldInput.component';

frontend/apps/core-app/src/screens/RecipientProfileScreen/RecipientProfileScreen.container.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { RouteProp, useRoute } from '@react-navigation/native';
 
 import { RootParamList } from '../../navigation/types';
-import { formsClient } from '../../clients/formsClient';
+import { formsClient } from '../../clients';
 import config from '../../config';
 import { useAPICall } from '../../hooks/useAPICall';
 

frontend/apps/core-app/src/screens/RecipientRegistrationScreen/RecipientRegistrationScreen.container.tsx

@@ -3,7 +3,7 @@ import { FormWithRecord } from 'core-api-client';
 import { Recipient } from 'core-api-client/src/types/client/Recipient';
 import { useNavigation } from '@react-navigation/native';
 
-import { formsClient } from '../../clients/formsClient';
+import { formsClient } from '../../clients';
 import configuration from '../../config';
 import { useAPICall } from '../../hooks/useAPICall';
 import { routes } from '../../constants/routes';

frontend/apps/core-app/src/screens/RecipientRegistrationScreen/__tests__/RecipientRegistrationScreen.component.test.tsx

@@ -2,7 +2,7 @@ import { fireEvent, waitFor } from '@testing-library/react-native';
 import { FormType, FormWithRecord } from 'core-api-client';
 import { Recipient } from 'core-api-client/src/types/client/Recipient';
 
-import { formsClient } from '../../../clients/formsClient';
+import { formsClient } from '../../../clients';
 import { render } from '../../../testUtils/render';
 import * as ReactHookFormTransformer from '../../../utils/ReactHookFormTransformer';
 import { RecipientRegistrationScreenComponent } from '../RecipientRegistrationScreen.component';

frontend/apps/core-app/src/screens/RecipientRegistrationScreen/__tests__/RecipientRegistrationScreen.container.test.tsx

@@ -6,7 +6,7 @@ import { render } from '../../../testUtils/render';
 import { RecipientRegistrationScreenContainer } from '../RecipientRegistrationScreen.container';
 import * as hooks from '../../../hooks/useAPICall';
 import configuration from '../../../config';
-import { formsClient } from '../../../clients/formsClient';
+import { formsClient } from '../../../clients';
 import { routes } from '../../../constants/routes';
 
 const makeForm = (i: number): FormDefinition => ({

frontend/packages/core-api-client/src/client/Client.ts

@@ -6,6 +6,7 @@ import { FolderClient } from './Folder';
 import { FormClient } from './Form';
 import { RecordClient } from './Record';
 import { RecipientClient } from './Recipient';
+import { IdentityClient } from './Identity';
 
 export class Client extends BaseRESTClient implements ClientDefinition {
   static corev1 = 'apis/core.nrc.no/v1';
@@ -20,12 +21,15 @@ export class Client extends BaseRESTClient implements ClientDefinition {
 
   public Recipient: RecipientClient;
 
+  public Identity: IdentityClient;
+
   constructor(address: string) {
     super(`${address}/${Client.corev1}`);
     this.Database = new DatabaseClient(this);
     this.Folder = new FolderClient(this);
     this.Form = new FormClient(this);
     this.Record = new RecordClient(this, this.Form);
     this.Recipient = new RecipientClient(this.Record, this.Form);
+    this.Identity = new IdentityClient(this);
   }
 }

frontend/packages/core-api-client/src/client/Identity.ts

@@ -0,0 +1,20 @@
+import {
+  Identity,
+  IdentityClientDefinition,
+  IdentityGetRequest,
+  IdentityGetResponse,
+} from '../types';
+
+import { BaseRESTClient } from './BaseRESTClient';
+
+export class IdentityClient implements IdentityClientDefinition {
+  restClient: BaseRESTClient;
+
+  constructor(restClient: BaseRESTClient) {
+    this.restClient = restClient;
+  }
+
+  get = async (request: IdentityGetRequest): Promise<IdentityGetResponse> => {
+    return this.restClient.get<Identity>(`/identities/${request.id}`);
+  };
+}

frontend/packages/core-api-client/src/index.ts

@@ -1,6 +1,6 @@
 import * as Validation from './validation';
 
-export { Client } from './client';
+export * from './client';
 export { BaseRESTClient } from './client/BaseRESTClient';
 export * from './types';
 export * from './utils';

frontend/packages/core-api-client/src/types/client/Client.ts

@@ -3,11 +3,13 @@ import { FolderClientDefinition } from './Folder';
 import { FormClientDefinition } from './Form';
 import { RecordClientDefinition } from './Record';
 import { RecipientClientDefinition } from './Recipient';
+import { IdentityClientDefinition } from './Identity';
 
 export interface ClientDefinition {
   Database: DatabaseClientDefinition;
   Folder: FolderClientDefinition;
   Form: FormClientDefinition;
   Record: RecordClientDefinition;
   Recipient: RecipientClientDefinition;
+  Identity: IdentityClientDefinition;
 }

frontend/packages/core-api-client/src/types/client/Form.ts

@@ -1,4 +1,4 @@
-import { FormDefinition, FormDefinitionList } from '../model/Form';
+import { FormDefinition, FormDefinitionList } from '../model';
 
 import { DataOperation, PartialObjectWrapper, Response } from './utils';
 

frontend/packages/core-api-client/src/types/client/Identity.ts

@@ -0,0 +1,18 @@
+import { DataOperation, Response } from './utils';
+
+export type Identity = {
+  id: string;
+  subject: string;
+  displayName: string;
+  fullName: string;
+  email: string;
+  emailVerified: boolean;
+};
+
+export type IdentityGetRequest = { id: string };
+
+export type IdentityGetResponse = Response<undefined, Identity>;
+
+export interface IdentityClientDefinition {
+  get: DataOperation<IdentityGetRequest, IdentityGetResponse>;
+}

frontend/packages/core-api-client/src/types/client/index.ts

@@ -4,5 +4,6 @@ export * from './Database';
 export * from './Folder';
 export * from './Form';
 export * from './Record';
+export * from './Identity';
 
 export * from './utils';

pkg/api/types/identity_profile.go

@@ -0,0 +1,11 @@
+package types
+
+// IdentityProfile represents a user including the claims from the auth request
+type IdentityProfile struct {
+	ID            string `json:"id"`
+	Subject       string `json:"subject"`
+	DisplayName   string `json:"displayName"`
+	FullName      string `json:"fullName"`
+	Email         string `json:"email"`
+	EmailVerified bool   `json:"emailVerified"`
+}

pkg/constants/constants.go

@@ -7,4 +7,5 @@ const (
 	ParamFolderID           = "folderId"
 	ParamOrganizationID     = "organizationId"
 	ParamIdentityProviderID = "identityProviderId"
+	ParamIdentityID         = "identityId"
 )

pkg/server/authnzapi/server.go

@@ -6,6 +6,7 @@ import (
 	"github.com/nrc-no/core/pkg/server/authnzapi/handlers/identityprovider"
 	"github.com/nrc-no/core/pkg/server/authnzapi/handlers/organization"
 	"github.com/nrc-no/core/pkg/server/generic"
+	"github.com/nrc-no/core/pkg/server/login/handlers/identity"
 	"github.com/nrc-no/core/pkg/server/options"
 	"github.com/nrc-no/core/pkg/store"
 	"github.com/ory/hydra-client-go/client/admin"
@@ -51,6 +52,10 @@ func NewServer(options Options) (*Server, error) {
 	idpHandler := identityprovider.NewHandler(idpStore)
 	container.Add(idpHandler.WebService())
 
+	identityStore := store.NewIdentityProfileStore(options.StoreFactory)
+	identityHandler := identity.NewHandler(identityStore)
+	container.Add(identityHandler.WebService())
+
 	s := &Server{
 		Server:  genericServer,
 		options: options,

pkg/server/login/handlers/identity/get.go

@@ -0,0 +1,42 @@
+package identity
+
+import (
+	"github.com/emicklei/go-restful/v3"
+	"github.com/nrc-no/core/pkg/api/meta"
+	"github.com/nrc-no/core/pkg/constants"
+	"github.com/nrc-no/core/pkg/logging"
+	"github.com/nrc-no/core/pkg/utils"
+	uuid "github.com/satori/go.uuid"
+	"go.uber.org/zap"
+	"net/http"
+)
+
+func (h *Handler) Get(identityId string) http.HandlerFunc {
+	return func(w http.ResponseWriter, req *http.Request) {
+		l := logging.NewLogger(req.Context()).With(zap.String("identity_id", identityId))
+
+		l.Debug("validating identity id")
+		if _, err := uuid.FromString(identityId); err != nil {
+			l.Error("failed to validate identity id", zap.Error(err))
+			utils.ErrorResponse(w, meta.NewBadRequest("invalid identity id"))
+			return
+		}
+
+		l.Debug("getting identity")
+		identity, err := h.store.Get(req.Context(), identityId)
+		if err != nil {
+			l.Error("failed to get identity", zap.Error(err))
+			utils.ErrorResponse(w, err)
+			return
+		}
+
+		l.Debug("successfully got identity")
+		utils.JSONResponse(w, http.StatusOK, identity)
+	}
+}
+
+func (h *Handler) RestfulGet(request *restful.Request, response *restful.Response) {
+	identityId := request.PathParameter(constants.ParamIdentityID)
+	handler := h.Get(identityId)
+	handler(response.ResponseWriter, request.Request)
+}

pkg/server/login/handlers/identity/handler.go

@@ -0,0 +1,43 @@
+package identity
+
+import (
+	"fmt"
+	"github.com/emicklei/go-restful/v3"
+	"github.com/nrc-no/core/pkg/api/mimetypes"
+	"github.com/nrc-no/core/pkg/api/types"
+	"github.com/nrc-no/core/pkg/constants"
+	"github.com/nrc-no/core/pkg/store"
+	"net/http"
+)
+
+type Handler struct {
+	store      store.IdentityProfileStore
+	webService *restful.WebService
+}
+
+func (h *Handler) WebService() *restful.WebService {
+	return h.webService
+}
+
+func NewHandler(store store.IdentityProfileStore) *Handler {
+	h := &Handler{store: store}
+
+	ws := new(restful.WebService).
+		Path("/apis/core.nrc.no/v1/identities").
+		Doc("identities.admin.nrc.no API")
+
+	h.webService = ws
+
+	ws.Route(ws.GET(fmt.Sprintf("/{%s}", constants.ParamIdentityID)).To(h.RestfulGet).
+		Doc("gets an identity").
+		Operation("getIdentity").
+		Param(restful.PathParameter(constants.ParamIdentityID, "identity id").
+			DataType("string").
+			DataFormat("uuid").
+			Required(true)).
+		Produces(mimetypes.ApplicationJson).
+		Writes(types.IdentityProfile{}).
+		Returns(http.StatusOK, "OK", types.IdentityProfile{}))
+
+	return h
+}

pkg/store/constants.go

@@ -1,3 +1,7 @@
 package store
 
 const idpStoreName = "identity_provider"
+const identityStoreName = "identity_profile"
+const databaseStoreName = "database"
+const formStoreName = "form"
+const organizationStoreName = "organization"

pkg/store/database.go

@@ -142,7 +142,7 @@ func (d *databaseStore) Delete(ctx context.Context, databaseID string) error {
 
 // List implements DatabaseStore.List
 func (d *databaseStore) List(ctx context.Context) (*types.DatabaseList, error) {
-	ctx, db, l, done, err := actionContext(ctx, d.db, "database", "list")
+	ctx, db, l, done, err := actionContext(ctx, d.db, databaseStoreName, "list")
 	if err != nil {
 		return nil, err
 	}
@@ -172,7 +172,7 @@ func (d *databaseStore) List(ctx context.Context) (*types.DatabaseList, error) {
 
 // Create implements DatabaseStore.Create
 func (d *databaseStore) Create(ctx context.Context, database *types.Database) (*types.Database, error) {
-	ctx, db, l, done, err := actionContext(ctx, d.db, "database", "create")
+	ctx, db, l, done, err := actionContext(ctx, d.db, databaseStoreName, "create")
 	if err != nil {
 		return nil, err
 	}