fix: duo picture dont have regular format (#181)

api/graphs/api.graphqls

@@ -38,6 +38,7 @@ type User {
   email: String!
   duoLogin: String!
   duoID: Int!
+  duoAvatarURL: String
   firstName: String!
   usualFirstName: String
   lastName: String!
@@ -115,23 +116,35 @@ type Query {
   user(id: UUID!): User @authenticated
   location(id: UUID!): Location @authenticated
 
-  locations(page: PageInput!, campusID: UUID!): LocationConnection! @authenticated
-  locationsByCampusName(page: PageInput!, campusName: String!): LocationConnection! @authenticated
-  locationsByCluster(page: PageInput!, campusName: String!, identifierPrefix: String): LocationConnection! @authenticated
+  locations(page: PageInput!, campusID: UUID!): LocationConnection!
+    @authenticated
+  locationsByCampusName(
+    page: PageInput!
+    campusName: String!
+  ): LocationConnection! @authenticated
+  locationsByCluster(
+    page: PageInput!
+    campusName: String!
+    identifierPrefix: String
+  ): LocationConnection! @authenticated
 
   myFollowing: [User!]! @authenticated
 
-  internalGetUserByAccount(provider: PROVIDER!, uid: String!): User! @authzByPolicy(policy: SERVICE_TOKEN)
-  internalGetUserByEmail(email: String!): User! @authzByPolicy(policy: SERVICE_TOKEN)
+  internalGetUserByAccount(provider: PROVIDER!, uid: String!): User!
+    @authzByPolicy(policy: SERVICE_TOKEN)
+  internalGetUserByEmail(email: String!): User!
+    @authzByPolicy(policy: SERVICE_TOKEN)
   internalGetUser(id: UUID!): User! @authzByPolicy(policy: SERVICE_TOKEN)
 }
 
 type Mutation {
   createFriendship(userID: UUID!): Boolean! @authenticated
   deleteFriendship(userID: UUID!): Boolean! @authenticated
 
-  internalCreateUser(input: CreateUserInput!): UUID! @authzByPolicy(policy: SERVICE_TOKEN)
-  internalLinkAccount(input: LinkAccountInput!): Account! @authzByPolicy(policy: SERVICE_TOKEN)
+  internalCreateUser(input: CreateUserInput!): UUID!
+    @authzByPolicy(policy: SERVICE_TOKEN)
+  internalLinkAccount(input: LinkAccountInput!): Account!
+    @authzByPolicy(policy: SERVICE_TOKEN)
   inviteOnDiscord: Boolean! @authenticated
 }
 
@@ -151,6 +164,7 @@ input CreateUserInput {
   lastName: String!
   poolYear: String
   poolMonth: String
+  imageURL: String
   phone: String
   isStaff: Boolean!
 }
@@ -176,4 +190,4 @@ enum PROVIDER {
 
 enum ACCOUNT_TYPE {
   OAUTH
-}
+}

internal/api/api.resolvers.go

@@ -56,6 +56,7 @@ func (r *mutationResolver) InternalCreateUser(ctx context.Context, input typesge
 		SetNillablePoolYear(input.PoolYear).
 		SetNillablePoolMonth(input.PoolMonth).
 		SetNillablePhone(input.Phone).
+		SetNillableDuoAvatarURL(input.ImageURL).
 		SetIsStaff(input.IsStaff).
 		SetIsAUser(true).
 		OnConflictColumns(user.FieldDuoID).

internal/models/schema/user.go

@@ -34,6 +34,7 @@ func (User) Fields() []ent.Field {
 		field.String("pool_year").Optional().Nillable(),
 		field.String("pool_month").Optional().Nillable(),
 		field.String("nickname").Optional().Nillable().Unique().MaxLen(255),
+		field.String("duo_avatar_url").Optional().Nillable().MaxLen(255),
 		field.String("avatar_url").Optional().Nillable().MaxLen(255),
 		field.String("cover_url").Optional().Nillable().MaxLen(255),
 		field.UUID("current_location_id", uuid.UUID{}).Nillable().Optional(),

internal/models/utils.go

@@ -20,25 +20,25 @@ import (
 func WithTx(ctx context.Context, client *modelgen.Client, fn func(tx *modelgen.Tx) error) error {
 	tx, err := client.Tx(ctx)
 	if err != nil {
-			return err
+		return err
 	}
 	defer func() {
-			if v := recover(); v != nil {
-					if err := tx.Rollback(); err != nil {
-						log.Error().Err(err).Msg("failed to rollback transaction")
-						sentry.CaptureException(err)
-					}
-					sentry.CaptureException(v.(error))
+		if v := recover(); v != nil {
+			if err := tx.Rollback(); err != nil {
+				log.Error().Err(err).Msg("failed to rollback transaction")
+				sentry.CaptureException(err)
 			}
+			sentry.CaptureException(v.(error))
+		}
 	}()
 	if err := fn(tx); err != nil {
-			if rerr := tx.Rollback(); rerr != nil {
-					err = fmt.Errorf("rolling back transaction: %w", rerr)
-			}
-			return err
+		if rerr := tx.Rollback(); rerr != nil {
+			err = fmt.Errorf("rolling back transaction: %w", rerr)
+		}
+		return err
 	}
 	if err := tx.Commit(); err != nil {
-			return fmt.Errorf("committing transaction: %w", err)
+		return fmt.Errorf("committing transaction: %w", err)
 	}
 	return nil
 }
@@ -57,6 +57,7 @@ func UserFirstOrCreateFromComplexLocation(ctx context.Context, l *duoapi.Locatio
 				SetPhone(l.User.Phone).
 				SetPoolMonth(l.User.PoolMonth).
 				SetPoolYear(l.User.PoolYear).
+				SetDuoAvatarURL(l.User.ImageURL).
 				SetIsStaff(l.User.Staff).
 				SetIsAUser(false).
 				OnConflictColumns(user.FieldDuoID).
@@ -97,6 +98,7 @@ func UserFirstOrCreateFromLocation(ctx context.Context, l *duoapi.Location[duoap
 				SetPhone(duoUser.Phone).
 				SetPoolMonth(duoUser.PoolMonth).
 				SetPoolYear(duoUser.PoolYear).
+				SetDuoAvatarURL(duoUser.ImageURL).
 				SetIsStaff(duoUser.Staff).
 				SetIsAUser(false).
 				OnConflictColumns(user.FieldDuoID).

internal/webhooks/user.go

@@ -17,6 +17,7 @@ func (p *userProcessor) Create(u *duoapi.User, metadata *duoapi.WebhookMetadata)
 		SetDuoLogin(u.Login).
 		SetFirstName(u.FirstName).
 		SetLastName(u.LastName).
+		SetDuoAvatarURL(u.ImageURL).
 		SetEmail(u.Email).
 		SetIsStaff(u.Staff).
 		SetNillableUsualFirstName(&u.UsualFirstName).
@@ -36,6 +37,7 @@ func (p *userProcessor) Update(u *duoapi.User, metadata *duoapi.WebhookMetadata)
 		SetPhone(u.Phone).
 		SetPoolYear(u.PoolYear).
 		SetPoolMonth(u.PoolMonth).
+		SetDuoAvatarURL(u.ImageURL).
 		SetNillableUsualFirstName(&u.UsualFirstName).
 		Where(user.DuoID(u.ID)).
 		Exec(p.ctx)

pkg/duoapi/structs.go

@@ -29,12 +29,12 @@ type Language struct {
 }
 
 type Location[UserType ILocationUser] struct {
-	ID       int          `json:"id"`
-	BeginAt  DuoTime      `json:"begin_at"`
-	EndAt    *DuoTime     `json:"end_at"`
-	Primary  bool         `json:"primary"`
-	Host     string       `json:"host"`
-	CampusID int          `json:"campus_id"`
+	ID       int      `json:"id"`
+	BeginAt  DuoTime  `json:"begin_at"`
+	EndAt    *DuoTime `json:"end_at"`
+	Primary  bool     `json:"primary"`
+	Host     string   `json:"host"`
+	CampusID int      `json:"campus_id"`
 	User     UserType `json:"user"`
 }
 
@@ -49,9 +49,9 @@ type LocationUser struct {
 }
 
 type ComplexLocationUser struct {
-	ID    int    `json:"id"`
-	Login string `json:"login"`
-	URL   string `json:"url"`
+	ID              int     `json:"id"`
+	Login           string  `json:"login"`
+	URL             string  `json:"url"`
 	Email           string  `json:"email"`
 	FirstName       string  `json:"first_name"`
 	LastName        string  `json:"last_name"`
@@ -82,9 +82,11 @@ type User struct {
 	LastName       string `json:"last_name"`
 	UsualFullName  string `json:"usual_full_name"`
 	UsualFirstName string `json:"usual_first_name"`
+	ImageURL       string `json:"image_url"`
+	NewImageURL    string `json:"new_image_url"`
 	URL            string `json:"url"`
 	Staff          bool   `json:"staff?"`
-	Phone 				string `json:"phone"`
-	PoolMonth			string `json:"pool_month"`
-	PoolYear			string `json:"pool_year"`
+	Phone          string `json:"phone"`
+	PoolMonth      string `json:"pool_month"`
+	PoolYear       string `json:"pool_year"`
 }

web/ui/src/components/Avatar/Avatar.tsx

@@ -21,13 +21,16 @@ const sizeClasses = {
 
 export const Avatar = ({
   login,
+  duoAvatarURL,
   size = 'sm',
   rounded = false,
   className,
 }: AvatarProps) => {
   return (
     <div
-      style={{ backgroundImage: `url(${CDN_URL.replace('{}', login)})` }}
+      style={{
+        backgroundImage: `url(${duoAvatarURL || CDN_URL.replace('{}', login)})`,
+      }}
       className={classNames(
         className,
         rounded ? 'rounded-full' : 'rounded',

web/ui/src/components/Avatar/types.d.ts

@@ -2,6 +2,7 @@ type AvatarSize = 'xs' | 'sm' | 'md' | 'xl' | 'xxl' | 'xxxl';
 
 export type AvatarProps = {
   login: string;
+  duoAvatarURL?: string | null;
   size?: AvatarSize;
   rounded?: boolean;
   className?: string;

web/ui/src/components/ClusterMap/ClusterMap.tsx

@@ -63,7 +63,12 @@ export const ClusterWorkspaceWithUser = ({
       onMouseLeave={(e) => onMouseLeave && onMouseLeave(e, location)}
     >
       <span className="mb-1">
-        <Avatar login={location.user.duoLogin} rounded={false} size="md" />
+        <Avatar
+          login={location.user.duoLogin}
+          duoAvatarURL={location.user.duoAvatarURL}
+          rounded={false}
+          size="md"
+        />
       </span>
       <span className="text-xs">{displayText || location.identifier}</span>
     </div>

web/ui/src/components/UserCard/UserCard.tsx

@@ -23,6 +23,7 @@ export const UserCard: UserCardComponent = ({
     >
       <Avatar
         login={user.duoLogin}
+        duoAvatarURL={user.duoAvatarURL}
         size="xxxl"
         rounded
         className="mb-4 bg-slate-800"

web/ui/src/graphql/definitions.gql

@@ -1,6 +1,6 @@
-# 
+#
 # !!!! WARNING: NEVER IMPORT THIS MODULE DIRECTLY !!!!
-# 
+#
 # This file is used to define the documents (queries and mutations) that are
 # available in the GraphQL interface.
 # To use this module, you must generate the schema using the `generate` script
@@ -138,8 +138,12 @@ query myFollowings {
   }
 }
 
-query clusterView($campusName: String!, $identifierPrefix: String!) { 
-  locationsByCluster(campusName: $campusName, identifierPrefix: $identifierPrefix, page:{ first: 1000 }) {
+query clusterView($campusName: String!, $identifierPrefix: String!) {
+  locationsByCluster(
+    campusName: $campusName
+    identifierPrefix: $identifierPrefix
+    page: { first: 1000 }
+  ) {
     totalCount
     pageInfo {
       hasNextPage
@@ -157,6 +161,7 @@ query clusterView($campusName: String!, $identifierPrefix: String!) {
           firstName
           usualFirstName
           lastName
+          duoAvatarURL
           isFollowing
         }
       }
@@ -176,7 +181,10 @@ query internalGetUserByEmail($email: String!) {
   }
 }
 
-query internalGetUserByAccount($provider: PROVIDER!, $providerAccountId: String!) {
+query internalGetUserByAccount(
+  $provider: PROVIDER!
+  $providerAccountId: String!
+) {
   user: internalGetUserByAccount(provider: $provider, uid: $providerAccountId) {
     ...UserAccountsData
   }
@@ -202,4 +210,4 @@ fragment LocationBasicData on Location {
   identifier
   beginAt
   endAt
-}
+}