Skip to content

Commit

Permalink
Merge pull request #204 from axonivy-market/develop
Browse files Browse the repository at this point in the history
MARP-1168 Remove  "Act on your behalf" from github login
  • Loading branch information
nqhoan-axonivy authored Oct 18, 2024
2 parents 2f0d1c1 + abc7529 commit 5dd8e35
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import static com.axonivy.market.constants.ProductJsonConstants.NAME;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@
import com.axonivy.market.enums.Language;
import com.axonivy.market.enums.SortOption;
import com.axonivy.market.model.MavenArtifactModel;
import com.axonivy.market.util.MavenUtils;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.Assertions;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.util.CollectionUtils;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import java.util.*;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;

@ExtendWith(MockitoExtension.class)
Expand Down
2 changes: 1 addition & 1 deletion marketplace-ui/src/environments/environment.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const environment = {
production: true,
apiUrl: '/marketplace-service',
githubClientId: 'Iv23licGsRvdWBGRYJfT',
githubClientId: 'Ov23liK1GCV3aAmN8kby',
githubAuthCallbackPath: '/auth/github/callback',
dayInMiliseconds: 86400000
};

0 comments on commit 5dd8e35

Please sign in to comment.